From ffb8e884f7c466c36cf64bf56ff63c52a833fa66 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 15 Aug 2014 07:40:47 -0600 Subject: [PATCH] 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 --- 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 dcbc83de6fb..df7d7c2727d 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) { -- 2.30.2