summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2015-12-08 10:27:40 -0500
committerbunnei <bunneidev@gmail.com>2015-12-08 10:27:40 -0500
commit3013f26d706acfc1ad6f2e6c74c19be4f9257b62 (patch)
treed68d651ce4ee276c8164efd7c5fb40a9aeb420d4 /src
parent31764c48fb8f78b998b6627ef4ea4f1b2ec83903 (diff)
parent7b33e163b900aacc4a82cf0a409536c047100303 (diff)
Merge pull request #1269 from Subv/triangle_fan
GPU/PrimitiveAssembler: Fixed drawing triangle fans.
Diffstat (limited to 'src')
-rw-r--r--src/video_core/primitive_assembly.cpp9
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
buffer[buffer_index] = vtx;
- if (topology == Regs::TriangleTopology::Strip) {
- strip_ready |= (buffer_index == 1);
+ strip_ready |= (buffer_index == 1);
+
+ if (topology == Regs::TriangleTopology::Strip)
buffer_index = !buffer_index;
- } else if (topology == Regs::TriangleTopology::Fan) {
+ else if (topology == Regs::TriangleTopology::Fan)
buffer_index = 1;
- strip_ready = true;
- }
break;
default: