commit 1744f97ea73384b9f75b0ccee0a36a213c681d3a
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Feb 26 21:46:32 2013 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Feb 26 21:46:32 2013 +0000
tree 984f3a6988234c1a797049b2a43705cf970c1866
parent 8d33a24cfe4540126ae00618cc691c610d398d8d

Use glGetStringi to get extensions when available.
Review URL: https://codereview.chromium.org/12328111

git-svn-id: http://skia.googlecode.com/svn/trunk@7872 2bbb7eff-a529-9590-31e7-b0007b416f81

src/gpu/gl/SkGLContext.cpp

diff --git a/src/gpu/gl/SkGLContext.cpp b/src/gpu/gl/SkGLContext.cpp
index c1b9505..6076845 100644
--- a/src/gpu/gl/SkGLContext.cpp
+++ b/src/gpu/gl/SkGLContext.cpp
@@ -6,7 +6,7 @@
  * found in the LICENSE file.
  */
 #include "gl/SkGLContext.h"
-#include "gl/GrGLUtil.h"
+#include "GrGLUtil.h"
 
 SK_DEFINE_INST_COUNT(SkGLContext)
 
@@ -29,10 +29,6 @@
     SkSafeUnref(fGL);
 }
 
-bool SkGLContext::hasExtension(const char* extensionName) const {
-    return GrGLHasExtensionFromString(extensionName, fExtensionString.c_str());
-}
-
 bool SkGLContext::init(int width, int height) {
     if (fGL) {
         fGL->unref();
@@ -43,8 +39,13 @@
     if (fGL) {
         const GrGLubyte* temp;
 
-        SK_GL_RET(*this, temp, GetString(GR_GL_EXTENSIONS));
-        fExtensionString = reinterpret_cast<const char*>(temp);
+        GrGLBinding bindingInUse = GrGLGetBindingInUse(this->gl());
+
+        if (!fGL->validate(bindingInUse) || !fExtensions.init(bindingInUse, fGL)) {
+            fGL = NULL;
+            this->destroyGLContext();
+            return false;
+        }
 
         SK_GL_RET(*this, temp, GetString(GR_GL_VERSION));
         const char* versionStr = reinterpret_cast<const char*>(temp);
@@ -56,8 +57,6 @@
             SK_GL_RET(*this, error, GetError());
         } while (GR_GL_NO_ERROR != error);
 
-        GrGLBinding bindingInUse = GrGLGetBindingInUse(this->gl());
-
         SK_GL(*this, GenFramebuffers(1, &fFBO));
         SK_GL(*this, BindFramebuffer(GR_GL_FRAMEBUFFER, fFBO));
         SK_GL(*this, GenRenderbuffers(1, &fColorBufferID));
@@ -83,12 +82,11 @@
         // depth stencil being available.
         bool supportsPackedDepthStencil;
         if (kES2_GrGLBinding == bindingInUse) {
-            supportsPackedDepthStencil =
-                    this->hasExtension("GL_OES_packed_depth_stencil");
+            supportsPackedDepthStencil = this->hasExtension("GL_OES_packed_depth_stencil");
         } else {
             supportsPackedDepthStencil = version >= GR_GL_VER(3,0) ||
-                    this->hasExtension("GL_EXT_packed_depth_stencil") ||
-                    this->hasExtension("GL_ARB_framebuffer_object");
+                                         this->hasExtension("GL_EXT_packed_depth_stencil") ||
+                                         this->hasExtension("GL_ARB_framebuffer_object");
         }
 
         if (supportsPackedDepthStencil) {