fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-25 09:10:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

meta/blit: Check the values instead of the target before restoring

Browse source 
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
This commit is contained in:
Ian Romanick 2016-01-12 17:37:02 -08:00
parent 594d02892e
commit a232df1523
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/mesa/drivers/common/meta_blit.c
View file

@ -843,13 +843,17 @@ _mesa_meta_fb_tex_blit_end(struct gl_context *ctx, GLenum target,
/* Restore texture object state, the texture binding will
* be restored by _mesa_meta_end().
*
* If the target restricts values for base level or max level, we assume
* that the original values were valid.
*/
if (target != GL_TEXTURE_RECTANGLE_ARB) {
if (blit->baseLevelSave != texObj->BaseLevel)
_mesa_texture_parameteriv(ctx, texObj, GL_TEXTURE_BASE_LEVEL,
&blit->baseLevelSave, false);
if (blit->maxLevelSave != texObj->MaxLevel)
_mesa_texture_parameteriv(ctx, texObj, GL_TEXTURE_MAX_LEVEL,
&blit->maxLevelSave, false);
}
/* If ARB_stencil_texturing is not supported, the mode won't have changed. */
if (texObj->StencilSampling != blit->stencilSamplingSave) {