diff options
| author | 2018-08-20 14:32:50 -0400 | |
|---|---|---|
| committer | 2018-08-20 14:32:50 -0400 | |
| commit | 028d90eb79b75292d352cc8d4b96a2df74cd6b6e (patch) | |
| tree | ab7df9fd12b103b7c832e9691d2abbb72ca38e93 /src/video_core/engines | |
| parent | Merge pull request #1115 from Subv/texs_mask (diff) | |
| parent | GLRasterizer: Implemented instanced vertex arrays. (diff) | |
| download | yuzu-028d90eb79b75292d352cc8d4b96a2df74cd6b6e.tar.gz yuzu-028d90eb79b75292d352cc8d4b96a2df74cd6b6e.tar.xz yuzu-028d90eb79b75292d352cc8d4b96a2df74cd6b6e.zip | |
Merge pull request #1104 from Subv/instanced_arrays
GLRasterizer: Implemented instanced vertex arrays.
Diffstat (limited to 'src/video_core/engines')
| -rw-r--r-- | src/video_core/engines/maxwell_3d.h | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/video_core/engines/maxwell_3d.h b/src/video_core/engines/maxwell_3d.h index 771eb5abc..3c869d3a1 100644 --- a/src/video_core/engines/maxwell_3d.h +++ b/src/video_core/engines/maxwell_3d.h | |||
| @@ -679,7 +679,19 @@ public: | |||
| 679 | 679 | ||
| 680 | INSERT_PADDING_WORDS(0x7); | 680 | INSERT_PADDING_WORDS(0x7); |
| 681 | 681 | ||
| 682 | INSERT_PADDING_WORDS(0x46); | 682 | INSERT_PADDING_WORDS(0x20); |
| 683 | |||
| 684 | struct { | ||
| 685 | u32 is_instanced[NumVertexArrays]; | ||
| 686 | |||
| 687 | /// Returns whether the vertex array specified by index is supposed to be | ||
| 688 | /// accessed per instance or not. | ||
| 689 | bool IsInstancingEnabled(u32 index) const { | ||
| 690 | return is_instanced[index]; | ||
| 691 | } | ||
| 692 | } instanced_arrays; | ||
| 693 | |||
| 694 | INSERT_PADDING_WORDS(0x6); | ||
| 683 | 695 | ||
| 684 | Cull cull; | 696 | Cull cull; |
| 685 | 697 | ||
| @@ -928,6 +940,7 @@ ASSERT_REG_POSITION(point_coord_replace, 0x581); | |||
| 928 | ASSERT_REG_POSITION(code_address, 0x582); | 940 | ASSERT_REG_POSITION(code_address, 0x582); |
| 929 | ASSERT_REG_POSITION(draw, 0x585); | 941 | ASSERT_REG_POSITION(draw, 0x585); |
| 930 | ASSERT_REG_POSITION(index_array, 0x5F2); | 942 | ASSERT_REG_POSITION(index_array, 0x5F2); |
| 943 | ASSERT_REG_POSITION(instanced_arrays, 0x620); | ||
| 931 | ASSERT_REG_POSITION(cull, 0x646); | 944 | ASSERT_REG_POSITION(cull, 0x646); |
| 932 | ASSERT_REG_POSITION(clear_buffers, 0x674); | 945 | ASSERT_REG_POSITION(clear_buffers, 0x674); |
| 933 | ASSERT_REG_POSITION(query, 0x6C0); | 946 | ASSERT_REG_POSITION(query, 0x6C0); |