diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2014-02-25 22:15:30 -0800 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2014-02-26 02:31:24 -0800 |
| commit | f896e82301255177894a6c51883e18d32c36b307 (patch) | |
| tree | 7d57abf3630838a7656de3afe109dedc9dac0116 /src | |
| parent | b18871c863fabec3ed383881d2cdd0298b157b06 (diff) | |
| download | external_mesa3d-f896e82301255177894a6c51883e18d32c36b307.zip external_mesa3d-f896e82301255177894a6c51883e18d32c36b307.tar.gz external_mesa3d-f896e82301255177894a6c51883e18d32c36b307.tar.bz2 | |
i965: Don't try to dump shader source for fixed-function FS programs.
sh->Source is NULL and this will segfault.
Fixes MESA_GLSL=dump with "The Swapper".
Cc: mesa-stable@lists.freedesktop.org
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_shader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_shader.cpp b/src/mesa/drivers/dri/i965/brw_shader.cpp index 7034907..173aeb6 100644 --- a/src/mesa/drivers/dri/i965/brw_shader.cpp +++ b/src/mesa/drivers/dri/i965/brw_shader.cpp @@ -258,7 +258,7 @@ brw_link_shader(struct gl_context *ctx, struct gl_shader_program *shProg) } } - if (ctx->Shader.Flags & GLSL_DUMP) { + if ((ctx->Shader.Flags & GLSL_DUMP) && shProg->Name != 0) { for (unsigned i = 0; i < shProg->NumShaders; i++) { const struct gl_shader *sh = shProg->Shaders[i]; if (!sh) |