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 alias until Chromium can be updated.
-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.
  *
  * 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 77 matching lines @@
     // 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;
 
     // Indicates the type of GL implementation
     union {
         GrGLStandard fStandard;
         GrGLStandard fBindingsExported; // Legacy name, will be remove when Chromium is updated.
     };
 

[robertphillips, 2014/01/16 17:13:11]

Do we want to make fExtensions protected if using it requires the initialization
check?

[bsalomon, 2014/01/16 18:28:45]

We can't. The factory functions need access to it. They're now supposed to
initialize it. The lazy init is only necessary until we make the factories that
live in Chromium init it. At that point we can remove the hasExtension()
function and just directly access fExtensions.

+    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 204 matching lines @@
 
     // Per-GL func callback
 #if GR_GL_PER_GL_FUNC_CALLBACK
     GrGLInterfaceCallbackProc fCallback;
     GrGLInterfaceCallbackData fCallbackData;
 #endif
 
 };
 
 #endif