summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers
diff options
context:
space:
mode:
authorIan Romanick <[email protected]>2016-01-13 01:22:43 -0800
committerIan Romanick <[email protected]>2018-01-02 16:23:51 -0800
commit7609d54e4a891c5d101404c8b291e5f0aebfb926 (patch)
tree51dc1f4ec81cf4f609ccc2fca243e1384cab57aa /src/mesa/drivers
parent29a948e06d49ef113014020b74434b1223ba44f2 (diff)
meta/blit: Track source texture using gl_texture_object instead of GL API object handle
Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Tapani Pälli <[email protected]>
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r--src/mesa/drivers/common/meta.h1
-rw-r--r--src/mesa/drivers/common/meta_blit.c1
2 files changed, 2 insertions, 0 deletions
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;