KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glsl: add can_skip_compile() helper 

We will reuse this in the following commit.

Reviewed-by: Witold Baryluk <witold.baryluk@gmail.com>
This commit is contained in:
Timothy Arceri 2019-08-21 16:13:07 +10:00
parent 5327b756bf
commit 17df8f8b5d
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/compiler/glsl/glsl_parser_extras.cpp
View File

@ -2108,13 +2108,10 @@ opt_shader_and_create_symbol_table(struct gl_context *ctx,
shader->symbols); shader->symbols);
} }
void static bool
_mesa_glsl_compile_shader(struct gl_context *ctx, struct gl_shader *shader, can_skip_compile(struct gl_context *ctx, struct gl_shader *shader,
bool dump_ast, bool dump_hir, bool force_recompile) const char *source, bool force_recompile)
{ {
const char *source = force_recompile && shader->FallbackSource ?
shader->FallbackSource : shader->Source;
if (!force_recompile) { if (!force_recompile) {
if (ctx->Cache) { if (ctx->Cache) {
char buf[41]; char buf[41];
@ -2130,19 +2127,32 @@ _mesa_glsl_compile_shader(struct gl_context *ctx, struct gl_shader *shader,
free((void *)shader->FallbackSource); free((void *)shader->FallbackSource);
shader->FallbackSource = NULL; shader->FallbackSource = NULL;
return; return true;
} }
} }
} else { } else {
/* We should only ever end up here if a re-compile has been forced by a /* We should only ever end up here if a re-compile has been forced by a
* shader cache miss. In which case we can skip the compile if its * shader cache miss. In which case we can skip the compile if its
* already be done by a previous fallback or the initial compile call. * already been done by a previous fallback or the initial compile call.
*/ */
if (shader->CompileStatus == COMPILE_SUCCESS) if (shader->CompileStatus == COMPILE_SUCCESS)
return; return true;
} }
struct _mesa_glsl_parse_state *state = return false;
}
void
_mesa_glsl_compile_shader(struct gl_context *ctx, struct gl_shader *shader,
bool dump_ast, bool dump_hir, bool force_recompile)
{
const char *source = force_recompile && shader->FallbackSource ?
shader->FallbackSource : shader->Source;
if (can_skip_compile(ctx, shader, source, force_recompile))
return;
struct _mesa_glsl_parse_state *state =
new(shader) _mesa_glsl_parse_state(ctx, shader->Stage, shader); new(shader) _mesa_glsl_parse_state(ctx, shader->Stage, shader);
if (ctx->Const.GenerateTemporaryNames) if (ctx->Const.GenerateTemporaryNames)