diff options
| author | Chia-I Wu <olvaffe@gmail.com> | 2010-01-12 11:25:02 +0800 |
|---|---|---|
| committer | Chia-I Wu <olvaffe@gmail.com> | 2010-01-12 11:25:02 +0800 |
| commit | 562c127693200822f04a145db50add1be2425d7b (patch) | |
| tree | 9441774fb212b17ddf2a364f06abc43f166cc00b /src/mesa/shader/arbprogparse.c | |
| parent | e5d351dcfde58777162552cf5cd2a9cd8299f4cd (diff) | |
| parent | 077d6dd7508af88509dd0499c5dfbdaa186b4015 (diff) | |
Merge branch 'master' into opengl-es-v2
Conflicts:
src/mesa/main/dd.h
Diffstat (limited to 'src/mesa/shader/arbprogparse.c')
| -rw-r--r-- | src/mesa/shader/arbprogparse.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/mesa/shader/arbprogparse.c b/src/mesa/shader/arbprogparse.c index 05ee4f563e..a09be71020 100644 --- a/src/mesa/shader/arbprogparse.c +++ b/src/mesa/shader/arbprogparse.c @@ -56,7 +56,6 @@ having three separate program parameter arrays. #include "main/context.h" #include "main/macros.h" #include "main/mtypes.h" -#include "shader/grammar/grammar_mesa.h" #include "arbprogparse.h" #include "program.h" #include "programopt.h" @@ -87,6 +86,9 @@ _mesa_parse_arb_fragment_program(GLcontext* ctx, GLenum target, return; } + if (program->Base.String != NULL) + _mesa_free(program->Base.String); + /* Copy the relevant contents of the arb_program struct into the * fragment_program struct. */ @@ -178,6 +180,9 @@ _mesa_parse_arb_vertex_program(GLcontext *ctx, GLenum target, return; } + if (program->Base.String != NULL) + _mesa_free(program->Base.String); + /* Copy the relevant contents of the arb_program struct into the * vertex_program struct. */ |