Module: Mesa Branch: master Commit: 172c48cc15e2a7b42a7de8ff9164ad8733155667 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=172c48cc15e2a7b42a7de8ff9164ad8733155667
Author: Timothy Arceri <[email protected]> Date: Fri Feb 17 16:27:53 2017 +1100 glsl: fix scons builds with shader cache For now its disabled for scons so wrap glsl cache calls in a define conditional. --- src/compiler/glsl/linker.cpp | 2 ++ src/mesa/program/ir_to_mesa.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp index 72fea65..b6f8bc4 100644 --- a/src/compiler/glsl/linker.cpp +++ b/src/compiler/glsl/linker.cpp @@ -4626,6 +4626,7 @@ link_shaders(struct gl_context *ctx, struct gl_shader_program *prog) return; } +#ifdef ENABLE_SHADER_CACHE /* If transform feedback used on the program then compile all shaders. */ bool skip_cache = false; if (prog->TransformFeedback.NumVarying > 0) { @@ -4640,6 +4641,7 @@ link_shaders(struct gl_context *ctx, struct gl_shader_program *prog) if (!skip_cache && shader_cache_read_program_metadata(ctx, prog)) return; +#endif void *mem_ctx = ralloc_context(NULL); // temporary linker context diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp index 67c9267..a4f61ac 100644 --- a/src/mesa/program/ir_to_mesa.cpp +++ b/src/mesa/program/ir_to_mesa.cpp @@ -3130,8 +3130,10 @@ _mesa_glsl_link_shader(struct gl_context *ctx, struct gl_shader_program *prog) } } +#ifdef ENABLE_SHADER_CACHE if (prog->data->LinkStatus) shader_cache_write_program_metadata(ctx, prog); +#endif } } /* extern "C" */ _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
