Rename GrGLBinding->GrGLStandard, no longer a bitfield

include/gpu/gl/GrGLInterface.h

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrGLInterface_DEFINED
 #define GrGLInterface_DEFINED
 
 #include "GrGLFunctions.h"
 #include "SkRefCnt.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 
 /**
- * Classifies GL contexts (currently as Desktop vs. ES2). This is a bitfield.
- * A GrGLInterface (defined below) may support multiple bindings.
+ * Classifies GL contexts by which standard they implement (currently as Desktop
+ * vs. ES).
  */
-enum GrGLBinding {
-    kNone_GrGLBinding = 0x0,
-
-    kDesktop_GrGLBinding = 0x01,
-    kES_GrGLBinding = 0x02,  // ES2+ only
-
-    // for iteration of GrGLBindings
-    kFirstGrGLBinding = kDesktop_GrGLBinding,
-    kLastGrGLBinding = kES_GrGLBinding
+enum GrGLStandard {
+    kNone_GrGLStandard,
+    kGL_GrGLStandard,
+    kGLES_GrGLStandard,
 };
 
 // Temporary alias until Chromium can be updated.
-static const GrGLBinding kES2_GrGLBinding = kES_GrGLBinding;
+static const GrGLStandard kES2_GrGLBinding = kGLES_GrGLStandard;
 
 ////////////////////////////////////////////////////////////////////////////////
 
 /**
  * Rather than depend on platform-specific GL headers and libraries, we require
  * the client to provide a struct of GL function pointers. This struct can be
  * specified per-GrContext as a parameter to GrContext::Create. If NULL is
  * passed to Create then a "default" GL interface is created. If the default is
  * also NULL GrContext creation will fail.
  *
@@ skipping 71 matching lines @@
         FNPTR_TYPE fPtr;
     };
 
     typedef SkRefCnt INHERITED;
 
 public:
     SK_DECLARE_INST_COUNT(GrGLInterface)
 
     GrGLInterface();
 
-    // Validates that the GrGLInterface supports a binding. This means that
-    // the GrGLinterface advertises the binding in fBindingsExported and all
-    // the necessary function pointers have been initialized. The interface is
-    // validated for the current OpenGL context.
-    bool validate(GrGLBinding binding) const;
+    // Validates that the GrGLInterface supports its advertised standard. This means the necessary
+    // function pointers have been initialized for both the GL version and any advertised
+    // extensions.
+    bool validate() const;
 
-    // Indicator variable specifying the type of GL implementation
-    // exported:  GLES2 and/or Desktop.
-    GrGLBinding fBindingsExported;
+    // Indicates the type of GL implementation
+    union {
+        GrGLStandard fStandard;
+        GrGLStandard fBindingsExported; // Legacy name, will be remove when Chromium is updated.
+    };
 
     GLPtr<GrGLActiveTextureProc> fActiveTexture;
     GLPtr<GrGLAttachShaderProc> fAttachShader;
     GLPtr<GrGLBeginQueryProc> fBeginQuery;
     GLPtr<GrGLBindAttribLocationProc> fBindAttribLocation;
     GLPtr<GrGLBindBufferProc> fBindBuffer;
     GLPtr<GrGLBindFragDataLocationProc> fBindFragDataLocation;
     GLPtr<GrGLBindFragDataLocationIndexedProc> fBindFragDataLocationIndexed;
     GLPtr<GrGLBindFramebufferProc> fBindFramebuffer;
     GLPtr<GrGLBindRenderbufferProc> fBindRenderbuffer;
@@ skipping 205 matching lines @@
 
     // Per-GL func callback
 #if GR_GL_PER_GL_FUNC_CALLBACK
     GrGLInterfaceCallbackProc fCallback;
     GrGLInterfaceCallbackData fCallbackData;
 #endif
 
 };
 
 #endif