From 7609d54e4a891c5d101404c8b291e5f0aebfb926 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Wed, 13 Jan 2016 01:22:43 -0800 Subject: [PATCH] meta/blit: Track source texture using gl_texture_object instead of GL API object handle MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Ian Romanick Reviewed-by: Tapani Pälli --- src/mesa/drivers/common/meta.h | 1 + src/mesa/drivers/common/meta_blit.c | 1 + 2 files changed, 2 insertions(+) diff --git a/src/mesa/drivers/common/meta.h b/src/mesa/drivers/common/meta.h index a41de8bfea6..1b1672e03cf 100644 --- a/src/mesa/drivers/common/meta.h +++ b/src/mesa/drivers/common/meta.h @@ -312,6 +312,7 @@ struct fb_tex_blit_state GLint baseLevelSave, maxLevelSave; struct gl_sampler_object *samp_obj; struct gl_sampler_object *samp_obj_save; + struct gl_texture_object *tex_obj; GLuint stencilSamplingSave; GLuint tempTex; }; diff --git a/src/mesa/drivers/common/meta_blit.c b/src/mesa/drivers/common/meta_blit.c index d33624d1745..27996f9daf0 100644 --- a/src/mesa/drivers/common/meta_blit.c +++ b/src/mesa/drivers/common/meta_blit.c @@ -694,6 +694,7 @@ blitframebuffer_texture(struct gl_context *ctx, } target = texObj->Target; + fb_tex_blit.tex_obj = texObj; fb_tex_blit.baseLevelSave = texObj->BaseLevel; fb_tex_blit.maxLevelSave = texObj->MaxLevel; fb_tex_blit.stencilSamplingSave = texObj->StencilSampling; -- 2.30.2