The conditional rendering should be able to kill CopyPixels.
I assume the render condition has no effect on resource_copy_region.
This fixes piglit:
- NV_conditional_render/copypixels
NOTE: This is a candidate for the 7.10 branch.
---
src/mesa/state_tracker/st_cb_drawpixels.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c
b/src/mesa/state_tracker/st_cb_drawpixels.c
index 29c1df4..965fbcd 100644
--- a/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -1247,7 +1247,8 @@ blit_copy_pixels(struct gl_context *ctx, GLint srcx,
GLint srcy,
!ctx->VertexProgram.Enabled &&
!ctx->Shader.CurrentFragmentProgram &&
st_fb_orientation(ctx->ReadBuffer) ==
st_fb_orientation(ctx->DrawBuffer) &&
- ctx->DrawBuffer->_NumColorDrawBuffers == 1) {
+ ctx->DrawBuffer->_NumColorDrawBuffers == 1 &&
+ !ctx->Query.CondRenderQuery) {
struct st_renderbuffer *rbRead, *rbDraw;
GLint drawX, drawY;
--
1.7.4.1
_______________________________________________
mesa-dev mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
