diff options
| author | Brian Paul <[email protected]> | 2011-10-13 07:37:43 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2011-10-13 07:38:28 -0600 |
| commit | e06277bd886a9a79f0bf9b175ec26fbe187689c2 (patch) | |
| tree | 7f8832fca0b90f7dcc6117bc8f3bc74dcda6126d /src/mesa/main | |
| parent | 241b3e4bbe93ecab545b4454f656c9ffd073ae85 (diff) | |
s/format/baseFormat/ to be more explicit
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/teximage.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index 84eed2354ac..2d06f84bf68 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -1893,7 +1893,7 @@ copytexture_error_check( struct gl_context *ctx, GLuint dimensions, const GLenum proxyTarget = get_proxy_target(target); const GLenum type = GL_FLOAT; GLboolean sizeOK; - GLint format; + GLint baseFormat; /* check target */ if (!legal_texsubimage_target(ctx, dimensions, target)) { @@ -1928,14 +1928,14 @@ copytexture_error_check( struct gl_context *ctx, GLuint dimensions, return GL_TRUE; } - format = _mesa_base_tex_format(ctx, internalFormat); - if (format < 0) { + baseFormat = _mesa_base_tex_format(ctx, internalFormat); + if (baseFormat < 0) { _mesa_error(ctx, GL_INVALID_VALUE, "glCopyTexImage%dD(internalFormat)", dimensions); return GL_TRUE; } - if (!_mesa_source_buffer_exists(ctx, format)) { + if (!_mesa_source_buffer_exists(ctx, baseFormat)) { _mesa_error(ctx, GL_INVALID_OPERATION, "glCopyTexImage%dD(missing readbuffer)", dimensions); return GL_TRUE; @@ -1946,7 +1946,7 @@ copytexture_error_check( struct gl_context *ctx, GLuint dimensions, ? (width == height) : 1; sizeOK = sizeOK && ctx->Driver.TestProxyTexImage(ctx, proxyTarget, level, - internalFormat, format, + internalFormat, baseFormat, type, width, height, 1, border); |