Mesa (master): st/mesa: add check for color logicop in blit_copy_pixels()

[Brian Paul]

Module: Mesa
Branch: master
Commit: 6470435190ffd9b82ab53da7e857186b9b322516
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6470435190ffd9b82ab53da7e857186b9b322516

Author: Brian Paul <brianp at vmware.com>
Date:   Wed Jan 13 16:20:09 2016 -0700

st/mesa: add check for color logicop in blit_copy_pixels()

We check that a bunch of raster operations are disabled in
blit_copy_pixels().  We also need to check that color logicop is
disabled.

Reviewed-by: Marek Olšák <marek.olsak at amd.com>

---

 src/mesa/state_tracker/st_cb_drawpixels.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c
index 7ed52dd..04a9de0 100644
--- a/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -1302,6 +1302,7 @@ blit_copy_pixels(struct gl_context *ctx, GLint srcx, GLint srcy,
        ctx->_ImageTransferState == 0x0 &&
        !ctx->Color.BlendEnabled &&
        !ctx->Color.AlphaEnabled &&
+       (!ctx->Color.ColorLogicOpEnabled || ctx->Color.LogicOp == GL_COPY) &&
        !ctx->Depth.Test &&
        !ctx->Fog.Enabled &&
        !ctx->Stencil.Enabled &&