diff options
| author | Tony Wasserka <neobrainx@gmail.com> | 2015-08-31 18:17:59 +0200 |
|---|---|---|
| committer | Tony Wasserka <neobrainx@gmail.com> | 2015-08-31 18:17:59 +0200 |
| commit | 071510b367721a8e5631cd8cee0d2586cfb1ab9c (patch) | |
| tree | ed75537254ed7d7aa06b8f640e2be66fb30f02b9 | |
| parent | 63c22743249eeb980dd9c58ff0610d5cd117eed9 (diff) | |
| parent | 58a04c077676a65c22bcd61a4b6012d8eaeb7e97 (diff) | |
Merge pull request #1092 from Subv/vertex_offset
Pica: Add the vertex_offset register to the Pica registers map.
| -rw-r--r-- | src/video_core/pica.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/pica.h | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/video_core/pica.cpp b/src/video_core/pica.cpp index c73a8178e..61983bc6c 100644 --- a/src/video_core/pica.cpp +++ b/src/video_core/pica.cpp @@ -49,11 +49,13 @@ std::string Regs::GetCommandName(int index) { ADD_FIELD(vertex_attributes); ADD_FIELD(index_array); ADD_FIELD(num_vertices); + ADD_FIELD(vertex_offset); ADD_FIELD(trigger_draw); ADD_FIELD(trigger_draw_indexed); ADD_FIELD(vs_default_attributes_setup); ADD_FIELD(command_buffer); ADD_FIELD(triangle_topology); + ADD_FIELD(restart_primitive); ADD_FIELD(gs.bool_uniforms); ADD_FIELD(gs.int_uniforms); ADD_FIELD(gs.main_offset); diff --git a/src/video_core/pica.h b/src/video_core/pica.h index 5811eb9bc..855cb442e 100644 --- a/src/video_core/pica.h +++ b/src/video_core/pica.h @@ -828,7 +828,9 @@ struct Regs { BitField<8, 2, TriangleTopology> triangle_topology; - INSERT_PADDING_WORDS(0x21); + u32 restart_primitive; + + INSERT_PADDING_WORDS(0x20); struct ShaderConfig { BitField<0, 16, u32> bool_uniforms; @@ -997,11 +999,13 @@ ASSERT_REG_POSITION(framebuffer, 0x110); ASSERT_REG_POSITION(vertex_attributes, 0x200); ASSERT_REG_POSITION(index_array, 0x227); ASSERT_REG_POSITION(num_vertices, 0x228); +ASSERT_REG_POSITION(vertex_offset, 0x22a); ASSERT_REG_POSITION(trigger_draw, 0x22e); ASSERT_REG_POSITION(trigger_draw_indexed, 0x22f); ASSERT_REG_POSITION(vs_default_attributes_setup, 0x232); ASSERT_REG_POSITION(command_buffer, 0x238); ASSERT_REG_POSITION(triangle_topology, 0x25e); +ASSERT_REG_POSITION(restart_primitive, 0x25f); ASSERT_REG_POSITION(gs, 0x280); ASSERT_REG_POSITION(vs, 0x2b0); |