Index: third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp |
diff --git a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp |
index ac5365be9cd94b8f831c97bd7977afd3aeb06bde..b0657c447fbe2dbb3431ec327745872be1d531bd 100644 |
--- a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp |
+++ b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp |
@@ -1914,13 +1914,12 @@ void WebGLRenderingContextBase::compressedTexSubImage2D(GLenum target, GLint lev |
synthesizeGLError(GL_INVALID_ENUM, "compressedTexSubImage2D", "invalid format"); |
return; |
} |
- if (!validateCompressedTexFuncData("compressedTexSubImage2D", width, height, format, data)) |
- return; |
- |
- if (!isWebGL2OrHigher() && format != tex->getInternalFormat(target, level)) { |
+ if (format != tex->getInternalFormat(target, level)) { |
synthesizeGLError(GL_INVALID_OPERATION, "compressedTexSubImage2D", "format does not match texture format"); |
return; |
} |
+ if (!validateCompressedTexFuncData("compressedTexSubImage2D", width, height, format, data)) |
+ return; |
if (!validateCompressedTexSubDimensions("compressedTexSubImage2D", target, level, xoffset, yoffset, width, height, format, tex)) |
return; |