GL: Follow-up primitive restart emulation fixes.

src/libANGLE/renderer/gl/ContextGL.cpp

@@ -267,7 +267,7 @@ ANGLE_INLINE angle::Result ContextGL::setDrawElementsState(const gl::Context *co
     {
         StateManagerGL *stateManager = getStateManager();
 
-        GLuint primitiveRestartIndex = nativegl::GetPrimitiveRestartIndexForIndexType(type);
+        GLuint primitiveRestartIndex = gl::GetPrimitiveRestartIndex(type);
         stateManager->setPrimitiveRestartIndex(primitiveRestartIndex);
     }
 

src/libANGLE/renderer/gl/renderergl_utils.cpp

@@ -1579,6 +1579,8 @@ void InitializeFeatures(const FunctionsGL *functions, angle::FeaturesGL *feature
         features, emulatePrimitiveRestartFixedIndex,
         !functions->isAtLeastGL(gl::Version(4, 3)) && !functions->isAtLeastGLES(gl::Version(3, 0)));
 
+    ANGLE_FEATURE_CONDITION(features, unfoldShortCircuits, IsApple());
+
     ANGLE_FEATURE_CONDITION(features, removeDynamicIndexingOfSwizzledVector,
                             IsApple() || IsAndroid() || IsWindows());
 }
@@ -1748,22 +1750,6 @@ std::string GetBufferBindingString(gl::BufferBinding bufferBinding)
     return os.str();
 }
 
-GLuint GetPrimitiveRestartIndexForIndexType(gl::DrawElementsType type)
-{
-    switch (type)
-    {
-        case gl::DrawElementsType::UnsignedByte:
-            return std::numeric_limits<GLubyte>::max();
-        case gl::DrawElementsType::UnsignedShort:
-            return std::numeric_limits<GLushort>::max();
-        case gl::DrawElementsType::UnsignedInt:
-            return std::numeric_limits<GLuint>::max();
-        default:
-            UNREACHABLE();
-            return 0;
-    }
-}
-
 }  // namespace nativegl
 
 const FunctionsGL *GetFunctionsGL(const gl::Context *context)

src/libANGLE/renderer/gl/renderergl_utils.h

@@ -108,7 +108,6 @@ bool UseTexImage3D(gl::TextureType textureType);
 GLenum GetTextureBindingQuery(gl::TextureType textureType);
 GLenum GetBufferBindingQuery(gl::BufferBinding bufferBinding);
 std::string GetBufferBindingString(gl::BufferBinding bufferBinding);
-GLuint GetPrimitiveRestartIndexForIndexType(gl::DrawElementsType type);
 }  // namespace nativegl
 
 bool CanMapBufferForRead(const FunctionsGL *functions);