Module: Mesa Branch: master Commit: c325ec896545cc909f2f0e359f0bb0513a8a53b5 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c325ec896545cc909f2f0e359f0bb0513a8a53b5
Author: Brian Paul <bri...@vmware.com> Date: Sat Feb 8 13:39:45 2014 -0700 mesa: update assertion in detach_shader() for geom shaders Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=74723 Cc: "10.0" "10.1" <mesa-sta...@lists.freedesktop.org> Tested-by: Andreas Boll <andreas.boll....@gmail.com> --- src/mesa/main/shaderapi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index 65b6b16..97a57a4 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -404,6 +404,7 @@ detach_shader(struct gl_context *ctx, GLuint program, GLuint shader) { for (j = 0; j < shProg->NumShaders; j++) { assert(shProg->Shaders[j]->Type == GL_VERTEX_SHADER || + shProg->Shaders[j]->Type == GL_GEOMETRY_SHADER || shProg->Shaders[j]->Type == GL_FRAGMENT_SHADER); assert(shProg->Shaders[j]->RefCount > 0); } _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
