Rename GrGLBinding->GrGLStandard, no longer a bitfield

src/gpu/gl/GrGLUtil.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "GrGLUtil.h"
 #include "SkMatrix.h"
@@ skipping 75 matching lines @@
 #if GR_GL_LOG_CALLS
     bool gLogCallsGL = !!(GR_GL_LOG_CALLS_START);
 #endif
 
 #if GR_GL_CHECK_ERROR
     bool gCheckErrorGL = !!(GR_GL_CHECK_ERROR_START);
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
 
-GrGLBinding GrGLGetBindingInUseFromString(const char* versionString) {
+GrGLStandard GrGLGetStandardInUseFromString(const char* versionString) {
     if (NULL == versionString) {
         SkDEBUGFAIL("NULL GL version string.");
-        return kNone_GrGLBinding;
+        return kNone_GrGLStandard;
     }
 
     int major, minor;
 
     // check for desktop
     int n = sscanf(versionString, "%d.%d", &major, &minor);
     if (2 == n) {
-        return kDesktop_GrGLBinding;
+        return kGL_GrGLStandard;
     }
 
     // check for ES 1
     char profile[2];
     n = sscanf(versionString, "OpenGL ES-%c%c %d.%d", profile, profile+1, &major, &minor);
     if (4 == n) {
         // we no longer support ES1.
-        return kNone_GrGLBinding;
+        return kNone_GrGLStandard;
     }
 
     // check for ES2
     n = sscanf(versionString, "OpenGL ES %d.%d", &major, &minor);
     if (2 == n) {
-        return kES_GrGLBinding;
+        return kGLES_GrGLStandard;
     }
-    return kNone_GrGLBinding;
+    return kNone_GrGLStandard;
 }
 
 bool GrGLIsMesaFromVersionString(const char* versionString) {
     int major, minor, mesaMajor, mesaMinor;
     int n = sscanf(versionString, "%d.%d Mesa %d.%d", &major, &minor, &mesaMajor, &mesaMinor);
     return 4 == n;
 }
 
 bool GrGLIsChromiumFromRendererString(const char* rendererString) {
     return 0 == strcmp(rendererString, "Chromium");
@@ skipping 87 matching lines @@
 
 GrGLRenderer GrGLGetRendererFromString(const char* rendererString) {
     if (NULL != rendererString) {
         if (0 == strcmp(rendererString, "NVIDIA Tegra 3")) {
             return kTegra3_GrGLRenderer;
         }
     }
     return kOther_GrGLRenderer;
 }
 
-GrGLBinding GrGLGetBindingInUse(const GrGLInterface* gl) {
-    const GrGLubyte* v;
-    GR_GL_CALL_RET(gl, v, GetString(GR_GL_VERSION));
-    return GrGLGetBindingInUseFromString((const char*) v);
-}
-
 GrGLVersion GrGLGetVersion(const GrGLInterface* gl) {
     const GrGLubyte* v;
     GR_GL_CALL_RET(gl, v, GetString(GR_GL_VERSION));
     return GrGLGetVersionFromString((const char*) v);
 }
 
 GrGLSLVersion GrGLGetGLSLVersion(const GrGLInterface* gl) {
     const GrGLubyte* v;
     GR_GL_CALL_RET(gl, v, GetString(GR_GL_SHADING_LANGUAGE_VERSION));
     return GrGLGetGLSLVersionFromString((const char*) v);
@@ skipping 46 matching lines @@
     dest[9]  = 0;
     dest[10] = 1;
     dest[11] = 0;
 
     // Col 3
     dest[12] = SkScalarToFloat(src[SkMatrix::kMTransX]);
     dest[13] = SkScalarToFloat(src[SkMatrix::kMTransY]);
     dest[14] = 0;
     dest[15] = SkScalarToFloat(src[SkMatrix::kMPersp2]);
 }