meta/blit: Track source texture using gl_texture_object instead of GL API object...

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>

diff --git a/src/mesa/drivers/common/meta.h b/src/mesa/drivers/common/meta.h
index a41de8bfea60739a3597e8a0f311aaa8df3fbe87..1b1672e03cf3497410411f468e93a635aa39116a 100644 (file)
--- 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 d33624d1745b2e869e0c89c1beb692c2a2a9abc4..27996f9daf09229de700e1493c1d13f79fc7d8ba 100644 (file)
--- 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;