diff options
author | marha <marha@users.sourceforge.net> | 2011-05-30 22:21:12 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-05-30 22:21:12 +0200 |
commit | 072157e2ba87f3303958e48815fa2548009d3410 (patch) | |
tree | 91b7c5446ab4020a6f405f822aeb0800b6a02958 /mesalib/src/mesa/state_tracker/st_gen_mipmap.c | |
parent | b53c5364a7161e8310d62b90d5b5ca4635535892 (diff) | |
download | vcxsrv-072157e2ba87f3303958e48815fa2548009d3410.tar.gz vcxsrv-072157e2ba87f3303958e48815fa2548009d3410.tar.bz2 vcxsrv-072157e2ba87f3303958e48815fa2548009d3410.zip |
mesa git update 30 May 2011
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_gen_mipmap.c')
-rw-r--r-- | mesalib/src/mesa/state_tracker/st_gen_mipmap.c | 9 |
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; } |