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. Reviewed-by: Brian Paul <brianp@vmware.com>tags/mesa-7.11-rc1
@@ -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; | |||