From: Brian Paul <brianp@vmware.com>
Date: Thu, 11 Feb 2016 14:54:27 +0000 (-0700)
Subject: mesa: make _mesa_tex_target_to_face() an inline function
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d73f5a3133688bbae955feb517ea6bd1cd8782a3;p=mesa.git

mesa: make _mesa_tex_target_to_face() an inline function

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Reviewed-by: Timothy Arceri <timothy.arceri@collabora.com>
---

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 68a97523887..57765d7638b 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -116,20 +116,6 @@ adjust_for_oes_float_texture(GLenum format, GLenum type)
    return format;
 }
 
-/**
- * For cube map faces, return a face index in [0,5].
- * For other targets return 0;
- */
-GLuint
-_mesa_tex_target_to_face(GLenum target)
-{
-   if (_mesa_is_cube_face(target))
-      return (GLuint) target - (GLuint) GL_TEXTURE_CUBE_MAP_POSITIVE_X;
-   else
-      return 0;
-}
-
-
 
 /**
  * Install gl_texture_image in a gl_texture_object according to the target
diff --git a/src/mesa/main/teximage.h b/src/mesa/main/teximage.h
index fe5b485fa69..da02214256e 100644
--- a/src/mesa/main/teximage.h
+++ b/src/mesa/main/teximage.h
@@ -47,6 +47,21 @@ _mesa_is_cube_face(GLenum target)
            target <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z);
 }
 
+
+/**
+ * For cube map faces, return a face index in [0,5].
+ * For other targets return 0;
+ */
+static inline GLuint
+_mesa_tex_target_to_face(GLenum target)
+{
+   if (_mesa_is_cube_face(target))
+      return (GLuint) target - (GLuint) GL_TEXTURE_CUBE_MAP_POSITIVE_X;
+   else
+      return 0;
+}
+
+
 /** Are any of the dimensions of given texture equal to zero? */
 static inline GLboolean
 _mesa_is_zero_size_texture(const struct gl_texture_image *texImage)
@@ -131,9 +146,6 @@ extern GLboolean
 _mesa_target_can_be_compressed(const struct gl_context *ctx, GLenum target,
                                GLenum intFormat, GLenum *error);
 
-extern GLuint
-_mesa_tex_target_to_face(GLenum target);
-
 extern GLint
 _mesa_get_texture_dimensions(GLenum target);