From: Brian <brian@yutani.localnet.net>
Date: Wed, 18 Apr 2007 20:55:18 +0000 (-0600)
Subject: Remove bad assertions, decrement NumShaders in _mesa_detach_shader().
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bac15c8db87261ea168caa98d818bd6917ca14d6;p=mesa.git

Remove bad assertions, decrement NumShaders in _mesa_detach_shader().

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

diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index 004c9c8ec3a..0c4f4837fbf 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -309,8 +309,6 @@ _mesa_lookup_shader(GLcontext *ctx, GLuint name)
        * 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_detach_shader(GLcontext *ctx, GLuint program, GLuint shader)
          _mesa_free(shProg->Shaders);
 
          shProg->Shaders = newList;
+         shProg->NumShaders = n - 1;
          return;
       }
    }