summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/teximage.c
diff options
context:
space:
mode:
authorLaura Ekstrand <[email protected]>2014-12-05 10:30:09 -0800
committerLaura Ekstrand <[email protected]>2015-01-08 11:37:28 -0800
commit15ddc2d94b0ac23bf23e166530e46be4ee9570a2 (patch)
tree5616fef53e183d2549487a2e2140b8869d73cbff /src/mesa/main/teximage.c
parentea1fb258baef42d51ef24895b978c86dd1db7750 (diff)
main: Removed trailing whitespaces in texture code.
main: Removed trailing whitespace in texstate.c. main: Deleted trailing whitespaces in texobj.c. main: Fixed whitespace errors in teximage.h and teximage.c. Reviewed-by: Anuj Phogat <[email protected]>
Diffstat (limited to 'src/mesa/main/teximage.c')
-rw-r--r--src/mesa/main/teximage.c38
1 files changed, 19 insertions, 19 deletions
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index d815d513591..8b4a611e9ee 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -742,7 +742,7 @@ proxy_target(GLenum target)
*/
struct gl_texture_image *
_mesa_select_tex_image(const struct gl_texture_object *texObj,
- GLenum target, GLint level)
+ GLenum target, GLint level)
{
const GLuint face = _mesa_tex_target_to_face(target);
@@ -2234,14 +2234,14 @@ compressed_texture_error_check(struct gl_context *ctx, GLint dimensions,
case GL_PALETTE8_RGB5_A1_OES:
/* check level (note that level should be zero or less!) */
if (level > 0 || level < -maxLevels) {
- reason = "level";
- error = GL_INVALID_VALUE;
+ reason = "level";
+ error = GL_INVALID_VALUE;
goto error;
}
if (dimensions != 2) {
- reason = "compressed paletted textures must be 2D";
- error = GL_INVALID_OPERATION;
+ reason = "compressed paletted textures must be 2D";
+ error = GL_INVALID_OPERATION;
goto error;
}
@@ -2249,7 +2249,7 @@ compressed_texture_error_check(struct gl_context *ctx, GLint dimensions,
* checked against the actual size later.
*/
expectedSize = _mesa_cpal_compressed_size(level, internalFormat,
- width, height);
+ width, height);
/* This is for the benefit of the TestProxyTexImage below. It expects
* level to be non-negative. OES_compressed_paletted_texture uses a
@@ -2264,8 +2264,8 @@ compressed_texture_error_check(struct gl_context *ctx, GLint dimensions,
default:
/* check level */
if (level < 0 || level >= maxLevels) {
- reason = "level";
- error = GL_INVALID_VALUE;
+ reason = "level";
+ error = GL_INVALID_VALUE;
goto error;
}
@@ -2496,10 +2496,9 @@ copytexture_error_check( struct gl_context *ctx, GLuint dimensions,
}
if (ctx->ReadBuffer->Visual.samples > 0) {
- _mesa_error(ctx, GL_INVALID_OPERATION,
- "glCopyTexImage%dD(multisample FBO)",
- dimensions);
- return GL_TRUE;
+ _mesa_error(ctx, GL_INVALID_OPERATION,
+ "glCopyTexImage%dD(multisample FBO)", dimensions);
+ return GL_TRUE;
}
}
@@ -2792,10 +2791,11 @@ copytexsubimage_error_check(struct gl_context *ctx, GLuint dimensions,
/* From the EXT_texture_integer spec:
*
- * "INVALID_OPERATION is generated by CopyTexImage* and CopyTexSubImage*
- * if the texture internalformat is an integer format and the read color
- * buffer is not an integer format, or if the internalformat is not an
- * integer format and the read color buffer is an integer format."
+ * "INVALID_OPERATION is generated by CopyTexImage* and
+ * CopyTexSubImage* if the texture internalformat is an integer format
+ * and the read color buffer is not an integer format, or if the
+ * internalformat is not an integer format and the read color buffer
+ * is an integer format."
*/
if (_mesa_is_color_format(texImage->InternalFormat)) {
struct gl_renderbuffer *rb = ctx->ReadBuffer->_ColorReadBuffer;
@@ -3336,13 +3336,13 @@ _mesa_EGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image)
if (!valid_target) {
_mesa_error(ctx, GL_INVALID_ENUM,
- "glEGLImageTargetTexture2D(target=%d)", target);
+ "glEGLImageTargetTexture2D(target=%d)", target);
return;
}
if (!image) {
_mesa_error(ctx, GL_INVALID_OPERATION,
- "glEGLImageTargetTexture2D(image=%p)", image);
+ "glEGLImageTargetTexture2D(image=%p)", image);
return;
}
@@ -3354,7 +3354,7 @@ _mesa_EGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image)
if (texObj->Immutable) {
_mesa_error(ctx, GL_INVALID_OPERATION,
- "glEGLImageTargetTexture2D(texture is immutable)");
+ "glEGLImageTargetTexture2D(texture is immutable)");
_mesa_unlock_texture(ctx, texObj);
return;
}