summaryrefslogtreecommitdiff
path: root/src/gallium
diff options
context:
space:
mode:
authorMarek Olšák <marek.olsak@amd.com>2014-06-02 16:07:48 +0200
committerMarek Olšák <marek.olsak@amd.com>2014-06-03 13:33:14 +0200
commitd929a30e9a4605cf735a1a1ea8e51daaca01de44 (patch)
tree53871ae780a780814c734ad8681a96af6f011456 /src/gallium
parentbf701a84eb000910015a3c3ee9860141cde4990d (diff)
r300g: BlitFramebuffer should follow render condition
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/drivers/r300/r300_blit.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gallium/drivers/r300/r300_blit.c b/src/gallium/drivers/r300/r300_blit.c
index 2b516d284d1..2320abb9756 100644
--- a/src/gallium/drivers/r300/r300_blit.c
+++ b/src/gallium/drivers/r300/r300_blit.c
@@ -45,7 +45,7 @@ enum r300_blitter_op /* bitmask */
R300_SAVE_TEXTURES | R300_IGNORE_RENDER_COND,
R300_BLIT = R300_STOP_QUERY | R300_SAVE_FRAMEBUFFER |
- R300_SAVE_TEXTURES | R300_IGNORE_RENDER_COND,
+ R300_SAVE_TEXTURES,
R300_DECOMPRESS = R300_STOP_QUERY | R300_IGNORE_RENDER_COND,
};
@@ -786,7 +786,7 @@ static void r300_msaa_resolve(struct pipe_context *pipe,
blit.src.resource = tmp;
blit.src.box.z = 0;
- r300_blitter_begin(r300, R300_BLIT);
+ r300_blitter_begin(r300, R300_BLIT | R300_IGNORE_RENDER_COND);
util_blitter_blit(r300->blitter, &blit);
r300_blitter_end(r300);
@@ -845,7 +845,8 @@ static void r300_blit(struct pipe_context *pipe,
}
}
- r300_blitter_begin(r300, R300_BLIT);
+ r300_blitter_begin(r300, R300_BLIT |
+ (info.render_condition_enable ? 0 : R300_IGNORE_RENDER_COND));
util_blitter_blit(r300->blitter, &info);
r300_blitter_end(r300);
}