Fixed flatshading for triangle strip and triangle fan

Since OpenGL uses the last vertex, not the leading vertex, as the vertex used to select the triangle color, then the last vertex, instead of the first vertex, has to be consistently incremented for each triangle in the strip or fan. In order to make this work, when leadingVertexFirst is true, the first vertex is consistently the lowest (consistently incremented) vertex index and when leadingVertexFirst is false, the last vertex is consistently the highest vertex index. Fixes the 2 failures in: dEQP-GLES3.functional.rasterization.flatshading Change-Id: Ib2247a219fe8c6725dc141e6860ba2ff521dde8c Reviewed-on: https://swiftshader-review.googlesource.com/15468Tested-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <nicolascapens@google.com>

Fixed flatshading for triangle strip and triangle fan
62cd2bd6 · Alexis Hetu · Alexis Hétu · 67fdd834 · 62cd2bd6
Commit 62cd2bd6 authored Dec 21, 2017 by Alexis Hetu Committed by Alexis Hétu Dec 21, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 24 additions and 6 deletions

Renderer.cpp src/Renderer/Renderer.cpp +24 -6

No files found.
--- a/src/Renderer/Renderer.cpp
+++ b/src/Renderer/Renderer.cpp
@@ -1165,9 +1165,18 @@ namespace sw
 				for(unsigned int i = 0; i < triangleCount; i++)
 				{
-					batch[i][0] = index + 0;
+					if(leadingVertexFirst)
-					batch[i][1] = index + (index & 1) + 1;
+					{
-					batch[i][2] = index + (~index & 1) + 1;
+						batch[i][0] = index + 0;
+						batch[i][1] = index + (index & 1) + 1;
+						batch[i][2] = index + (~index & 1) + 1;
+					}
+					else
+					{
+						batch[i][0] = index + (index & 1);
+						batch[i][1] = index + (~index & 1);
+						batch[i][2] = index + 2;
+					}
 					index += 1;
 				}
@@ -1179,9 +1188,18 @@ namespace sw
 				for(unsigned int i = 0; i < triangleCount; i++)
 				{
-					batch[i][0] = index + 1;
+					if(leadingVertexFirst)
-					batch[i][1] = index + 2;
+					{
-					batch[i][2] = 0;
+						batch[i][0] = index + 1;
+						batch[i][1] = index + 2;
+						batch[i][2] = 0;
+					}
+					else
+					{
+						batch[i][0] = 0;
+						batch[i][1] = index + 1;
+						batch[i][2] = index + 2;
+					}
 					index += 1;
 				}