commit 04796cdada006a14b27c599245ebbb795b7a5f7d
author Jamie Madill <jmadill@chromium.org> Thu May 24 19:52:16 2018 -0400
committer Commit Bot <commit-bot@chromium.org> Fri May 25 00:49:54 2018 +0000
tree 7cc3a55f9c5012a220ef5e8225750d72d15f9e20
parent 493f95710ec112dae077aaf72d27e7455bff738d

Remove gl::PrimitiveType.

This replaces the usages with gl::PrimitiveMode. Also replaces
the ProgramD3D Geometry Shader executable storage with a
PackedEnumMap.

Bug: angleproject:2574
Change-Id: I476dd2ba92d6267b9ea2bb9a37ee15fb6a91e627
Reviewed-on: https://chromium-review.googlesource.com/1067115
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>

src/libANGLE/renderer/d3d/ProgramD3D.cpp

diff --git a/src/libANGLE/renderer/d3d/ProgramD3D.cpp b/src/libANGLE/renderer/d3d/ProgramD3D.cpp
index 9448bd4..47d4271 100644
--- a/src/libANGLE/renderer/d3d/ProgramD3D.cpp
+++ b/src/libANGLE/renderer/d3d/ProgramD3D.cpp
@@ -135,32 +135,32 @@
     return true;
 }
 
-gl::PrimitiveType GetGeometryShaderTypeFromDrawMode(gl::PrimitiveMode drawMode)
+gl::PrimitiveMode GetGeometryShaderTypeFromDrawMode(gl::PrimitiveMode drawMode)
 {
     switch (drawMode)
     {
         // Uses the point sprite geometry shader.
         case gl::PrimitiveMode::Points:
-            return gl::PRIMITIVE_POINTS;
+            return gl::PrimitiveMode::Points;
 
         // All line drawing uses the same geometry shader.
         case gl::PrimitiveMode::Lines:
         case gl::PrimitiveMode::LineStrip:
         case gl::PrimitiveMode::LineLoop:
-            return gl::PRIMITIVE_LINES;
+            return gl::PrimitiveMode::Lines;
 
         // The triangle fan primitive is emulated with strips in D3D11.
         case gl::PrimitiveMode::Triangles:
         case gl::PrimitiveMode::TriangleFan:
-            return gl::PRIMITIVE_TRIANGLES;
+            return gl::PrimitiveMode::Triangles;
 
         // Special case for triangle strips.
         case gl::PrimitiveMode::TriangleStrip:
-            return gl::PRIMITIVE_TRIANGLE_STRIP;
+            return gl::PrimitiveMode::TriangleStrip;
 
         default:
             UNREACHABLE();
-            return gl::PRIMITIVE_TYPE_MAX;
+            return gl::PrimitiveMode::InvalidEnum;
     }
 }
 
@@ -639,7 +639,6 @@
     : ProgramImpl(state),
       mRenderer(renderer),
       mDynamicHLSL(nullptr),
-      mGeometryExecutables(gl::PRIMITIVE_TYPE_MAX),
       mComputeExecutable(nullptr),
       mUsesPointSize(false),
       mUsesFlatInterpolation(false),
@@ -1043,8 +1042,7 @@
         stream->skip(pixelShaderSize);
     }
 
-    for (unsigned int geometryExeIndex = 0; geometryExeIndex < gl::PRIMITIVE_TYPE_MAX;
-         ++geometryExeIndex)
+    for (auto &geometryExe : mGeometryExecutables)
     {
         unsigned int geometryShaderSize = stream->readInt<unsigned int>();
         if (geometryShaderSize == 0)
@@ -1065,7 +1063,7 @@
             return false;
         }
 
-        mGeometryExecutables[geometryExeIndex].reset(geometryExecutable);
+        geometryExe.reset(geometryExecutable);
 
         stream->skip(geometryShaderSize);
     }
@@ -1371,7 +1369,7 @@
         return gl::NoError();
     }
 
-    gl::PrimitiveType geometryShaderType = GetGeometryShaderTypeFromDrawMode(drawMode);
+    gl::PrimitiveMode geometryShaderType = GetGeometryShaderTypeFromDrawMode(drawMode);
 
     if (mGeometryExecutables[geometryShaderType])
     {
@@ -2797,7 +2795,7 @@
         return true;
     }
 
-    gl::PrimitiveType geometryShaderType = GetGeometryShaderTypeFromDrawMode(drawMode);
+    gl::PrimitiveMode geometryShaderType = GetGeometryShaderTypeFromDrawMode(drawMode);
     return mGeometryExecutables[geometryShaderType].get() != nullptr;
 }