Mesa (master): mesa: fix error codes in _mesa_GetObjectParameterivARB(), bug 17861
Brian Paul
brianp at kemper.freedesktop.org
Thu Oct 16 14:24:04 UTC 2008
Module: Mesa
Branch: master
Commit: a7b24ac02f80efd83e93b4597a2c0e5a6ba198fe
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a7b24ac02f80efd83e93b4597a2c0e5a6ba198fe
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date: Thu Oct 16 08:23:28 2008 -0600
mesa: fix error codes in _mesa_GetObjectParameterivARB(), bug 17861
---
src/mesa/main/shaders.c | 21 ++++++---------------
1 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/src/mesa/main/shaders.c b/src/mesa/main/shaders.c
index e5c54bb..7491d00 100644
--- a/src/mesa/main/shaders.c
+++ b/src/mesa/main/shaders.c
@@ -1,6 +1,6 @@
/*
* Mesa 3-D graphics library
- * Version: 7.1
+ * Version: 7.3
*
* Copyright (C) 2004-2008 Brian Paul All Rights Reserved.
*
@@ -235,30 +235,21 @@ _mesa_GetObjectParameterivARB(GLhandleARB object, GLenum pname, GLint *params)
if (ctx->Driver.IsProgram(ctx, object)) {
if (pname == GL_OBJECT_TYPE_ARB) {
*params = GL_PROGRAM_OBJECT_ARB;
- } else {
+ }
+ else {
ctx->Driver.GetProgramiv(ctx, object, pname, params);
}
}
else if (ctx->Driver.IsShader(ctx, object)) {
if (pname == GL_OBJECT_TYPE_ARB) {
*params = GL_SHADER_OBJECT_ARB;
- } else {
+ }
+ else {
ctx->Driver.GetShaderiv(ctx, object, pname, params);
}
}
else {
- /* 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");
+ _mesa_error(ctx, GL_INVALID_VALUE, "glGetObjectParameterivARB");
}
}
More information about the mesa-commit
mailing list