diff options
| author | 2015-08-31 18:17:59 +0200 | |
|---|---|---|
| committer | 2015-08-31 18:17:59 +0200 | |
| commit | 071510b367721a8e5631cd8cee0d2586cfb1ab9c (patch) | |
| tree | ed75537254ed7d7aa06b8f640e2be66fb30f02b9 /src | |
| parent | Merge pull request #1086 from yuriks/precommit-hook (diff) | |
| parent | Pica: Added the primitive_restart register (0x25f) to the registers map. (diff) | |
| download | yuzu-071510b367721a8e5631cd8cee0d2586cfb1ab9c.tar.gz yuzu-071510b367721a8e5631cd8cee0d2586cfb1ab9c.tar.xz yuzu-071510b367721a8e5631cd8cee0d2586cfb1ab9c.zip | |
Merge pull request #1092 from Subv/vertex_offset
Pica: Add the vertex_offset register to the Pica registers map.
Diffstat (limited to 'src')
| -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) { | |||
| 49 | ADD_FIELD(vertex_attributes); | 49 | ADD_FIELD(vertex_attributes); |
| 50 | ADD_FIELD(index_array); | 50 | ADD_FIELD(index_array); |
| 51 | ADD_FIELD(num_vertices); | 51 | ADD_FIELD(num_vertices); |
| 52 | ADD_FIELD(vertex_offset); | ||
| 52 | ADD_FIELD(trigger_draw); | 53 | ADD_FIELD(trigger_draw); |
| 53 | ADD_FIELD(trigger_draw_indexed); | 54 | ADD_FIELD(trigger_draw_indexed); |
| 54 | ADD_FIELD(vs_default_attributes_setup); | 55 | ADD_FIELD(vs_default_attributes_setup); |
| 55 | ADD_FIELD(command_buffer); | 56 | ADD_FIELD(command_buffer); |
| 56 | ADD_FIELD(triangle_topology); | 57 | ADD_FIELD(triangle_topology); |
| 58 | ADD_FIELD(restart_primitive); | ||
| 57 | ADD_FIELD(gs.bool_uniforms); | 59 | ADD_FIELD(gs.bool_uniforms); |
| 58 | ADD_FIELD(gs.int_uniforms); | 60 | ADD_FIELD(gs.int_uniforms); |
| 59 | ADD_FIELD(gs.main_offset); | 61 | 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 { | |||
| 828 | 828 | ||
| 829 | BitField<8, 2, TriangleTopology> triangle_topology; | 829 | BitField<8, 2, TriangleTopology> triangle_topology; |
| 830 | 830 | ||
| 831 | INSERT_PADDING_WORDS(0x21); | 831 | u32 restart_primitive; |
| 832 | |||
| 833 | INSERT_PADDING_WORDS(0x20); | ||
| 832 | 834 | ||
| 833 | struct ShaderConfig { | 835 | struct ShaderConfig { |
| 834 | BitField<0, 16, u32> bool_uniforms; | 836 | BitField<0, 16, u32> bool_uniforms; |
| @@ -997,11 +999,13 @@ ASSERT_REG_POSITION(framebuffer, 0x110); | |||
| 997 | ASSERT_REG_POSITION(vertex_attributes, 0x200); | 999 | ASSERT_REG_POSITION(vertex_attributes, 0x200); |
| 998 | ASSERT_REG_POSITION(index_array, 0x227); | 1000 | ASSERT_REG_POSITION(index_array, 0x227); |
| 999 | ASSERT_REG_POSITION(num_vertices, 0x228); | 1001 | ASSERT_REG_POSITION(num_vertices, 0x228); |
| 1002 | ASSERT_REG_POSITION(vertex_offset, 0x22a); | ||
| 1000 | ASSERT_REG_POSITION(trigger_draw, 0x22e); | 1003 | ASSERT_REG_POSITION(trigger_draw, 0x22e); |
| 1001 | ASSERT_REG_POSITION(trigger_draw_indexed, 0x22f); | 1004 | ASSERT_REG_POSITION(trigger_draw_indexed, 0x22f); |
| 1002 | ASSERT_REG_POSITION(vs_default_attributes_setup, 0x232); | 1005 | ASSERT_REG_POSITION(vs_default_attributes_setup, 0x232); |
| 1003 | ASSERT_REG_POSITION(command_buffer, 0x238); | 1006 | ASSERT_REG_POSITION(command_buffer, 0x238); |
| 1004 | ASSERT_REG_POSITION(triangle_topology, 0x25e); | 1007 | ASSERT_REG_POSITION(triangle_topology, 0x25e); |
| 1008 | ASSERT_REG_POSITION(restart_primitive, 0x25f); | ||
| 1005 | ASSERT_REG_POSITION(gs, 0x280); | 1009 | ASSERT_REG_POSITION(gs, 0x280); |
| 1006 | ASSERT_REG_POSITION(vs, 0x2b0); | 1010 | ASSERT_REG_POSITION(vs, 0x2b0); |
| 1007 | 1011 | ||