[Mesa-dev] [PATCH v2 2/2] mesa: remove _mesa_tex_target_is_array

Alejandro PiƱeiro apinheiro at igalia.com
Sat Dec 5 11:51:38 PST 2015


_mesa_is_array_texture provides the same functionality and:

1. it returns bool instead of GLboolean
2. it's not related to the texture format (texformat.c)
3. the name's a little shorter

v2: remove _mesa_tex_target_is_array instead (Brian Paul)
---
 src/mesa/main/texformat.c | 14 --------------
 src/mesa/main/texformat.h |  3 ---
 2 files changed, 17 deletions(-)

diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c
index fd9f335..419fd78 100644
--- a/src/mesa/main/texformat.c
+++ b/src/mesa/main/texformat.c
@@ -782,17 +782,3 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
                  _mesa_enum_to_string(internalFormat));
    return MESA_FORMAT_NONE;
 }
-
-GLboolean
-_mesa_tex_target_is_array(GLenum target)
-{
-   switch (target) {
-   case GL_TEXTURE_1D_ARRAY_EXT:
-   case GL_TEXTURE_2D_ARRAY_EXT:
-   case GL_TEXTURE_2D_MULTISAMPLE_ARRAY:
-   case GL_TEXTURE_CUBE_MAP_ARRAY:
-      return GL_TRUE;
-   default:
-      return GL_FALSE;
-   }
-}
diff --git a/src/mesa/main/texformat.h b/src/mesa/main/texformat.h
index 32e2099..ed965f8 100644
--- a/src/mesa/main/texformat.h
+++ b/src/mesa/main/texformat.h
@@ -35,7 +35,4 @@ extern mesa_format
 _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
                         GLint internalFormat, GLenum format, GLenum type);
 
-extern GLboolean
-_mesa_tex_target_is_array(GLenum target);
-
 #endif
-- 
2.1.4



More information about the mesa-dev mailing list