summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/texparam.c
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2014-04-24 14:44:03 -0600
committerBrian Paul <[email protected]>2014-04-30 10:09:44 -0600
commit475f5ff64d7f64a9df2d7aabc772487bf24d1dd5 (patch)
tree48038aaf779ee1df4d0c0744ae339ba3a39d4d95 /src/mesa/main/texparam.c
parent1c6aa6599efd9b5cca270bef2e53fd7ac5f31647 (diff)
mesa: change invalid texture swizzle error to GL_INVALID_ENUM
The original GL_EXT_texture_swizzle extensions said GL_INVALID_OPERATION was to be generated when the an invalid swizzle was passed to glTexParameter(). But in OpenGL 3.3 and later, the error should be GL_INVALID_ENUM. Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/mesa/main/texparam.c')
-rw-r--r--src/mesa/main/texparam.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
index 40790ff0ed9..dc17ea58475 100644
--- a/src/mesa/main/texparam.c
+++ b/src/mesa/main/texparam.c
@@ -485,7 +485,7 @@ set_tex_parameteri(struct gl_context *ctx,
const GLuint comp = pname - GL_TEXTURE_SWIZZLE_R_EXT;
const GLint swz = comp_to_swizzle(params[0]);
if (swz < 0) {
- _mesa_error(ctx, GL_INVALID_OPERATION,
+ _mesa_error(ctx, GL_INVALID_ENUM,
"glTexParameter(swizzle 0x%x)", params[0]);
return GL_FALSE;
}
@@ -510,7 +510,7 @@ set_tex_parameteri(struct gl_context *ctx,
set_swizzle_component(&texObj->_Swizzle, comp, swz);
}
else {
- _mesa_error(ctx, GL_INVALID_OPERATION,
+ _mesa_error(ctx, GL_INVALID_ENUM,
"glTexParameter(swizzle 0x%x)", params[comp]);
return GL_FALSE;
}