commit 22dd6b9766b3299fa335e4b58eb913bbaa9ae23c
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Aug 16 18:13:48 2013 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Aug 16 18:13:48 2013 +0000
tree e7d10b948f30cd05dd056c1219d2007bf43f80aa
parent 5c34491b9493f538972588ef5ccc5e3c8e73738c

Always support NPOT tiling/MIPs on ES3

R=jvanverth@google.com

Author: bsalomon@google.com

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

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

src/gpu/gl/GrGLCaps.cpp

diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp
index 5ddf21c..df8dc09 100644
--- a/src/gpu/gl/GrGLCaps.cpp
+++ b/src/gpu/gl/GrGLCaps.cpp
@@ -275,7 +275,9 @@
         }
     } else {
         // Unextended ES2 supports NPOT textures with clamp_to_edge and non-mip filters only
-        fNPOTTextureTileSupport = ctxInfo.hasExtension("GL_OES_texture_npot");
+        // ES3 has no limitations.
+        fNPOTTextureTileSupport = ctxInfo.version() >= GR_GL_VER(3,0) ||
+                                  ctxInfo.hasExtension("GL_OES_texture_npot");
     }
 
     fHWAALineSupport = (kDesktop_GrGLBinding == binding);