diff options
author | Timothy Arceri <[email protected]> | 2017-03-09 22:58:37 +1100 |
---|---|---|
committer | Timothy Arceri <[email protected]> | 2017-03-12 17:24:40 +1100 |
commit | bfa95997c4ecf74a329a047359d5e8d1217da49b (patch) | |
tree | 49f64331b9c2af6e09d443aae92d1e667320bfa4 /src/compiler/glsl | |
parent | 3d253d330a47eb06bd4745c3ee41c4aa9d6143be (diff) |
mesa/glsl: introduce new gl_compile_status enum
This will allow us to tell if a shader really has been compiled or
if the shader cache has just seen it before.
Acked-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/compiler/glsl')
-rw-r--r-- | src/compiler/glsl/glsl_parser_extras.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/glsl/glsl_parser_extras.cpp b/src/compiler/glsl/glsl_parser_extras.cpp index 44fb46ab838..59114a7a48b 100644 --- a/src/compiler/glsl/glsl_parser_extras.cpp +++ b/src/compiler/glsl/glsl_parser_extras.cpp @@ -1946,7 +1946,7 @@ _mesa_glsl_compile_shader(struct gl_context *ctx, struct gl_shader *shader, fprintf(stderr, "deferring compile of shader: %s\n", _mesa_sha1_format(buf, shader->sha1)); } - shader->CompileStatus = true; + shader->CompileStatus = compile_skipped; free((void *)shader->FallbackSource); shader->FallbackSource = NULL; @@ -2034,7 +2034,7 @@ _mesa_glsl_compile_shader(struct gl_context *ctx, struct gl_shader *shader, set_shader_inout_layout(shader, state); shader->symbols = new(shader->ir) glsl_symbol_table; - shader->CompileStatus = !state->error; + shader->CompileStatus = state->error ? compile_failure : compile_success; shader->InfoLog = state->info_log; shader->Version = state->language_version; shader->IsES = state->es_shader; |