diff options
| author | marha <marha@users.sourceforge.net> | 2012-09-06 08:48:23 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-09-06 08:48:23 +0200 |
| commit | aa10a08696cae93799fcddae3f0245ceee905e01 (patch) | |
| tree | 950730c362229584b5e60fc1fe309325b7ba66b1 /mesalib/src/mesa/main/shaderobj.c | |
| parent | af1e359cc622a0c53d5632fb03ef9bd4c17de897 (diff) | |
| download | vcxsrv-aa10a08696cae93799fcddae3f0245ceee905e01.tar.gz vcxsrv-aa10a08696cae93799fcddae3f0245ceee905e01.tar.bz2 vcxsrv-aa10a08696cae93799fcddae3f0245ceee905e01.zip | |
xserver mesa git update 6 sep 2012
Diffstat (limited to 'mesalib/src/mesa/main/shaderobj.c')
| -rw-r--r-- | mesalib/src/mesa/main/shaderobj.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/mesalib/src/mesa/main/shaderobj.c b/mesalib/src/mesa/main/shaderobj.c index 16800ae5e..c7f45c88e 100644 --- a/mesalib/src/mesa/main/shaderobj.c +++ b/mesalib/src/mesa/main/shaderobj.c @@ -124,8 +124,7 @@ _mesa_new_shader(struct gl_context *ctx, GLuint name, GLenum type) static void _mesa_delete_shader(struct gl_context *ctx, struct gl_shader *sh) { - if (sh->Source) - free((void *) sh->Source); + free((void *)sh->Source); _mesa_reference_program(ctx, &sh->Program, NULL); ralloc_free(sh); } @@ -333,10 +332,8 @@ _mesa_free_shader_program_data(struct gl_context *ctx, } shProg->NumShaders = 0; - if (shProg->Shaders) { - free(shProg->Shaders); - shProg->Shaders = NULL; - } + free(shProg->Shaders); + shProg->Shaders = NULL; /* Transform feedback varying vars */ for (i = 0; i < shProg->TransformFeedback.NumVarying; i++) { |