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

zink: remove default_variants storage in program struct

Browse Source 
these should naturally be the first entry in the list when it matters

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12842>
This commit is contained in:
Mike Blumenkrantz
2021-09-01 16:52:12 -04:00
parent 334576569e
commit ad32e41efe
2 changed files with 2 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/gallium/drivers/zink/zink_program.c
View File

@@ -92,28 +92,13 @@ get_shader_module_for_stage(struct zink_context *ctx, struct zink_screen *screen
VkShaderModule mod;
struct zink_shader_module *zm = NULL;
unsigned base_size = 0;
bool is_default_variant;
const struct zink_shader_key *key = &state->shader_keys.key[pstage];
/* this is default variant if there is no default or it matches the default */
if (pstage != PIPE_SHADER_TESS_CTRL && prog->default_variants[pstage]) {
const struct zink_shader_module *tmp = prog->default_variants[pstage];
/* if comparing against the existing default, use the base variant key size since
* we're only checking the stage-specific data
*/
is_default_variant = shader_key_matches(tmp, key, 0);
} else
is_default_variant = true;
if (ctx && zs->nir->info.num_inlinable_uniforms &&
ctx->inlinable_uniforms_valid_mask & BITFIELD64_BIT(pstage)) {
base_size = zs->nir->info.num_inlinable_uniforms;
is_default_variant = false;
}
if (is_default_variant) {
if (prog->default_variants[pstage])
return prog->default_variants[pstage];
}
struct zink_shader_module *iter, *next;
LIST_FOR_EACH_ENTRY_SAFE(iter, next, &prog->shader_cache[pstage], list) {
if (!shader_key_matches(iter, key, base_size))
@@ -141,11 +126,7 @@ get_shader_module_for_stage(struct zink_context *ctx, struct zink_screen *screen
if (base_size)
memcpy(zm->key + key->size, &key->base, base_size * sizeof(uint32_t));
zm->hash = shader_module_hash(zm);
if (is_default_variant) {
prog->default_variants[pstage] = zm;
zm->default_variant = true;
} else
zm->default_variant = false;
zm->default_variant = !base_size && list_is_empty(&prog->shader_cache[pstage]);
}
list_add(&zm->list, &prog->shader_cache[pstage]);
return zm;

1
src/gallium/drivers/zink/zink_program.h
View File

@@ -99,7 +99,6 @@ struct zink_gfx_program {
struct zink_shader_module *modules[ZINK_SHADER_COUNT]; // compute stage doesn't belong here
struct zink_shader_module *default_variants[ZINK_SHADER_COUNT];
struct zink_shader *last_vertex_stage;
struct list_head shader_cache[ZINK_SHADER_COUNT];