diff options
author | marha <marha@users.sourceforge.net> | 2011-05-30 22:26:52 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-05-30 22:26:52 +0200 |
commit | d60233950866066e23e8a46ac230aae9f296031e (patch) | |
tree | 30fdaf70fdb33eecd6479cffe02d26d7af812c3f /mesalib/src/mesa/state_tracker/st_gen_mipmap.c | |
parent | 91def498916935bc9ebd433a28981d19bf426961 (diff) | |
parent | 072157e2ba87f3303958e48815fa2548009d3410 (diff) | |
download | vcxsrv-d60233950866066e23e8a46ac230aae9f296031e.tar.gz vcxsrv-d60233950866066e23e8a46ac230aae9f296031e.tar.bz2 vcxsrv-d60233950866066e23e8a46ac230aae9f296031e.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/main/shaderapi.c
mesalib/src/mesa/state_tracker/st_cb_blit.c
mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
mesalib/src/mesa/state_tracker/st_cb_texture.c
mesalib/src/mesa/state_tracker/st_context.h
mesalib/src/mesa/state_tracker/st_format.c
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; } |