summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Subv2018-03-17 16:29:20 -0500
committerGravatar Subv2018-03-17 18:32:56 -0500
commit66dae227908eb733ede0cc728b79d70352467bbc (patch)
treedf69987478e42086956fe036db78e0928a0fba52 /src
parentGPU: Make the SetShader macro call do the same as the real macro's code. (diff)
downloadyuzu-66dae227908eb733ede0cc728b79d70352467bbc.tar.gz
yuzu-66dae227908eb733ede0cc728b79d70352467bbc.tar.xz
yuzu-66dae227908eb733ede0cc728b79d70352467bbc.zip
GPU: Corrected some register offsets and removed superfluous macro registers.
Diffstat (limited to 'src')
-rw-r--r--src/video_core/engines/maxwell_3d.h12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/video_core/engines/maxwell_3d.h b/src/video_core/engines/maxwell_3d.h
index 6eb98080d..c8920da50 100644
--- a/src/video_core/engines/maxwell_3d.h
+++ b/src/video_core/engines/maxwell_3d.h
@@ -148,7 +148,7 @@ public:
148 u32 cb_data[NumCBData]; 148 u32 cb_data[NumCBData];
149 } const_buffer; 149 } const_buffer;
150 150
151 INSERT_PADDING_WORDS(0x74); 151 INSERT_PADDING_WORDS(0x10);
152 152
153 struct { 153 struct {
154 union { 154 union {
@@ -158,13 +158,7 @@ public:
158 INSERT_PADDING_WORDS(7); 158 INSERT_PADDING_WORDS(7);
159 } cb_bind[MaxShaderType]; 159 } cb_bind[MaxShaderType];
160 160
161 INSERT_PADDING_WORDS(0x494); 161 INSERT_PADDING_WORDS(0x50A);
162
163 struct {
164 u32 set_shader_call;
165 u32 set_shader_args;
166 } set_shader;
167 INSERT_PADDING_WORDS(0x10);
168 }; 162 };
169 std::array<u32, NUM_REGS> reg_array; 163 std::array<u32, NUM_REGS> reg_array;
170 }; 164 };
@@ -217,7 +211,7 @@ ASSERT_REG_POSITION(vertex_array[0], 0x700);
217ASSERT_REG_POSITION(vertex_array_limit[0], 0x7C0); 211ASSERT_REG_POSITION(vertex_array_limit[0], 0x7C0);
218ASSERT_REG_POSITION(shader_config[0], 0x800); 212ASSERT_REG_POSITION(shader_config[0], 0x800);
219ASSERT_REG_POSITION(const_buffer, 0x8E0); 213ASSERT_REG_POSITION(const_buffer, 0x8E0);
220ASSERT_REG_POSITION(set_shader, 0xE24); 214ASSERT_REG_POSITION(cb_bind[0], 0x904);
221 215
222#undef ASSERT_REG_POSITION 216#undef ASSERT_REG_POSITION
223 217