From 878a116c4a434d93c5fca0830c9a6a16b9ed75af Mon Sep 17 00:00:00 2001
From: vlj <vljn.ovi@gmail.com>
Date: Tue, 2 Jun 2015 18:35:04 +0200
Subject: [PATCH] Rebasing didn't went quite right...Fixes

---
 rpcs3/Emu/RSX/CgBinaryProgram.h          | 2 +-
 rpcs3/Emu/RSX/D3D12/D3D12PipelineState.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rpcs3/Emu/RSX/CgBinaryProgram.h b/rpcs3/Emu/RSX/CgBinaryProgram.h
index 87bb3cedc5..a67354fb3a 100644
--- a/rpcs3/Emu/RSX/CgBinaryProgram.h
+++ b/rpcs3/Emu/RSX/CgBinaryProgram.h
@@ -332,7 +332,7 @@ public:
 
 		else
 		{
-			GLParamArray param_array;
+			ParamArray param_array;
 			auto& vprog = GetCgRef<CgBinaryVertexProgram>(prog.program);
 			m_arb_shader += "\n";
 			m_arb_shader += fmt::format("# binaryFormatRevision 0x%x\n", (u32)prog.binaryFormatRevision);
diff --git a/rpcs3/Emu/RSX/D3D12/D3D12PipelineState.h b/rpcs3/Emu/RSX/D3D12/D3D12PipelineState.h
index c264220385..854e095038 100644
--- a/rpcs3/Emu/RSX/D3D12/D3D12PipelineState.h
+++ b/rpcs3/Emu/RSX/D3D12/D3D12PipelineState.h
@@ -41,7 +41,7 @@ public:
 	Shader() : bytecode(nullptr) {}
 	~Shader() {}
 
-	u32 Id;
+	u32 id;
 	Microsoft::WRL::ComPtr<ID3DBlob> bytecode;
 	std::vector<size_t> FragmentConstantOffsetCache;
 	size_t m_textureCount;