diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-01-06 19:05:43 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-01-06 19:05:43 +0000 |
| commit | baa9ea10f9b704f42efc804e7401e0aa519b3e29 (patch) | |
| tree | 5c4112462b54029a59fd290b7070248337f5cce4 | |
| parent | b55deeb1c7c692023603639a9b29c0e3de124eac (diff) | |
Fix check for glTexStorage2D fn ptr
git-svn-id: http://skia.googlecode.com/svn/trunk@2982 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | src/gpu/GrGLInterface.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/gpu/GrGLInterface.cpp b/src/gpu/GrGLInterface.cpp index 66aea63b5c..77ab90a1b6 100644 --- a/src/gpu/GrGLInterface.cpp +++ b/src/gpu/GrGLInterface.cpp @@ -419,10 +419,18 @@ bool GrGLInterface::validate() const { // GL_EXT_texture_storage is part of desktop 4.2 // There is a desktop ARB extension and an ES+desktop EXT extension - if ((kDesktop_GrGLBinding == fBindingsExported && - (glVer >= GR_GL_VER(4,2)) || - GrGLHasExtensionFromString("GL_ARB_texture_storage", ext)) || - GrGLHasExtensionFromString("GL_EXT_texture_storage", ext)) { + if (kDesktop_GrGLBinding == fBindingsExported) { + if (glVer >= GR_GL_VER(4,2) || + GrGLHasExtensionFromString("GL_ARB_texture_storage", ext) || + GrGLHasExtensionFromString("GL_EXT_texture_storage", ext)) { + if (NULL == fTexStorage2D) { + return false; + } + } + } else if (GrGLHasExtensionFromString("GL_EXT_texture_storage", ext)) { + if (NULL == fTexStorage2D) { + return false; + } } // FBO MSAA |