[Mesa-stable] [PATCH] meta/TexSubImage: Stash everything other than PIXEL_TRANSFER/store in meta_begin

[Jason Ekstrand]

Alternatively, it's probably safe (and faster) to just save/restore the
scissor in meta_begin/end.  The _mesa_meta_BlitFramebuffer implementation
stashes everything else anyway.
--Jason

On Fri, Feb 27, 2015 at 12:29 PM, Jason Ekstrand <jason at jlekstrand.net>
wrote:

> Cc: 10.5 <mesa-stable at lists.freedesktop.org>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89292
> ---
>  src/mesa/drivers/common/meta_tex_subimage.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/src/mesa/drivers/common/meta_tex_subimage.c
> b/src/mesa/drivers/common/meta_tex_subimage.c
> index 5ae12c8..802430a 100644
> --- a/src/mesa/drivers/common/meta_tex_subimage.c
> +++ b/src/mesa/drivers/common/meta_tex_subimage.c
> @@ -192,8 +192,8 @@ _mesa_meta_pbo_TexSubImage(struct gl_context *ctx,
> GLuint dims,
>     if (allocate_storage)
>        ctx->Driver.AllocTextureImageBuffer(ctx, tex_image);
>
> -   /* Only stash the current FBO */
> -   _mesa_meta_begin(ctx, 0);
> +   _mesa_meta_begin(ctx, ~(MESA_META_PIXEL_TRANSFER |
> +                           MESA_META_PIXEL_STORE));
>
>     _mesa_GenFramebuffers(2, fbos);
>     _mesa_BindFramebuffer(GL_READ_FRAMEBUFFER, fbos[0]);
> @@ -311,8 +311,8 @@ _mesa_meta_pbo_GetTexSubImage(struct gl_context *ctx,
> GLuint dims,
>     if (!pbo_tex_image)
>        return false;
>
> -   /* Only stash the current FBO */
> -   _mesa_meta_begin(ctx, 0);
> +   _mesa_meta_begin(ctx, ~(MESA_META_PIXEL_TRANSFER |
> +                           MESA_META_PIXEL_STORE));
>
>     _mesa_GenFramebuffers(2, fbos);
>
> --
> 2.3.0
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/mesa-stable/attachments/20150227/901e995d/attachment.html>