diff options
| author | Brian Paul <brianp@vmware.com> | 2009-09-15 09:47:35 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-09-15 09:47:35 -0600 |
| commit | 41bbc8395111c6ef37e08a63ee58876d10a09e77 (patch) | |
| tree | ff42e8359e3894b99da66599f9dc8ef44d9d3307 /src/mesa/main | |
| parent | c0cf9dc05e2d887ce6419e6cae1b3606a1779b3f (diff) | |
| parent | 5d526ed21ac9f1ec9220c2adb4c905893eb9d990 (diff) | |
Merge branch 'mesa_7_6_branch'
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/texparam.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c index 05d144270e..b2fbe2205b 100644 --- a/src/mesa/main/texparam.c +++ b/src/mesa/main/texparam.c @@ -70,7 +70,7 @@ validate_texture_wrap_mode(GLcontext * ctx, GLenum target, GLenum wrap) return GL_TRUE; } - _mesa_error( ctx, GL_INVALID_VALUE, "glTexParameter(param=0x%x)", wrap ); + _mesa_error( ctx, GL_INVALID_ENUM, "glTexParameter(param=0x%x)", wrap ); return GL_FALSE; } @@ -210,7 +210,7 @@ set_tex_parameteri(GLcontext *ctx, } /* fall-through */ default: - _mesa_error( ctx, GL_INVALID_VALUE, "glTexParameter(param=0x%x)", + _mesa_error( ctx, GL_INVALID_ENUM, "glTexParameter(param=0x%x)", params[0] ); } return GL_FALSE; @@ -225,7 +225,7 @@ set_tex_parameteri(GLcontext *ctx, texObj->MagFilter = params[0]; return GL_TRUE; default: - _mesa_error( ctx, GL_INVALID_VALUE, "glTexParameter(param=0x%x)", + _mesa_error( ctx, GL_INVALID_ENUM, "glTexParameter(param=0x%x)", params[0]); } return GL_FALSE; |