Fix check for glTexStorage2D fn ptr

git-svn-id: http://skia.googlecode.com/svn/trunk@2982 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
bsalomon@google.com 2012-01-06 19:05:43 +00:00
parent b55deeb1c7
commit baa9ea10f9

View File

@ -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