[Mesa-dev] [PATCH 1/4 v2] meta: Remove error checks for texture <-> pixel-buffer transfers that don't belong in driver code

[Laura Ekstrand]

LGTM.

Reviewed-by: Laura Ekstrand <laura at jlekstrand.net>

On Tue, Mar 10, 2015 at 11:33 AM, Eduardo Lima Mitev <elima at igalia.com>
wrote:

> The implementation of texture <-> pixel-buffer transfers in drivers common
> layer
> includes certain error checks and argument validation that don't belong
> there,
> considering how the Mesa codebase is laid out. These are higher level
> validations that, if necessary, should be performed earlier (i.e, in GL API
> entry points).
>
> This patch simply removes these error checks from driver code.
>
> For more information, see discussion at
> http://lists.freedesktop.org/archives/mesa-dev/2015-February/077417.html.
> ---
>  src/mesa/drivers/common/meta_tex_subimage.c | 32
> -----------------------------
>  1 file changed, 32 deletions(-)
>
> diff --git a/src/mesa/drivers/common/meta_tex_subimage.c
> b/src/mesa/drivers/common/meta_tex_subimage.c
> index e29addb..ad6e787 100644
> --- a/src/mesa/drivers/common/meta_tex_subimage.c
> +++ b/src/mesa/drivers/common/meta_tex_subimage.c
> @@ -150,9 +150,6 @@ _mesa_meta_pbo_TexSubImage(struct gl_context *ctx,
> GLuint dims,
>     bool success = false;
>     int z;
>
> -   /* XXX: This should probably be passed in from somewhere */
> -   const char *where = "_mesa_meta_pbo_TexSubImage";
> -
>     if (!_mesa_is_bufferobj(packing->BufferObj) && !create_pbo)
>        return false;
>
> @@ -165,19 +162,6 @@ _mesa_meta_pbo_TexSubImage(struct gl_context *ctx,
> GLuint dims,
>     if (ctx->_ImageTransferState)
>        return false;
>
> -   if (!_mesa_validate_pbo_access(dims, packing, width, height, depth,
> -                                  format, type, INT_MAX, pixels)) {
> -      _mesa_error(ctx, GL_INVALID_OPERATION,
> -                  "%s(out of bounds PBO access)", where);
> -      return true;
> -   }
> -
> -   if (_mesa_check_disallowed_mapping(packing->BufferObj)) {
> -      /* buffer is mapped - that's an error */
> -      _mesa_error(ctx, GL_INVALID_OPERATION, "%s(PBO is mapped)", where);
> -      return true;
> -   }
> -
>     /* For arrays, use a tall (height * depth) 2D texture but taking into
>      * account the inter-image padding specified with the image height
> packing
>      * property.
> @@ -277,9 +261,6 @@ _mesa_meta_pbo_GetTexSubImage(struct gl_context *ctx,
> GLuint dims,
>     bool success = false;
>     int z;
>
> -   /* XXX: This should probably be passed in from somewhere */
> -   const char *where = "_mesa_meta_pbo_GetTexSubImage";
> -
>     if (!_mesa_is_bufferobj(packing->BufferObj))
>        return false;
>
> @@ -292,19 +273,6 @@ _mesa_meta_pbo_GetTexSubImage(struct gl_context *ctx,
> GLuint dims,
>     if (ctx->_ImageTransferState)
>        return false;
>
> -   if (!_mesa_validate_pbo_access(dims, packing, width, height, depth,
> -                                  format, type, INT_MAX, pixels)) {
> -      _mesa_error(ctx, GL_INVALID_OPERATION,
> -                  "%s(out of bounds PBO access)", where);
> -      return true;
> -   }
> -
> -   if (_mesa_check_disallowed_mapping(packing->BufferObj)) {
> -      /* buffer is mapped - that's an error */
> -      _mesa_error(ctx, GL_INVALID_OPERATION, "%s(PBO is mapped)", where);
> -      return true;
> -   }
> -
>     /* For arrays, use a tall (height * depth) 2D texture but taking into
>      * account the inter-image padding specified with the image height
> packing
>      * property.
> --
> 2.1.3
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20150310/9cc623c6/attachment.html>