projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6e8d04a
)
mesa: update assertion in detach_shader() for geom shaders
author
Brian Paul
<brianp@vmware.com>
Sat, 8 Feb 2014 20:39:45 +0000
(13:39 -0700)
committer
Brian Paul
<brianp@vmware.com>
Sat, 8 Feb 2014 21:21:28 +0000
(14:21 -0700)
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>
src/mesa/main/shaderapi.c
patch
|
blob
|
history
diff --git
a/src/mesa/main/shaderapi.c
b/src/mesa/main/shaderapi.c
index 65b6b16bbc0c10c2cc7de057187ef616322f9a5e..97a57a4c219a5b98b27fd64e76d01e26225a36b3 100644
(file)
--- 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);
}