[Mesa-dev] [PATCH] mesa: check if GL_ARB_copy_image is enabled in _mesa_CopyImageSubData()

[Jason Ekstrand]

Reviewed-by: Jason Ekstrand <jason.ekstrand at intel.com>
On Aug 15, 2014 6:43 AM, "Brian Paul" <brianp at vmware.com> wrote:

> 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.
> ---
>  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) {
> --
> 1.7.10.4
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20140815/b54ae49d/attachment.html>