summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Olšák <marek.olsak@amd.com>2014-06-02 15:45:51 +0200
committerIan Romanick <ian.d.romanick@intel.com>2014-06-06 18:03:10 -0700
commitae16f443c21e4a4eede003a3a789dc8a58c43ea4 (patch)
treefe78f93cf97f320ada68cda7d075ada414b1b8c0
parentb8241bb3f259b8d42f75f6fd6d1a7ea7c59d70e2 (diff)
r600g,radeonsi: disable fast clear if render condition is on
For some reason, CP DMA doesn't follow the predicate bit if I enable it, so this is the only option. This fixes piglit: spec/NV_conditional_render/clear Cc: mesa-stable@lists.freedesktop.org Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> (cherry picked from commit bf701a84eb000910015a3c3ee9860141cde4990d)
-rw-r--r--src/gallium/drivers/radeon/r600_texture.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gallium/drivers/radeon/r600_texture.c b/src/gallium/drivers/radeon/r600_texture.c
index e30d933093d..3a37465b13e 100644
--- a/src/gallium/drivers/radeon/r600_texture.c
+++ b/src/gallium/drivers/radeon/r600_texture.c
@@ -1235,6 +1235,9 @@ void evergreen_do_fast_color_clear(struct r600_common_context *rctx,
{
int i;
+ if (rctx->current_render_cond)
+ return;
+
for (i = 0; i < fb->nr_cbufs; i++) {
struct r600_texture *tex;
unsigned clear_bit = PIPE_CLEAR_COLOR0 << i;