浏览代码

st/mesa: don't use resource_copy_region for CopyPixels with conditional render

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
Marek Olšák 14 年前
父节点
当前提交
1b37a41661
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2
    1
      src/mesa/state_tracker/st_cb_drawpixels.c

+ 2
- 1
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;


正在加载...
取消
保存