OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glsl: fix scons builds with shader cache

Browse Source 
For now its disabled for scons so wrap glsl cache calls in a
define conditional.
This commit is contained in:
Timothy Arceri
2017-02-17 16:27:53 +11:00
parent a2bf0954fb
commit 172c48cc15
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/compiler/glsl/linker.cpp
View File

@@ -4626,6 +4626,7 @@ link_shaders(struct gl_context *ctx, struct gl_shader_program *prog)
return; return;
} }
#ifdef ENABLE_SHADER_CACHE
/* If transform feedback used on the program then compile all shaders. */ /* If transform feedback used on the program then compile all shaders. */
bool skip_cache = false; bool skip_cache = false;
if (prog->TransformFeedback.NumVarying > 0) { 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)) if (!skip_cache && shader_cache_read_program_metadata(ctx, prog))
return; return;
#endif
void *mem_ctx = ralloc_context(NULL); // temporary linker context void *mem_ctx = ralloc_context(NULL); // temporary linker context

2
src/mesa/program/ir_to_mesa.cpp
View File

@@ -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) if (prog->data->LinkStatus)
shader_cache_write_program_metadata(ctx, prog); shader_cache_write_program_metadata(ctx, prog);
#endif
} }
} /* extern "C" */ } /* extern "C" */