Mesa (master): mesa: Make target_enum_to_index available outside texobj.c
Ian Romanick
idr at kemper.freedesktop.org
Sun Feb 2 15:50:01 UTC 2014
Module: Mesa
Branch: master
Commit: 35e7027dab14b059344d7b93404c76d451ea2baf
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=35e7027dab14b059344d7b93404c76d451ea2baf
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Fri Nov 22 11:35:30 2013 -0800
mesa: Make target_enum_to_index available outside texobj.c
The next patch will use this function in another file.
v2: Rename _mesa_target_enum_to_index to _mesa_tex_target_to_index.
Suggested by Brian.
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Brian Paul <brianp at vmware.com>
---
src/mesa/main/texobj.c | 6 +++---
src/mesa/main/texobj.h | 3 +++
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index cd6e62c..6adc0ae 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -1198,8 +1198,8 @@ _mesa_DeleteTextures( GLsizei n, const GLuint *textures)
* Note that proxy targets are not valid here.
* \return TEXTURE_x_INDEX or -1 if target is invalid
*/
-static GLint
-target_enum_to_index(const struct gl_context *ctx, GLenum target)
+int
+_mesa_tex_target_to_index(const struct gl_context *ctx, GLenum target)
{
switch (target) {
case GL_TEXTURE_1D:
@@ -1270,7 +1270,7 @@ _mesa_BindTexture( GLenum target, GLuint texName )
_mesa_debug(ctx, "glBindTexture %s %d\n",
_mesa_lookup_enum_by_nr(target), (GLint) texName);
- targetIndex = target_enum_to_index(ctx, target);
+ targetIndex = _mesa_tex_target_to_index(ctx, target);
if (targetIndex < 0) {
_mesa_error(ctx, GL_INVALID_ENUM, "glBindTexture(target)");
return;
diff --git a/src/mesa/main/texobj.h b/src/mesa/main/texobj.h
index 55091a6..a4573b3 100644
--- a/src/mesa/main/texobj.h
+++ b/src/mesa/main/texobj.h
@@ -54,6 +54,9 @@ _mesa_initialize_texture_object( struct gl_context *ctx,
struct gl_texture_object *obj,
GLuint name, GLenum target );
+extern int
+_mesa_tex_target_to_index(const struct gl_context *ctx, GLenum target);
+
extern void
_mesa_delete_texture_object( struct gl_context *ctx,
struct gl_texture_object *obj );
More information about the mesa-commit
mailing list