Mesa (master): GLSL: AttachShader returns INVALID_OPERATION for repeated attach
Ian Romanick
idr at kemper.freedesktop.org
Mon Sep 29 19:30:32 UTC 2008
Module: Mesa
Branch: master
Commit: d806d451e660bb582c04947ae3bd8b95173e8fd4
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d806d451e660bb582c04947ae3bd8b95173e8fd4
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Mon Sep 29 12:18:06 2008 -0700
GLSL: AttachShader returns INVALID_OPERATION for repeated attach
The GL_ARB_shader_objects spec says that glAttachShaderARB is supposed
to return GL_INVALID_OPERATION if a shader is attached to a program
where it is already attached. _mesa_attach_shader perviously returned
without error in this case.
---
src/mesa/shader/shader_api.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index 3c530d1..3ab5903 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -455,7 +455,13 @@ _mesa_attach_shader(GLcontext *ctx, GLuint program, GLuint shader)
n = shProg->NumShaders;
for (i = 0; i < n; i++) {
if (shProg->Shaders[i] == sh) {
- /* already attached */
+ /* The shader is already attched to this program. The
+ * GL_ARB_shader_objects spec says:
+ *
+ * "The error INVALID_OPERATION is generated by AttachObjectARB
+ * if <obj> is already attached to <containerObj>."
+ */
+ _mesa_error(ctx, GL_INVALID_OPERATION, "glAttachShader");
return;
}
}
More information about the mesa-commit
mailing list