mesa: rename function to _mesa_is_format_integer_color()

Be a bit more clear about its operation.

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index bf46f51d7c09eb3ccb3bf1c80e0d013b22fec9f1..7c3357043faf3b1efc372a120eaaf45fb96a2a1a 100644 (file)
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -696,7 +696,7 @@ _mesa_test_framebuffer_completeness(struct gl_context *ctx,
       }
 
       /* check if integer color */
-      fb->_IntegerColor = _mesa_is_format_integer(mesaFormat);
+      fb->_IntegerColor = _mesa_is_format_integer_color(mesaFormat);
 
       /* Error-check width, height, format, samples
        */

diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c
index f604e2351384db6c939b2c8debbcf0813e5d822a..e18a9fc9977fedf9e55de005ac24257a4a486b31 100644 (file)
--- a/src/mesa/main/formats.c
+++ b/src/mesa/main/formats.c
@@ -1011,7 +1011,7 @@ _mesa_is_format_packed_depth_stencil(gl_format format)
  * Is the given format a signed/unsigned integer color format?
  */
 GLboolean
-_mesa_is_format_integer(gl_format format)
+_mesa_is_format_integer_color(gl_format format)
 {
    const struct gl_format_info *info = _mesa_get_format_info(format);
    return (info->DataType == GL_INT || info->DataType == GL_UNSIGNED_INT) &&

diff --git a/src/mesa/main/formats.h b/src/mesa/main/formats.h
index 73d85f2245f062a3ac937896172f0c7ddd7ac6c0..eeb460dabe70fbc8fa4c172fdb26d744f215396a 100644 (file)
--- a/src/mesa/main/formats.h
+++ b/src/mesa/main/formats.h
@@ -200,7 +200,7 @@ extern GLboolean
 _mesa_is_format_packed_depth_stencil(gl_format format);
 
 extern GLboolean
-_mesa_is_format_integer(gl_format format);
+_mesa_is_format_integer_color(gl_format format);
 
 extern GLenum
 _mesa_get_format_color_encoding(gl_format format);

diff --git a/src/mesa/main/readpix.c b/src/mesa/main/readpix.c
index ad27d1192e3e9794c631fae2b8287d719220f9cb..a5612e34ecf0a708689c19f816d066657557c185 100644 (file)
--- a/src/mesa/main/readpix.c
+++ b/src/mesa/main/readpix.c
@@ -191,7 +191,7 @@ _mesa_ReadPixels( GLint x, GLint y, GLsizei width, GLsizei height,
     */
    if (ctx->Extensions.EXT_texture_integer && _mesa_is_color_format(format)) {
       const struct gl_renderbuffer *rb = ctx->ReadBuffer->_ColorReadBuffer;
-      const GLboolean srcInteger = _mesa_is_format_integer(rb->Format);
+      const GLboolean srcInteger = _mesa_is_format_integer_color(rb->Format);
       const GLboolean dstInteger = _mesa_is_integer_format(format);
       if (dstInteger != srcInteger) {
          _mesa_error(ctx, GL_INVALID_OPERATION,

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index b65a2de046ec98454fe72320a5f5e16ee66e6774..2e9410f27175de6416038d018ee145f08133a8fe 100644 (file)
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -2107,9 +2107,9 @@ copytexsubimage_error_check2( struct gl_context *ctx, GLuint dimensions,
    /* If copying into an integer texture, the source buffer must also be
     * integer-valued.
     */
-   if (_mesa_is_format_integer(teximage->TexFormat)) {
+   if (_mesa_is_format_integer_color(teximage->TexFormat)) {
       struct gl_renderbuffer *rb = ctx->ReadBuffer->_ColorReadBuffer;
-      if (!_mesa_is_format_integer(rb->Format)) {
+      if (!_mesa_is_format_integer_color(rb->Format)) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
                   "glCopyTexSubImage%dD(source buffer is not integer format)",
                   dimensions);