commit bac15c8db87261ea168caa98d818bd6917ca14d6
author Brian <brian@yutani.localnet.net> Wed Apr 18 14:55:18 2007 -0600
committer Brian <brian@yutani.localnet.net> Wed Apr 18 14:55:18 2007 -0600
tree 6b2361eacd136d0c92176b6f204ddbf8dd6d7277
parent f3e8c32376d8bdf1c48a0a2ad97eddcde7fc2f00

Remove bad assertions, decrement NumShaders in _mesa_detach_shader().

Fixes crashes w/ Brad King's depth peeling test.

src/mesa/shader/shader_api.c

diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index 004c9c8..0c4f483 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -309,8 +309,6 @@
        * what we're expecting.
        */
       if (sh && sh->Type == GL_SHADER_PROGRAM_MESA) {
-         assert(sh->Type == GL_VERTEX_SHADER ||
-                sh->Type == GL_FRAGMENT_SHADER);
          return NULL;
       }
       return sh;
@@ -576,6 +574,7 @@
          _mesa_free(shProg->Shaders);
 
          shProg->Shaders = newList;
+         shProg->NumShaders = n - 1;
          return;
       }
    }