AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update to allow packed depth-stencil on ES3

Browse Source 
R=robertphillips@google.com

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@11130 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
commit-bot@chromium.org 2013-09-06 15:28:01 +00:00
parent b7061176c7
commit 04c500fd75
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gpu/gl/GrGLCaps.cpp
View File

@ -501,7 +501,8 @@ void GrGLCaps::initStencilFormats(const GrGLContextInfo& ctxInfo) {
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")) {

3
src/gpu/gl/SkGLContextHelper.cpp
View File

@ -82,7 +82,8 @@ bool SkGLContextHelper::init(int width, int height) {
// 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") ||