fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 06:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

st/mesa: CopyTex(Sub)Image should not be killed by conditional rendering

Browse source 
NOTE: This is a candidate for the 7.10 branch.

Reviewed-by: Brian Paul <brianp@vmware.com>
(cherry picked from commit 91e56c8897)
This commit is contained in:
Marek Olšák 2011-05-29 15:35:25 +02:00
parent c6b6688f88
commit 6850899f44
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/mesa/state_tracker/st_cb_texture.c
View file

@ -1652,6 +1652,11 @@ st_copy_texsubimage(struct gl_context *ctx,
srcY1 = srcY0 + height;
}
/* Disable conditional rendering. */
if (st->render_condition) {
pipe->render_condition(pipe, NULL, 0);
}
util_blit_pixels_writemask(st->blit,
strb->texture,
strb->surface->u.tex.level,
@ -1663,6 +1668,13 @@ st_copy_texsubimage(struct gl_context *ctx,
destX + width, destY + height,
0.0, PIPE_TEX_MIPFILTER_NEAREST,
format_writemask);
/* Restore conditional rendering state. */
if (st->render_condition) {
pipe->render_condition(pipe, st->render_condition,
st->condition_mode);
}
use_fallback = GL_FALSE;
}