Impaczus/rpcs3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rebasing didn't went quite right...Fixes

Browse Source
This commit is contained in:
vlj
2015-06-02 18:35:04 +02:00
committed by Vincent Lejeune
parent 3a6abe1656
commit 878a116c4a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpcs3/Emu/RSX/CgBinaryProgram.h
+1 -1
View File
@@ -332,7 +332,7 @@ public:
else else
{ {
GLParamArray param_array; ParamArray param_array;
auto& vprog = GetCgRef<CgBinaryVertexProgram>(prog.program); auto& vprog = GetCgRef<CgBinaryVertexProgram>(prog.program);
m_arb_shader += "\n"; m_arb_shader += "\n";
m_arb_shader += fmt::format("# binaryFormatRevision 0x%x\n", (u32)prog.binaryFormatRevision); m_arb_shader += fmt::format("# binaryFormatRevision 0x%x\n", (u32)prog.binaryFormatRevision);
rpcs3/Emu/RSX/D3D12/D3D12PipelineState.h
+1 -1
View File
@@ -41,7 +41,7 @@ public:
Shader() : bytecode(nullptr) {} Shader() : bytecode(nullptr) {}
~Shader() {} ~Shader() {}
u32 Id; u32 id;
Microsoft::WRL::ComPtr<ID3DBlob> bytecode; Microsoft::WRL::ComPtr<ID3DBlob> bytecode;
std::vector<size_t> FragmentConstantOffsetCache; std::vector<size_t> FragmentConstantOffsetCache;
size_t m_textureCount; size_t m_textureCount;