diff options
| author | Brian Paul <brianp@vmware.com> | 2014-08-15 07:40:47 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2014-08-15 08:35:17 -0600 |
| commit | ffb8e884f7c466c36cf64bf56ff63c52a833fa66 (patch) | |
| tree | 8d0a039daadc64be6cefce0ee333ead3f1efc566 /src/mesa/main/copyimage.c | |
| parent | aa9d4f9d1a01fbb829571dac1cf896a8288c7286 (diff) | |
| download | external_mesa3d-ffb8e884f7c466c36cf64bf56ff63c52a833fa66.zip external_mesa3d-ffb8e884f7c466c36cf64bf56ff63c52a833fa66.tar.gz external_mesa3d-ffb8e884f7c466c36cf64bf56ff63c52a833fa66.tar.bz2 | |
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@intel.com>
Diffstat (limited to 'src/mesa/main/copyimage.c')
| -rw-r--r-- | src/mesa/main/copyimage.c | 8 |
1 files changed, 7 insertions, 1 deletions
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) { |