AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meta/blit: Track temporary texture using gl_texture_object instead of GL API object handle

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-14 11:14:49 -08:00
parent 05f4be9641
commit c36e3d3016
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/drivers/common/meta.h
+1 -1
View File
@@ -313,8 +313,8 @@ struct fb_tex_blit_state
struct gl_sampler_object *samp_obj;
struct gl_sampler_object *samp_obj_save;
struct gl_texture_object *tex_obj;
struct gl_texture_object *temp_tex_obj;
GLuint stencilSamplingSave;
GLuint tempTex;
};
src/mesa/drivers/common/meta_blit.c
+6 -6
View File
@@ -644,7 +644,7 @@ blitframebuffer_texture(struct gl_context *ctx,
if (texObj == NULL)
return false;
fb_tex_blit.tempTex = texObj->Name;
fb_tex_blit.temp_tex_obj = texObj;
srcLevel = 0;
if (_mesa_is_winsys_fbo(readFb)) {
@@ -834,7 +834,7 @@ _mesa_meta_fb_tex_blit_begin(struct gl_context *ctx,
blit->samp_obj_save = NULL;
_mesa_reference_sampler_object(ctx, &blit->samp_obj_save,
ctx->Texture.Unit[ctx->Texture.CurrentUnit].Sampler);
blit->tempTex = 0;
blit->temp_tex_obj = NULL;
}
void
@@ -845,13 +845,13 @@ _mesa_meta_fb_tex_blit_end(struct gl_context *ctx, GLenum target,
_mesa_get_current_tex_object(ctx, target);
/* Either there is no temporary texture or the temporary texture is bound. */
assert(blit->tempTex == 0 || texObj->Name == blit->tempTex);
assert(blit->temp_tex_obj == NULL || blit->temp_tex_obj == texObj);
/* Restore texture object state, the texture binding will be restored by
* _mesa_meta_end(). If the texture is the temporary texture that is about
* to be destroyed, don't bother restoring its state.
*/
if (blit->tempTex == 0) {
if (blit->temp_tex_obj == NULL) {
/* If the target restricts values for base level or max level, we assume
* that the original values were valid.
*/
@@ -880,8 +880,8 @@ _mesa_meta_fb_tex_blit_end(struct gl_context *ctx, GLenum target,
_mesa_reference_sampler_object(ctx, &blit->samp_obj_save, NULL);
_mesa_reference_sampler_object(ctx, &blit->samp_obj, NULL);
if (blit->tempTex)
_mesa_DeleteTextures(1, &blit->tempTex);
if (blit->temp_tex_obj)
_mesa_DeleteTextures(1, &blit->temp_tex_obj->Name);
}
struct gl_texture_object *