summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2010-10-26 20:30:40 -0600
committerBrian Paul <brianp@vmware.com>2010-10-26 20:30:42 -0600
commit412b9608838b872bc294569b3ee913343a7e66f6 (patch)
treeb73e1298101d5df0478e1568153246e6b74ab6ce
parentab50148fdafeb6496b4ab684e5b9a2355ccf542c (diff)
mesa: rename function to _mesa_is_format_integer_color()
Be a bit more clear about its operation.
-rw-r--r--src/mesa/main/fbobject.c2
-rw-r--r--src/mesa/main/formats.c2
-rw-r--r--src/mesa/main/formats.h2
-rw-r--r--src/mesa/main/readpix.c2
-rw-r--r--src/mesa/main/teximage.c4
5 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index bf46f51d7c..7c3357043f 100644
--- 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 f604e23513..e18a9fc997 100644
--- 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 73d85f2245..eeb460dabe 100644
--- 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 ad27d1192e..a5612e34ec 100644
--- 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 b65a2de046..2e9410f271 100644
--- 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);