Browse Source

Remove bad assertions, decrement NumShaders in _mesa_detach_shader().

Fixes crashes w/ Brad King's depth peeling test.
tags/mesa_6_5_3_rc2
Brian 18 years ago
parent
commit
bac15c8db8
1 changed files with 1 additions and 2 deletions
  1. 1
    2
      src/mesa/shader/shader_api.c

+ 1
- 2
src/mesa/shader/shader_api.c View File

@@ -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;
}
}

Loading…
Cancel
Save