fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-01 15:30:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

GLSL: AttachShader returns INVALID_OPERATION for repeated attach

Browse source 
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.
This commit is contained in:
Ian Romanick 2008-09-29 12:18:06 -07:00
parent fc13269b82
commit d806d451e6
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/mesa/shader/shader_api.c
View file

@ -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;
}
}