Rename GrGLBinding->GrGLStandard, no longer a bitfield

src/gpu/gl/GrGLContext.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrGLContext.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 GrGLContextInfo& GrGLContextInfo::operator= (const GrGLContextInfo& ctxInfo) {
-    fBindingInUse = ctxInfo.fBindingInUse;
+    fStandard = ctxInfo.fStandard;
     fGLVersion = ctxInfo.fGLVersion;
     fGLSLGeneration = ctxInfo.fGLSLGeneration;
     fVendor = ctxInfo.fVendor;
     fRenderer = ctxInfo.fRenderer;
     fExtensions = ctxInfo.fExtensions;
     fIsMesa = ctxInfo.fIsMesa;
     fIsChromium = ctxInfo.fIsChromium;
     *fGLCaps = *ctxInfo.fGLCaps.get();
     return *this;
 }
 
 bool GrGLContextInfo::initialize(const GrGLInterface* interface) {
     this->reset();
     // We haven't validated the GrGLInterface yet, so check for GetString
     // function pointer
     if (interface->fGetString) {
         const GrGLubyte* verUByte;
         GR_GL_CALL_RET(interface, verUByte, GetString(GR_GL_VERSION));
         const char* ver = reinterpret_cast<const char*>(verUByte);
 
         const GrGLubyte* rendererUByte;
         GR_GL_CALL_RET(interface, rendererUByte, GetString(GR_GL_RENDERER));
         const char* renderer = reinterpret_cast<const char*>(rendererUByte);
 
-        GrGLBinding binding = GrGLGetBindingInUseFromString(ver);
-
-        if (0 != binding && interface->validate(binding) && fExtensions.init(binding, interface)) {
-            fBindingInUse = binding;
+        if (interface->validate() && fExtensions.init(interface)) {
 
             fGLVersion = GrGLGetVersionFromString(ver);
 
-            fGLSLGeneration = GrGetGLSLGeneration(fBindingInUse, interface);
+            fGLSLGeneration = GrGetGLSLGeneration(interface);
 
             fVendor = GrGLGetVendor(interface);
 
             fRenderer = GrGLGetRendererFromString(renderer);
 
             fIsMesa = GrGLIsMesaFromVersionString(ver);
 
             fIsChromium = GrGLIsChromiumFromRendererString(renderer);
 
             fGLCaps->init(*this, interface);
+
+            fStandard = interface->fStandard;

[jvanverth1, 2014/01/16 15:56:24]

Indent?

[bsalomon, 2014/01/16 16:02:09]

? Looks right to me.

             return true;
         }
     }
     return false;
 }
 
 bool GrGLContextInfo::isInitialized() const {
-    return kNone_GrGLBinding != fBindingInUse;
+    return kNone_GrGLStandard != fStandard;
 }
 
 void GrGLContextInfo::reset() {
-    fBindingInUse = kNone_GrGLBinding;
+    fStandard = kNone_GrGLStandard;
     fGLVersion = GR_GL_VER(0, 0);
     fGLSLGeneration = static_cast<GrGLSLGeneration>(0);
     fVendor = kOther_GrGLVendor;
     fRenderer = kOther_GrGLRenderer;
     fIsMesa = false;
     fIsChromium = false;
     fExtensions.reset();
     fGLCaps->reset();
 }
 
@@ skipping 20 matching lines @@
 }
 
 bool GrGLContext::initialize(const GrGLInterface* interface) {
     if (fInfo.initialize(interface)) {
         fInterface = interface;
         interface->ref();
         return true;
     }
     return false;
 }