projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e976860
)
st/mesa: add check for color logicop in blit_copy_pixels()
author
Brian Paul
<brianp@vmware.com>
Wed, 13 Jan 2016 23:20:09 +0000
(16:20 -0700)
committer
Brian Paul
<brianp@vmware.com>
Thu, 14 Jan 2016 16:08:21 +0000
(09:08 -0700)
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>
src/mesa/state_tracker/st_cb_drawpixels.c
patch
|
blob
|
history
diff --git
a/src/mesa/state_tracker/st_cb_drawpixels.c
b/src/mesa/state_tracker/st_cb_drawpixels.c
index 7ed52dd2600805a50d5d89a93959d6b781dcadb1..04a9de06520dd89364e243e1991f8a3a4907fe7b 100644
(file)
--- 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 &&