Module: Mesa Branch: 10.1 Commit: 3cefbe5cf507a98d99c3c9a793004e69acf83726 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3cefbe5cf507a98d99c3c9a793004e69acf83726
Author: Brian Paul <[email protected]> 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" <[email protected]> Tested-by: Andreas Boll <[email protected]> (cherry picked from commit c325ec896545cc909f2f0e359f0bb0513a8a53b5) --- 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 61ac0e3..3dd4d8e 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -402,6 +402,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 [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
