Mesa (master): mesa: fix error codes in _mesa_GetObjectParameterivARB(), bug 17861
Brian Paul
brianp at kemper.freedesktop.org
Fri Oct 10 22:39:43 UTC 2008
Module: Mesa
Branch: master
Commit: 85a3bf6dabc8b2d545dab078516fdfee9c4cd792
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=85a3bf6dabc8b2d545dab078516fdfee9c4cd792
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date: Fri Oct 10 16:26:15 2008 -0600
mesa: fix error codes in _mesa_GetObjectParameterivARB(), bug 17861
---
src/mesa/main/shaders.c | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/mesa/main/shaders.c b/src/mesa/main/shaders.c
index aeb5d4c..e5c54bb 100644
--- a/src/mesa/main/shaders.c
+++ b/src/mesa/main/shaders.c
@@ -247,7 +247,18 @@ _mesa_GetObjectParameterivARB(GLhandleARB object, GLenum pname, GLint *params)
}
}
else {
- _mesa_error(ctx, GL_INVALID_OPERATION, "glGetObjectParameterivARB");
+ /* error code depends on pname */
+ GLenum err;
+ switch (pname) {
+ case GL_OBJECT_TYPE_ARB:
+ case GL_OBJECT_DELETE_STATUS_ARB:
+ case GL_OBJECT_INFO_LOG_LENGTH_ARB:
+ err = GL_INVALID_OPERATION;
+ break;
+ default:
+ err = GL_INVALID_VALUE;
+ }
+ _mesa_error(ctx, err, "glGetObjectParameterivARB");
}
}
More information about the mesa-commit
mailing list