diff options
author | Eric Anholt <[email protected]> | 2010-07-28 15:42:35 -0700 |
---|---|---|
committer | Eric Anholt <[email protected]> | 2010-07-28 15:51:36 -0700 |
commit | 859fd56245c1d725cacab17a34793d41ea14e867 (patch) | |
tree | 97085dc9b3c5eb1baae763c61ed0146ea17d6000 /src/mesa/drivers | |
parent | 56af4e56e3852363a810174c64650df6f0ae4f53 (diff) |
ir_to_mesa: Respect the driver if it rejects a shader.
Diffstat (limited to 'src/mesa/drivers')
-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 4b08d2599bc..c6d11fed064 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; } } |