commit 726e621000582e4de7c9ce0f7e9950c3af4e5d9b
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Aug 23 20:55:46 2013 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Aug 23 20:55:46 2013 +0000
tree 2d801b91afd37d6c6c5e4b06cb8462cd6035e74c
parent cbe63fe1a8fc98a657b637b580e04518019ce021

Use indexed extensions on ES3.

R=jvanverth@google.com

Author: bsalomon@google.com

Review URL: https://chromiumcodereview.appspot.com/23359002

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

src/gpu/gl/GrGLExtensions.cpp

diff --git a/src/gpu/gl/GrGLExtensions.cpp b/src/gpu/gl/GrGLExtensions.cpp
index e886aff..5ebab14 100644
--- a/src/gpu/gl/GrGLExtensions.cpp
+++ b/src/gpu/gl/GrGLExtensions.cpp
@@ -26,15 +26,15 @@
     if (NULL == getString) {
         return false;
     }
-    bool indexed = false;
-    if (kDesktop_GrGLBinding == binding) {
-        const GrGLubyte* verString = getString(GR_GL_VERSION);
-        if (NULL == verString) {
-            return false;
-        }
-        GrGLVersion version = GrGLGetVersionFromString((const char*) verString);
-        indexed = version >= GR_GL_VER(3, 0);
+
+    // glGetStringi and indexed extensions were added in version 3.0 of desktop GL and ES.
+    const GrGLubyte* verString = getString(GR_GL_VERSION);
+    if (NULL == verString) {
+        return false;
     }
+    GrGLVersion version = GrGLGetVersionFromString((const char*) verString);
+    bool indexed = version >= GR_GL_VER(3, 0);
+
     if (indexed) {
         if (NULL == getStringi || NULL == getIntegerv) {
             return false;