Move isTriangleMode to utilities.h.

src/libGLESv2/Context.cpp

@@ -1734,7 +1734,7 @@ void Context::applyState(GLenum drawMode)
     Framebuffer *framebufferObject = getDrawFramebuffer();
 
     GLint frontCCW = programBinary->getDxFrontCCWLocation();
-    GLfloat ccw = !isTriangleMode(drawMode) ? 0.0f : (mState.rasterizer.frontFace == GL_CCW ? 1.0f : -1.0f);
+    GLfloat ccw = !IsTriangleMode(drawMode) ? 0.0f : (mState.rasterizer.frontFace == GL_CCW ? 1.0f : -1.0f);
     programBinary->setUniform1fv(frontCCW, 1, &ccw);
 
     mRenderer->setRasterizerState(mState.rasterizer);
@@ -2498,7 +2498,7 @@ bool Context::skipDraw(GLenum drawMode)
             return true;
         }
     }
-    else if (isTriangleMode(drawMode))
+    else if (IsTriangleMode(drawMode))
     {
         if (mState.rasterizer.cullFace && mState.rasterizer.cullMode == GL_FRONT_AND_BACK)
         {
@@ -2509,25 +2509,6 @@ bool Context::skipDraw(GLenum drawMode)
     return false;
 }
 
-bool Context::isTriangleMode(GLenum drawMode)
-{
-    switch (drawMode)
-    {
-      case GL_TRIANGLES:
-      case GL_TRIANGLE_FAN:
-      case GL_TRIANGLE_STRIP:
-        return true;
-      case GL_POINTS:
-      case GL_LINES:
-      case GL_LINE_LOOP:
-      case GL_LINE_STRIP:
-        return false;
-      default: UNREACHABLE();
-    }
-
-    return false;
-}
-
 void Context::setVertexAttrib(GLuint index, const GLfloat *values)
 {
     ASSERT(index < gl::MAX_VERTEX_ATTRIBS);

src/libGLESv2/Context.h

@@ -437,7 +437,6 @@ class Context
     Texture *getIncompleteTexture(TextureType type);
 
     bool skipDraw(GLenum drawMode);
-    bool isTriangleMode(GLenum drawMode);
 
     void initExtensionString();
     void initRendererString();

src/libGLESv2/utilities.cpp

@@ -728,6 +728,25 @@ unsigned int GetStencilSize(GLenum stencilFormat)
     }
 }
 
+bool IsTriangleMode(GLenum drawMode)
+{
+    switch (drawMode)
+    {
+      case GL_TRIANGLES:
+      case GL_TRIANGLE_FAN:
+      case GL_TRIANGLE_STRIP:
+        return true;
+      case GL_POINTS:
+      case GL_LINES:
+      case GL_LINE_LOOP:
+      case GL_LINE_STRIP:
+        return false;
+      default: UNREACHABLE();
+    }
+
+    return false;
+}
+
 }
 
 std::string getTempPath()

src/libGLESv2/utilities.h

@@ -57,6 +57,8 @@ GLuint GetGreenSize(GLenum colorFormat);
 GLuint GetBlueSize(GLenum colorFormat);
 GLuint GetDepthSize(GLenum depthFormat);
 GLuint GetStencilSize(GLenum stencilFormat);
+bool IsTriangleMode(GLenum drawMode);
+
 }
 
 std::string getTempPath();