summaryrefslogtreecommitdiff
path: root/src/gallium/drivers/softpipe/sp_clear.c
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2010-01-04 11:47:39 -0700
committerBrian Paul <brianp@vmware.com>2010-01-04 11:47:39 -0700
commit0fb1eaddfbaf487067e0ff4f1d6f82145b6b0acd (patch)
tree0f3f0239f09d5681e38a474259e018ba34a160a2 /src/gallium/drivers/softpipe/sp_clear.c
parent195568e4cb0524d71db0ac68cf5a95b33a1af6b4 (diff)
parentc9b558351847133dced0c9daaeb84d57d550afc9 (diff)
Merge branch 'gallium-conditional-rendering'
Diffstat (limited to 'src/gallium/drivers/softpipe/sp_clear.c')
-rw-r--r--src/gallium/drivers/softpipe/sp_clear.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gallium/drivers/softpipe/sp_clear.c b/src/gallium/drivers/softpipe/sp_clear.c
index f98087deb8..5f130453c3 100644
--- a/src/gallium/drivers/softpipe/sp_clear.c
+++ b/src/gallium/drivers/softpipe/sp_clear.c
@@ -36,6 +36,7 @@
#include "util/u_pack_color.h"
#include "sp_clear.h"
#include "sp_context.h"
+#include "sp_query.h"
#include "sp_tile_cache.h"
@@ -55,6 +56,9 @@ softpipe_clear(struct pipe_context *pipe, unsigned buffers, const float *rgba,
if (softpipe->no_rast)
return;
+ if (!softpipe_check_render_cond(softpipe))
+ return;
+
#if 0
softpipe_update_derived(softpipe); /* not needed?? */
#endif