From d17e6bc48eaf20898ae34059372d58b6c8190f0f Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Thu, 14 Jan 2016 10:33:14 -0800 Subject: meta/blit: Don't bind texture in _mesa_meta_bind_rb_as_tex_image MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit All of the callers of _mesa_meta_bind_rb_as_tex_image call _mesa_meta_setup_sampler shortly after. _mesa_meta_setup_sampler also binds the texture. This is necessary because not all paths that lead to _mesa_meta_setup_sampler some through _mesa_meta_bind_rb_as_tex_image. Rename the function _mesa_meta_texture_object_from_renderbuffer to reflect its true purpose. Signed-off-by: Ian Romanick Reviewed-by: Tapani Pälli --- src/mesa/drivers/common/meta.h | 4 ++-- src/mesa/drivers/common/meta_blit.c | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'src/mesa') diff --git a/src/mesa/drivers/common/meta.h b/src/mesa/drivers/common/meta.h index 1b1672e03cf..863997e9cc5 100644 --- a/src/mesa/drivers/common/meta.h +++ b/src/mesa/drivers/common/meta.h @@ -464,8 +464,8 @@ _mesa_meta_fb_tex_blit_end(struct gl_context *ctx, GLenum target, struct fb_tex_blit_state *blit); extern struct gl_texture_object * -_mesa_meta_bind_rb_as_tex_image(struct gl_context *ctx, - struct gl_renderbuffer *rb); +_mesa_meta_texture_object_from_renderbuffer(struct gl_context *ctx, + struct gl_renderbuffer *rb); struct gl_sampler_object * _mesa_meta_setup_sampler(struct gl_context *ctx, diff --git a/src/mesa/drivers/common/meta_blit.c b/src/mesa/drivers/common/meta_blit.c index 27996f9daf0..ee485829445 100644 --- a/src/mesa/drivers/common/meta_blit.c +++ b/src/mesa/drivers/common/meta_blit.c @@ -640,7 +640,7 @@ blitframebuffer_texture(struct gl_context *ctx, srcLevel = readAtt->TextureLevel; texObj = readAtt->Texture; } else if (!readAtt->Texture && ctx->Driver.BindRenderbufferTexImage) { - texObj = _mesa_meta_bind_rb_as_tex_image(ctx, rb); + texObj = _mesa_meta_texture_object_from_renderbuffer(ctx, rb); if (texObj == NULL) return false; @@ -885,8 +885,8 @@ _mesa_meta_fb_tex_blit_end(struct gl_context *ctx, GLenum target, } struct gl_texture_object * -_mesa_meta_bind_rb_as_tex_image(struct gl_context *ctx, - struct gl_renderbuffer *rb) +_mesa_meta_texture_object_from_renderbuffer(struct gl_context *ctx, + struct gl_renderbuffer *rb) { struct gl_texture_image *texImage; struct gl_texture_object *texObj; @@ -895,11 +895,10 @@ _mesa_meta_bind_rb_as_tex_image(struct gl_context *ctx, ? GL_TEXTURE_2D_MULTISAMPLE : GL_TEXTURE_2D; tempTex = 0; - _mesa_GenTextures(1, &tempTex); + _mesa_CreateTextures(target, 1, &tempTex); if (tempTex == 0) return NULL; - _mesa_BindTexture(target, tempTex); texObj = _mesa_lookup_texture(ctx, tempTex); texImage = _mesa_get_tex_image(ctx, texObj, target, 0); -- cgit v1.2.3