summaryrefslogtreecommitdiff
path: root/src/mesa/main
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2011-02-28 18:23:23 -0700
committerBrian Paul <brianp@vmware.com>2011-02-28 18:23:23 -0700
commitca1b5515621d4ab9e90e27533fbc0fafa5cf641b (patch)
tree73c25ab32620250862fdcf2988f089ed9dc37e76 /src/mesa/main
parent790c73140939fb60c1b702215bb6afa09f401a8e (diff)
mesa: s/mesaFormat/attFormat/
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/fbobject.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index ab6b2a9b17..5da6a6cd16 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -652,7 +652,7 @@ _mesa_test_framebuffer_completeness(struct gl_context *ctx,
for (i = -2; i < (GLint) ctx->Const.MaxColorAttachments; i++) {
struct gl_renderbuffer_attachment *att;
GLenum f;
- gl_format mesaFormat;
+ gl_format attFormat;
/*
* XXX for ARB_fbo, only check color buffers that are named by
@@ -699,7 +699,7 @@ _mesa_test_framebuffer_completeness(struct gl_context *ctx,
minHeight = MIN2(minHeight, texImg->Height);
maxHeight = MAX2(maxHeight, texImg->Height);
f = texImg->_BaseFormat;
- mesaFormat = texImg->TexFormat;
+ attFormat = texImg->TexFormat;
numImages++;
if (!_mesa_is_legal_color_format(ctx, f) &&
!is_legal_depth_format(ctx, f)) {
@@ -714,7 +714,7 @@ _mesa_test_framebuffer_completeness(struct gl_context *ctx,
minHeight = MIN2(minHeight, att->Renderbuffer->Height);
maxHeight = MAX2(minHeight, att->Renderbuffer->Height);
f = att->Renderbuffer->InternalFormat;
- mesaFormat = att->Renderbuffer->Format;
+ attFormat = att->Renderbuffer->Format;
numImages++;
}
else {
@@ -728,7 +728,7 @@ _mesa_test_framebuffer_completeness(struct gl_context *ctx,
}
/* check if integer color */
- fb->_IntegerColor = _mesa_is_format_integer_color(mesaFormat);
+ fb->_IntegerColor = _mesa_is_format_integer_color(attFormat);
/* Error-check width, height, format, samples
*/