Move GrGLExtensions from GrGLContextInfo to GrGLInterface

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 "GrGLExtensions.h"
 #include "SkRefCnt.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 
 /**
- * Classifies GL contexts by which standard they implement (currently as Desktop
- * vs. ES).
- */
-enum GrGLStandard {
-    kNone_GrGLStandard,
-    kGL_GrGLStandard,
-    kGLES_GrGLStandard,
-};
-
-// Temporary aliases until Chromium can be updated.
-typedef GrGLStandard GrGLBinding;
-static const GrGLStandard kES2_GrGLBinding = kGLES_GrGLStandard;
-static const GrGLStandard kDesktop_GrGLBinding = kGL_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.
  *
  * The default interface is returned by GrGLDefaultInterface. This function's
  * implementation is platform-specific. Several have been provided, along with
  * an implementation that simply returns NULL.
  *
@@ skipping 78 matching lines @@
     // function pointers have been initialized for both the GL version and any advertised
     // extensions.
     bool validate() const;
 
     // Indicates the type of GL implementation
     union {
         GrGLStandard fStandard;
         GrGLStandard fBindingsExported; // Legacy name, will be remove when Chromium is updated.
     };
 
+    GrGLExtensions fExtensions;
+
+    // This wrapper and const hackery is necessary because the factories in Chromium do not yet
+    // initialize fExtensions.
+    bool hasExtension(const char ext[]) const {
+        if (!fExtensions.isInitialized()) {
+            GrGLExtensions* extensions = const_cast<GrGLExtensions*>(&fExtensions);
+            if (!extensions->init(fStandard, fGetString, fGetStringi, fGetIntegerv)) {
+                return false;
+            }
+        }
+        return fExtensions.has(ext);
+    }
+
     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;
     GLPtr<GrGLBindTextureProc> fBindTexture;
@@ skipping 203 matching lines @@
 
     // Per-GL func callback
 #if GR_GL_PER_GL_FUNC_CALLBACK
     GrGLInterfaceCallbackProc fCallback;
     GrGLInterfaceCallbackData fCallbackData;
 #endif
 
 };
 
 #endif