From: Brian Paul <brianp@vmware.com>
Date: Wed, 13 Jan 2016 23:20:09 +0000 (-0700)
Subject: st/mesa: add check for color logicop in blit_copy_pixels()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6470435190ffd9b82ab53da7e857186b9b322516;p=mesa.git

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@amd.com>
---

diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c
index 7ed52dd2600..04a9de06520 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 &&