Mesa (master): mesa: check if GL_ARB_copy_image is enabled in _mesa_CopyImageSubData()
Brian Paul
brianp at kemper.freedesktop.org
Fri Aug 15 14:35:13 UTC 2014
Module: Mesa
Branch: master
Commit: ffb8e884f7c466c36cf64bf56ff63c52a833fa66
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ffb8e884f7c466c36cf64bf56ff63c52a833fa66
Author: Brian Paul <brianp at vmware.com>
Date: Fri Aug 15 07:40:47 2014 -0600
mesa: check if GL_ARB_copy_image is enabled in _mesa_CopyImageSubData()
Generate a GL error and return rather than crashing on a null
ctx->Driver.CopyImageSubData pointer (gallium). This allows apitraces
with glCopyImageSubData() calls to continue rather than crash.
Plus, fix a comment typo.
Reviewed-by: Jason Ekstrand <jason.ekstrand at intel.com>
---
src/mesa/main/copyimage.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/mesa/main/copyimage.c b/src/mesa/main/copyimage.c
index dcbc83d..df7d7c2 100644
--- a/src/mesa/main/copyimage.c
+++ b/src/mesa/main/copyimage.c
@@ -277,6 +277,12 @@ _mesa_CopyImageSubData(GLuint srcName, GLenum srcTarget, GLint srcLevel,
dstX, dstY, dstZ,
srcWidth, srcHeight, srcWidth);
+ if (!ctx->Extensions.ARB_copy_image) {
+ _mesa_error(ctx, GL_INVALID_OPERATION,
+ "glCopyImageSubData(extension not available)");
+ return;
+ }
+
if (!prepare_target(ctx, srcName, &srcTarget, srcLevel,
&srcTexObj, &srcTexImage, &tmpTexNames[0], "src"))
goto cleanup;
@@ -328,7 +334,7 @@ _mesa_CopyImageSubData(GLuint srcName, GLenum srcTarget, GLint srcLevel,
srcTexImage->InternalFormat,
dstTexImage->InternalFormat)) {
} else {
- return; /* Error loged by _mesa_texture_view_compatible_format */
+ return; /* Error logged by _mesa_texture_view_compatible_format */
}
for (i = 0; i < srcDepth; ++i) {
More information about the mesa-commit
mailing list