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

Revert "glsl: be much more aggressive when skipping shader compilation"

Browse Source 
This reverts commit 64b8c86d37.

Reverting for now as it was causing some segfaults.
This commit is contained in:
Timothy Arceri
2019-01-19 10:45:07 +11:00
parent 5486c9d526
commit 860a9e4849
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2155,15 +2155,6 @@ _mesa_glsl_compile_shader(struct gl_context *ctx, struct gl_shader *shader,
delete state->symbols;
ralloc_free(state);
if (ctx->Cache) {
char sha1_buf[41];
disk_cache_put_key(ctx->Cache, shader->sha1);
if (ctx->_Shader->Flags & GLSL_CACHE_INFO) {
_mesa_sha1_format(sha1_buf, shader->sha1);
fprintf(stderr, "marking shader: %s\n", sha1_buf);
}
}
}
} /* extern "C" */

7
src/compiler/glsl/shader_cache.cpp
View File

@@ -121,15 +121,20 @@ shader_cache_write_program_metadata(struct gl_context *ctx,
if (!cache_item_metadata.keys)
goto fail;
char sha1_buf[41];
for (unsigned i = 0; i < prog->NumShaders; i++) {
disk_cache_put_key(cache, prog->Shaders[i]->sha1);
memcpy(cache_item_metadata.keys[i], prog->Shaders[i]->sha1,
sizeof(cache_key));
if (ctx->_Shader->Flags & GLSL_CACHE_INFO) {
_mesa_sha1_format(sha1_buf, prog->Shaders[i]->sha1);
fprintf(stderr, "marking shader: %s\n", sha1_buf);
}
}
disk_cache_put(cache, prog->data->sha1, metadata.data, metadata.size,
&cache_item_metadata);
char sha1_buf[41];
if (ctx->_Shader->Flags & GLSL_CACHE_INFO) {
_mesa_sha1_format(sha1_buf, prog->data->sha1);
fprintf(stderr, "putting program metadata in cache: %s\n", sha1_buf);