Remove _mesa_is_type_integer and _mesa_is_enum_format_or_type_integer

The comment for _mesa_is_type_integer is confusing because it says that it
returns whether the type is an “integer (non-normalized)” format. I don't
think it makes sense to say whether a type is normalized or not because it
depends on what format it is used with. For example, GL_RGBA+GL_UNSIGNED_BYTE
is normalized but GL_RGBA_INTEGER+GL_UNSIGNED_BYTE isn't. If the normalized
comment is just a mistake then it still doesn't make much sense because it is
missing the packed-pixel types such as GL_UNSIGNED_INT_5_6_5. If those were
added then it effectively just returns type != GL_FLOAT.

That function was only used in _mesa_is_enum_format_or_type_integer. This
function effectively checks whether the format is non-normalized or the type
is an integer. I can't think of any situation where that check would make
sense.

As far as I can tell neither of these functions have ever been used anywhere
so we should just remove them to avoid confusion.

These functions were added in 9ad8f431b2a47060bf05517246ab0fa8d249c800.

Reviewed-by: Brian Paul <brianp@vmware.com>

diff --git a/src/mesa/main/glformats.c b/src/mesa/main/glformats.c
index 9bb341cc0e95997e3455631a999755fc609b02c3..aee336e1222dcc2aefe907b389a939a2dc5da4d9 100644 (file)
--- a/src/mesa/main/glformats.c
+++ b/src/mesa/main/glformats.c
@@ -458,36 +458,6 @@ _mesa_is_enum_format_integer(GLenum format)
 }
 
 
-/**
- * Test if the given type is an integer (non-normalized) format.
- */
-GLboolean
-_mesa_is_type_integer(GLenum type)
-{
-   switch (type) {
-   case GL_INT:
-   case GL_UNSIGNED_INT:
-   case GL_SHORT:
-   case GL_UNSIGNED_SHORT:
-   case GL_BYTE:
-   case GL_UNSIGNED_BYTE:
-      return GL_TRUE;
-   default:
-      return GL_FALSE;
-   }
-}
-
-
-/**
- * Test if the given format or type is an integer (non-normalized) format.
- */
-extern GLboolean
-_mesa_is_enum_format_or_type_integer(GLenum format, GLenum type)
-{
-   return _mesa_is_enum_format_integer(format) || _mesa_is_type_integer(type);
-}
-
-
 GLboolean
 _mesa_is_type_unsigned(GLenum type)
 {

diff --git a/src/mesa/main/glformats.h b/src/mesa/main/glformats.h
index af108993168eb59b4def42245165894a622d99c8..ccbce2dabf96f04386229d0bf0d2e3e60b48b6c3 100644 (file)
--- a/src/mesa/main/glformats.h
+++ b/src/mesa/main/glformats.h
@@ -53,9 +53,6 @@ _mesa_bytes_per_pixel( GLenum format, GLenum type );
 extern GLint
 _mesa_bytes_per_vertex_attrib(GLint comps, GLenum type);
 
-extern GLboolean
-_mesa_is_type_integer(GLenum type);
-
 extern GLboolean
 _mesa_is_type_unsigned(GLenum type);
 
@@ -68,9 +65,6 @@ _mesa_is_enum_format_unsigned_int(GLenum format);
 extern GLboolean
 _mesa_is_enum_format_signed_int(GLenum format);
 
-extern GLboolean
-_mesa_is_enum_format_or_type_integer(GLenum format, GLenum type);
-
 extern GLboolean
 _mesa_is_color_format(GLenum format);