From 594d02892e794b585df31ee75d5c1e2a0e312c25 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Wed, 13 Jan 2016 01:20:09 -0800 Subject: [PATCH] mesa: Add _mesa_bind_texture method MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Light-weight glBindTexture for internal use. Signed-off-by: Ian Romanick Reviewed-by: Tapani Pälli --- src/mesa/main/texobj.c | 24 +++++++++++++++++++++++- src/mesa/main/texobj.h | 4 +++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c index db405988239..5dc5cb8e1a9 100644 --- a/src/mesa/main/texobj.c +++ b/src/mesa/main/texobj.c @@ -1692,6 +1692,29 @@ bind_texture_object(struct gl_context *ctx, unsigned unit, } } +/** + * Light-weight bind texture for internal users + * + * This is really just \c finish_texture_init plus \c bind_texture_object. + * This is intended to be used by internal Mesa functions that use + * \c _mesa_CreateTexture and need to bind textures (e.g., meta). + */ +void +_mesa_bind_texture(struct gl_context *ctx, GLenum target, + struct gl_texture_object *tex_obj) +{ + const GLint targetIndex = _mesa_tex_target_to_index(ctx, target); + + assert(targetIndex >= 0 && targetIndex < NUM_TEXTURE_TARGETS); + + if (tex_obj->Target == 0) + finish_texture_init(ctx, target, tex_obj, targetIndex); + + assert(tex_obj->Target == target); + assert(tex_obj->TargetIndex == targetIndex); + + bind_texture_object(ctx, ctx->Texture.CurrentUnit, tex_obj); +} /** * Implement glBindTexture(). Do error checking, look-up or create a new @@ -1764,7 +1787,6 @@ bind_texture(struct gl_context *ctx, GLenum target, GLuint texName, bind_texture_object(ctx, ctx->Texture.CurrentUnit, newTexObj); } - void GLAPIENTRY _mesa_BindTexture_no_error(GLenum target, GLuint texName) { diff --git a/src/mesa/main/texobj.h b/src/mesa/main/texobj.h index 8dea85303d6..f2d78aca0dc 100644 --- a/src/mesa/main/texobj.h +++ b/src/mesa/main/texobj.h @@ -175,7 +175,9 @@ extern void _mesa_delete_nameless_texture(struct gl_context *ctx, struct gl_texture_object *texObj); - +extern void +_mesa_bind_texture(struct gl_context *ctx, GLenum target, + struct gl_texture_object *tex_obj); /*@}*/ /** -- 2.30.2