diff options
| author | 2015-12-08 10:27:40 -0500 | |
|---|---|---|
| committer | 2015-12-08 10:27:40 -0500 | |
| commit | 3013f26d706acfc1ad6f2e6c74c19be4f9257b62 (patch) | |
| tree | d68d651ce4ee276c8164efd7c5fb40a9aeb420d4 /src/video_core/primitive_assembly.cpp | |
| parent | Merge pull request #1272 from yuriks/merge-rasterizer (diff) | |
| parent | GPU/PrimitiveAssembler: Fixed drawing triangle fans. (diff) | |
| download | yuzu-3013f26d706acfc1ad6f2e6c74c19be4f9257b62.tar.gz yuzu-3013f26d706acfc1ad6f2e6c74c19be4f9257b62.tar.xz yuzu-3013f26d706acfc1ad6f2e6c74c19be4f9257b62.zip | |
Merge pull request #1269 from Subv/triangle_fan
GPU/PrimitiveAssembler: Fixed drawing triangle fans.
Diffstat (limited to 'src/video_core/primitive_assembly.cpp')
| -rw-r--r-- | src/video_core/primitive_assembly.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/video_core/primitive_assembly.cpp b/src/video_core/primitive_assembly.cpp index 44a8dbfe9..d5a0a96a4 100644 --- a/src/video_core/primitive_assembly.cpp +++ b/src/video_core/primitive_assembly.cpp | |||
| @@ -39,13 +39,12 @@ void PrimitiveAssembler<VertexType>::SubmitVertex(VertexType& vtx, TriangleHandl | |||
| 39 | 39 | ||
| 40 | buffer[buffer_index] = vtx; | 40 | buffer[buffer_index] = vtx; |
| 41 | 41 | ||
| 42 | if (topology == Regs::TriangleTopology::Strip) { | 42 | strip_ready |= (buffer_index == 1); |
| 43 | strip_ready |= (buffer_index == 1); | 43 | |
| 44 | if (topology == Regs::TriangleTopology::Strip) | ||
| 44 | buffer_index = !buffer_index; | 45 | buffer_index = !buffer_index; |
| 45 | } else if (topology == Regs::TriangleTopology::Fan) { | 46 | else if (topology == Regs::TriangleTopology::Fan) |
| 46 | buffer_index = 1; | 47 | buffer_index = 1; |
| 47 | strip_ready = true; | ||
| 48 | } | ||
| 49 | break; | 48 | break; |
| 50 | 49 | ||
| 51 | default: | 50 | default: |