From d13adcae22bf624bd34b28a212b107746f64141c Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Sat, 8 Feb 2014 13:39:45 -0700 Subject: mesa: update assertion in detach_shader() for geom shaders Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=74723 Cc: "10.0" "10.1" Tested-by: Andreas Boll (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 1d9aac39df2..74dd8e9d7df 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -395,6 +395,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); } -- cgit v1.2.3