diff options
| author | Subv <subv2112@gmail.com> | 2018-03-17 19:55:42 +0100 |
|---|---|---|
| committer | Subv <subv2112@gmail.com> | 2018-03-17 19:55:42 +0100 |
| commit | 579000e747413b9af3860c0b92e143d4ddc44e36 (patch) | |
| tree | 4e6804833eb2f74686d14a62d8cdae58a8d06b0f /src/video_core/engines/maxwell_3d.h | |
| parent | Merge pull request #242 from Subv/set_shader (diff) | |
| download | yuzu-579000e747413b9af3860c0b92e143d4ddc44e36.tar yuzu-579000e747413b9af3860c0b92e143d4ddc44e36.tar.gz yuzu-579000e747413b9af3860c0b92e143d4ddc44e36.tar.bz2 yuzu-579000e747413b9af3860c0b92e143d4ddc44e36.tar.lz yuzu-579000e747413b9af3860c0b92e143d4ddc44e36.tar.xz yuzu-579000e747413b9af3860c0b92e143d4ddc44e36.tar.zst yuzu-579000e747413b9af3860c0b92e143d4ddc44e36.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/video_core/engines/maxwell_3d.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/video_core/engines/maxwell_3d.h b/src/video_core/engines/maxwell_3d.h index c979d4e61..47df43c97 100644 --- a/src/video_core/engines/maxwell_3d.h +++ b/src/video_core/engines/maxwell_3d.h @@ -139,9 +139,9 @@ public: INSERT_PADDING_WORDS(0x5D0); struct { - u32 shader_code_call; - u32 shader_code_args; - } shader_code; + u32 set_shader_call; + u32 set_shader_args; + } set_shader; INSERT_PADDING_WORDS(0x10); }; std::array<u32, NUM_REGS> reg_array; @@ -154,8 +154,8 @@ public: struct ShaderInfo { Regs::ShaderType type; Regs::ShaderProgram program; - GPUVAddr begin_address; - GPUVAddr end_address; + GPUVAddr address; + GPUVAddr cb_address; }; std::array<ShaderInfo, Regs::MaxShaderProgram> shaders; @@ -194,7 +194,7 @@ ASSERT_REG_POSITION(query, 0x6C0); ASSERT_REG_POSITION(vertex_array[0], 0x700); ASSERT_REG_POSITION(vertex_array_limit[0], 0x7C0); ASSERT_REG_POSITION(shader_config[0], 0x800); -ASSERT_REG_POSITION(shader_code, 0xE24); +ASSERT_REG_POSITION(set_shader, 0xE24); #undef ASSERT_REG_POSITION |