Re: [Mesa-dev] [PATCH] meta/copy_image: Stash off the scissor

2015-07-29 Thread Matt Turner
On Tue, Jul 28, 2015 at 12:06 PM, Jason Ekstrand ja...@jlekstrand.net wrote:
 The meta CopyImageSubData path uses BlitFramebuffers to do the actual copy.
 The only thing that can affect BlitFramebuffers other than the currently
 bound framebuffers is the scissor so we need to save that off and reset it.
 If we don't do this, applications that use a scissor together with
 CopyImageSubData will get accidentally scissored copies.

 Tested-by: Markus Wick markus at selfnet.de

s/ at /@/
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev


[Mesa-dev] [PATCH] meta/copy_image: Stash off the scissor

2015-07-28 Thread Jason Ekstrand
The meta CopyImageSubData path uses BlitFramebuffers to do the actual copy.
The only thing that can affect BlitFramebuffers other than the currently
bound framebuffers is the scissor so we need to save that off and reset it.
If we don't do this, applications that use a scissor together with
CopyImageSubData will get accidentally scissored copies.

Tested-by: Markus Wick markus at selfnet.de

---
 src/mesa/drivers/common/meta_copy_image.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/common/meta_copy_image.c 
b/src/mesa/drivers/common/meta_copy_image.c
index 1729766..149ed18 100644
--- a/src/mesa/drivers/common/meta_copy_image.c
+++ b/src/mesa/drivers/common/meta_copy_image.c
@@ -138,8 +138,8 @@ _mesa_meta_CopyImageSubData_uncompressed(struct gl_context 
*ctx,
  goto cleanup;
}
 
-   /* We really only need to stash the bound framebuffers. */
-   _mesa_meta_begin(ctx, 0);
+   /* We really only need to stash the bound framebuffers and scissor. */
+   _mesa_meta_begin(ctx, MESA_META_SCISSOR);
 
_mesa_GenFramebuffers(2, fbos);
_mesa_BindFramebuffer(GL_READ_FRAMEBUFFER, fbos[0]);
-- 
2.4.3

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev


Re: [Mesa-dev] [PATCH] meta/copy_image: Stash off the scissor

2015-07-28 Thread Anuj Phogat
On Tue, Jul 28, 2015 at 12:06 PM, Jason Ekstrand ja...@jlekstrand.net wrote:
 The meta CopyImageSubData path uses BlitFramebuffers to do the actual copy.
 The only thing that can affect BlitFramebuffers other than the currently
 bound framebuffers is the scissor so we need to save that off and reset it.
 If we don't do this, applications that use a scissor together with
 CopyImageSubData will get accidentally scissored copies.

 Tested-by: Markus Wick markus at selfnet.de

 ---
  src/mesa/drivers/common/meta_copy_image.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

 diff --git a/src/mesa/drivers/common/meta_copy_image.c 
 b/src/mesa/drivers/common/meta_copy_image.c
 index 1729766..149ed18 100644
 --- a/src/mesa/drivers/common/meta_copy_image.c
 +++ b/src/mesa/drivers/common/meta_copy_image.c
 @@ -138,8 +138,8 @@ _mesa_meta_CopyImageSubData_uncompressed(struct 
 gl_context *ctx,
   goto cleanup;
 }

 -   /* We really only need to stash the bound framebuffers. */
 -   _mesa_meta_begin(ctx, 0);
 +   /* We really only need to stash the bound framebuffers and scissor. */
 +   _mesa_meta_begin(ctx, MESA_META_SCISSOR);

 _mesa_GenFramebuffers(2, fbos);
 _mesa_BindFramebuffer(GL_READ_FRAMEBUFFER, fbos[0]);
 --
 2.4.3

 ___
 mesa-dev mailing list
 mesa-dev@lists.freedesktop.org
 http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reviewed-by: Anuj Phogat anuj.pho...@gmail.com
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev