commit 145af1c77f774de8a34b983e7f583c2fb398385e
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Sep 06 15:28:01 2013 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Sep 06 15:28:01 2013 +0000
tree ed04480ae0a2efae0bec2db2408dd6013a1da766
parent 9cb8929d2ae6b1c24df21b271db5d723bf7267b0

Update to allow packed depth-stencil on ES3

R=robertphillips@google.com

Author: bsalomon@google.com

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

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

gpu/gl/GrGLCaps.cpp

diff --git a/gpu/gl/GrGLCaps.cpp b/gpu/gl/GrGLCaps.cpp
index 1488e75..8ca88c1 100644
--- a/gpu/gl/GrGLCaps.cpp
+++ b/gpu/gl/GrGLCaps.cpp
@@ -501,7 +501,8 @@
 
         fStencilFormats.push_back() = gS8;
         //fStencilFormats.push_back() = gS16;
-        if (ctxInfo.hasExtension("GL_OES_packed_depth_stencil")) {
+        if (ctxInfo.version() >= GR_GL_VER(3,0) ||
+            ctxInfo.hasExtension("GL_OES_packed_depth_stencil")) {
             fStencilFormats.push_back() = gD24S8;
         }
         if (ctxInfo.hasExtension("GL_OES_stencil4")) {

gpu/gl/SkGLContextHelper.cpp

diff --git a/gpu/gl/SkGLContextHelper.cpp b/gpu/gl/SkGLContextHelper.cpp
index c4e9431..6f0372d 100644
--- a/gpu/gl/SkGLContextHelper.cpp
+++ b/gpu/gl/SkGLContextHelper.cpp
@@ -82,7 +82,8 @@
         // depth stencil being available.
         bool supportsPackedDepthStencil;
         if (kES_GrGLBinding == bindingInUse) {
-            supportsPackedDepthStencil = this->hasExtension("GL_OES_packed_depth_stencil");
+            supportsPackedDepthStencil = version >= GR_GL_VER(3,0) ||
+                                         this->hasExtension("GL_OES_packed_depth_stencil");
         } else {
             supportsPackedDepthStencil = version >= GR_GL_VER(3,0) ||
                                          this->hasExtension("GL_EXT_packed_depth_stencil") ||