summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2014-02-08 13:39:45 -0700
committerCarl Worth <cworth@cworth.org>2014-03-04 13:09:17 -0800
commitd13adcae22bf624bd34b28a212b107746f64141c (patch)
tree9950b39756af1eb17f8b7504a1ae33edce14c748
parente91dd3661cfc10c0dc2d7da7156cbe78c9d2a1c0 (diff)
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-stable@lists.freedesktop.org> Tested-by: Andreas Boll <andreas.boll.dev@gmail.com> (cherry picked from commit c325ec896545cc909f2f0e359f0bb0513a8a53b5)
-rw-r--r--src/mesa/main/shaderapi.c1
1 files changed, 1 insertions, 0 deletions
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);
}