Bladeren bron

glsl: be much more aggressive when skipping shader compilation

Currently we only add a cache key for a shader once it is linked.
However games like Team Fortress 2 compile a whole bunch of shaders
which are never actually linked. These compiled shaders can take
up a bunch of memory.

This patch changes things so that we add the key for the shader to
the cache as soon as it is compiled. This means on a warm cache we
can avoid the wasted memory from these shaders. Worst case scenario
is we need to compile the shaders at link time but this can happen
anyway if the shader has been evicted from the cache.

Reduces memory use in Team Fortress 2 from 1.3GB -> 770MB on a
warm cache from start up to the game menu.

V2: only add key to cache when compilation is successful.

Acked-by: Marek Olšák <marek.olsak@amd.com>
tags/19.0-branchpoint
Timothy Arceri 6 jaren geleden
bovenliggende
commit
6ca652faf3
2 gewijzigde bestanden met toevoegingen van 10 en 6 verwijderingen
  1. 9
    0
      src/compiler/glsl/glsl_parser_extras.cpp
  2. 1
    6
      src/compiler/glsl/shader_cache.cpp

+ 9
- 0
src/compiler/glsl/glsl_parser_extras.cpp Bestand weergeven



delete state->symbols; delete state->symbols;
ralloc_free(state); ralloc_free(state);

if (ctx->Cache && shader->CompileStatus == COMPILE_SUCCESS) {
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" */ } /* extern "C" */

+ 1
- 6
src/compiler/glsl/shader_cache.cpp Bestand weergeven

if (!cache_item_metadata.keys) if (!cache_item_metadata.keys)
goto fail; goto fail;


char sha1_buf[41];
for (unsigned i = 0; i < prog->NumShaders; i++) { 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, memcpy(cache_item_metadata.keys[i], prog->Shaders[i]->sha1,
sizeof(cache_key)); 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, disk_cache_put(cache, prog->data->sha1, metadata.data, metadata.size,
&cache_item_metadata); &cache_item_metadata);


char sha1_buf[41];
if (ctx->_Shader->Flags & GLSL_CACHE_INFO) { if (ctx->_Shader->Flags & GLSL_CACHE_INFO) {
_mesa_sha1_format(sha1_buf, prog->data->sha1); _mesa_sha1_format(sha1_buf, prog->data->sha1);
fprintf(stderr, "putting program metadata in cache: %s\n", sha1_buf); fprintf(stderr, "putting program metadata in cache: %s\n", sha1_buf);

Laden…
Annuleren
Opslaan