aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/state_tracker/st_gen_mipmap.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-06-01 16:36:19 +0200
committermarha <marha@users.sourceforge.net>2011-06-01 16:36:19 +0200
commit75becbf5e6dcd4667aa88665a1a681fb8620b2c4 (patch)
tree4e6ed6cb893d9ea4c17172b17b1567cfd76cddb8 /mesalib/src/mesa/state_tracker/st_gen_mipmap.c
parent32ccde45cc1f46a3bd72c44c4f3fcd03742dbb3c (diff)
downloadvcxsrv-75becbf5e6dcd4667aa88665a1a681fb8620b2c4.tar.gz
vcxsrv-75becbf5e6dcd4667aa88665a1a681fb8620b2c4.tar.bz2
vcxsrv-75becbf5e6dcd4667aa88665a1a681fb8620b2c4.zip
mesa pixman xkeyboard-config git update 1 Jun 2011
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_gen_mipmap.c')
-rw-r--r--mesalib/src/mesa/state_tracker/st_gen_mipmap.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_gen_mipmap.c b/mesalib/src/mesa/state_tracker/st_gen_mipmap.c
index b34794f1b..b0911294a 100644
--- a/mesalib/src/mesa/state_tracker/st_gen_mipmap.c
+++ b/mesalib/src/mesa/state_tracker/st_gen_mipmap.c
@@ -91,9 +91,18 @@ st_render_mipmap(struct st_context *st,
return FALSE;
}
+ /* Disable conditional rendering. */
+ if (st->render_condition) {
+ pipe->render_condition(pipe, NULL, 0);
+ }
+
util_gen_mipmap(st->gen_mipmap, psv, face, baseLevel, lastLevel,
PIPE_TEX_FILTER_LINEAR);
+ if (st->render_condition) {
+ pipe->render_condition(pipe, st->render_condition, st->condition_mode);
+ }
+
return TRUE;
}