summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTimothy Arceri <[email protected]>2017-02-13 09:34:54 +1100
committerTimothy Arceri <[email protected]>2017-02-17 11:18:42 +1100
commite5bb4a0b0f4743fa0a0567991dca751ef49a7200 (patch)
tree23ac824bb7ecc033145244df6688adbbc1be3f71 /src
parent877194068208a9fb87f7b5513bca85d09be8a20f (diff)
glsl: use correct shader source in case of cache fallback
The scenario is: glShaderSource glCompileShader <-- deferred due to cache hit of shader glShaderSource <-- with new source code glAttachShader glLinkProgram <-- no cache hit for program At this point we need to compile the original source when we fallback. Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/compiler/glsl/glsl_parser_extras.cpp11
-rw-r--r--src/mesa/main/mtypes.h2
-rw-r--r--src/mesa/main/shaderapi.c15
-rw-r--r--src/mesa/main/shaderobj.c1
4 files changed, 25 insertions, 4 deletions
diff --git a/src/compiler/glsl/glsl_parser_extras.cpp b/src/compiler/glsl/glsl_parser_extras.cpp
index 833b5fefa18..375a99a49da 100644
--- a/src/compiler/glsl/glsl_parser_extras.cpp
+++ b/src/compiler/glsl/glsl_parser_extras.cpp
@@ -1927,7 +1927,8 @@ _mesa_glsl_compile_shader(struct gl_context *ctx, struct gl_shader *shader,
{
struct _mesa_glsl_parse_state *state =
new(shader) _mesa_glsl_parse_state(ctx, shader->Stage, shader);
- const char *source = shader->Source;
+ const char *source = force_recompile && shader->FallbackSource ?
+ shader->FallbackSource : shader->Source;
if (ctx->Const.GenerateTemporaryNames)
(void) p_atomic_cmpxchg(&ir_variable::temporaries_allocate_names,
@@ -1946,6 +1947,9 @@ _mesa_glsl_compile_shader(struct gl_context *ctx, struct gl_shader *shader,
_mesa_sha1_format(buf, shader->sha1));
}
shader->CompileStatus = true;
+
+ free((void *)shader->FallbackSource);
+ shader->FallbackSource = NULL;
return;
}
}
@@ -2067,6 +2071,11 @@ _mesa_glsl_compile_shader(struct gl_context *ctx, struct gl_shader *shader,
_mesa_glsl_initialize_derived_variables(ctx, shader);
+ if (!force_recompile) {
+ free((void *)shader->FallbackSource);
+ shader->FallbackSource = NULL;
+ }
+
delete state->symbols;
ralloc_free(state);
}
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index efe0cbcad75..e24ee3c0c00 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2397,6 +2397,8 @@ struct gl_shader
#endif
const GLchar *Source; /**< Source code string */
+ const GLchar *FallbackSource; /**< Fallback string used by on-disk cache*/
+
GLchar *InfoLog;
unsigned Version; /**< GLSL version used for linking */
diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index 86ce0bc5fdf..0c38cea2555 100644
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -1003,9 +1003,18 @@ shader_source(struct gl_shader *sh, const GLchar *source)
{
assert(sh);
- /* free old shader source string and install new one */
- free((void *)sh->Source);
- sh->Source = source;
+ if (sh->CompileStatus == GL_TRUE && !sh->FallbackSource) {
+ /* If shader was previously compiled back-up the source in case of cache
+ * fallback.
+ */
+ sh->FallbackSource = sh->Source;
+ sh->Source = source;
+ } else {
+ /* free old shader source string and install new one */
+ free((void *)sh->Source);
+ sh->Source = source;
+ }
+
#ifdef DEBUG
sh->SourceChecksum = util_hash_crc32(sh->Source, strlen(sh->Source));
#endif
diff --git a/src/mesa/main/shaderobj.c b/src/mesa/main/shaderobj.c
index b41137fbce3..222efc12c4e 100644
--- a/src/mesa/main/shaderobj.c
+++ b/src/mesa/main/shaderobj.c
@@ -122,6 +122,7 @@ void
_mesa_delete_shader(struct gl_context *ctx, struct gl_shader *sh)
{
free((void *)sh->Source);
+ free((void *)sh->FallbackSource);
free(sh->Label);
ralloc_free(sh);
}