diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2010-08-16 19:08:53 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2010-08-16 19:08:53 -0700 |
| commit | 6c03c576cc49bbb008de66d374f4302ff0fe0390 (patch) | |
| tree | 7ddeb3ee88532d9aef8728b9aa256edf7c125247 /src/mesa/drivers/dri/i965/brw_program.c | |
| parent | 15a3b42e135a3a2cb463ec3cff80a55dd8528051 (diff) | |
| parent | a433cd286c60eb9d4c2114f042709eda0f3de676 (diff) | |
Merge branch 'glsl2'
Conflicts:
src/mesa/program/prog_optimize.c
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_program.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_program.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_program.c b/src/mesa/drivers/dri/i965/brw_program.c index 4b08d2599b..c6d11fed06 100644 --- a/src/mesa/drivers/dri/i965/brw_program.c +++ b/src/mesa/drivers/dri/i965/brw_program.c @@ -36,6 +36,7 @@ #include "program/program.h" #include "program/programopt.h" #include "tnl/tnl.h" +#include "talloc.h" #include "brw_context.h" #include "brw_wm.h" @@ -114,10 +115,7 @@ shader_error(GLcontext *ctx, struct gl_program *prog, const char *msg) shader = _mesa_lookup_shader_program(ctx, prog->Id); if (shader) { - if (shader->InfoLog) { - free(shader->InfoLog); - } - shader->InfoLog = _mesa_strdup(msg); + shader->InfoLog = talloc_strdup_append(shader->InfoLog, msg); shader->LinkStatus = GL_FALSE; } } |