Module: Mesa Branch: master Commit: 7609d54e4a891c5d101404c8b291e5f0aebfb926 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7609d54e4a891c5d101404c8b291e5f0aebfb926
Author: Ian Romanick <ian.d.roman...@intel.com> Date: Wed Jan 13 01:22:43 2016 -0800 meta/blit: Track source texture using gl_texture_object instead of GL API object handle Signed-off-by: Ian Romanick <ian.d.roman...@intel.com> Reviewed-by: Tapani Pälli <tapani.pa...@intel.com> --- 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 a41de8bfea..1b1672e03c 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 d33624d174..27996f9daf 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; _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit