<div dir="ltr">On Wed, Jan 29, 2014 at 2:52 PM, Ian Romanick <span dir="ltr"><<a href="mailto:idr@freedesktop.org" target="_blank">idr@freedesktop.org</a>></span> wrote:<br><div class="gmail_extra"><div class="gmail_quote">
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">From: Ian Romanick <<a href="mailto:ian.d.romanick@intel.com">ian.d.romanick@intel.com</a>><br>
<br>
The next patch will use this function in another file.<br>
<br>
Signed-off-by: Ian Romanick <<a href="mailto:ian.d.romanick@intel.com">ian.d.romanick@intel.com</a>><br>
---<br>
src/mesa/main/texobj.c | 6 +++---<br>
src/mesa/main/texobj.h | 3 +++<br>
2 files changed, 6 insertions(+), 3 deletions(-)<br>
<br>
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c<br>
index 24ffc89..f6fe09d 100644<br>
--- a/src/mesa/main/texobj.c<br>
+++ b/src/mesa/main/texobj.c<br>
@@ -1198,8 +1198,8 @@ _mesa_DeleteTextures( GLsizei n, const GLuint *textures)<br>
* Note that proxy targets are not valid here.<br>
* \return TEXTURE_x_INDEX or -1 if target is invalid<br>
*/<br>
-static GLint<br>
-target_enum_to_index(const struct gl_context *ctx, GLenum target)<br>
+int<br>
+_mesa_target_enum_to_index(const struct gl_context *ctx, GLenum target)<br>
{<br>
switch (target) {<br>
case GL_TEXTURE_1D:<br>
@@ -1270,7 +1270,7 @@ _mesa_BindTexture( GLenum target, GLuint texName )<br>
_mesa_debug(ctx, "glBindTexture %s %d\n",<br>
_mesa_lookup_enum_by_nr(target), (GLint) texName);<br>
<br>
- targetIndex = target_enum_to_index(ctx, target);<br>
+ targetIndex = _mesa_target_enum_to_index(ctx, target);<br>
if (targetIndex < 0) {<br>
_mesa_error(ctx, GL_INVALID_ENUM, "glBindTexture(target)");<br>
return;<br>
diff --git a/src/mesa/main/texobj.h b/src/mesa/main/texobj.h<br>
index 55091a6..525585a 100644<br>
--- a/src/mesa/main/texobj.h<br>
+++ b/src/mesa/main/texobj.h<br>
@@ -54,6 +54,9 @@ _mesa_initialize_texture_object( struct gl_context *ctx,<br>
struct gl_texture_object *obj,<br>
GLuint name, GLenum target );<br>
<br>
+extern int<br>
+_mesa_target_enum_to_index(const struct gl_context *ctx, GLenum target);<br>
+<br>
extern void<br>
_mesa_delete_texture_object( struct gl_context *ctx,<br>
struct gl_texture_object *obj );<br><br></blockquote><div><br></div><div>Calling it _mesa_tex_target_to_index() might be better. 'target' is an overloaded term in GL.<br><br></div><div>
-Brian<br> <br></div></div><br></div></div>