fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 05:08:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

zink: fix caching of shader variants with inlined uniforms

Browse source 
attempting to read the inlined uniforms directly after the variant key
using the size of the variant is not going to work since the variant union
is (sometimes) much larger than the size of the actual struct being used,
meaning that this would just copy a bunch of zeroes instead of the actual
inlined uniforms

Fixes: 7f28775edc ("zink: implement uniform inlining")

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11003>
(cherry picked from commit eb12f7f11e)
This commit is contained in:
Mike Blumenkrantz 2021-05-25 14:17:56 -04:00 • committed by Eric Engestrom
parent 9ce9cbecad
commit c2e611e1a4
2 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -40,7 +40,7 @@
"description": "zink: fix caching of shader variants with inlined uniforms",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "7f28775edcc727791528d8439c86e8dffd5059a9"
},

20
src/gallium/drivers/zink/zink_program.c
View file

@ -83,18 +83,16 @@ struct keybox {
};
static struct keybox *
make_keybox(void *mem_ctx,
gl_shader_stage stage,
const void *key,
uint32_t key_size)
make_keybox(void *mem_ctx, gl_shader_stage stage, const void *key, uint32_t key_size, void *base, uint32_t base_size)
{
struct keybox *keybox =
ralloc_size(mem_ctx, sizeof(struct keybox) + key_size);
ralloc_size(mem_ctx, sizeof(struct keybox) + key_size + base_size);
keybox->stage = stage;
keybox->size = key_size;
keybox->size = key_size + base_size;
memcpy(keybox->data, key, key_size);
if (base_size)
memcpy(&keybox->data[key_size], base, base_size);
return keybox;
}
@ -282,7 +280,7 @@ get_shader_module_for_stage(struct zink_context *ctx, struct zink_shader *zs, st
struct zink_shader_module *zm;
struct keybox *keybox;
uint32_t hash;
bool needs_base_size = false;
unsigned base_size = 0;
shader_key_vtbl[stage](ctx, zs, ctx->gfx_stages, &key);
@ -292,11 +290,9 @@ get_shader_module_for_stage(struct zink_context *ctx, struct zink_shader *zs, st
memcpy(key.base.inlined_uniform_values,
ctx->inlinable_uniforms[pstage],
zs->nir->info.num_inlinable_uniforms * 4);
needs_base_size = true;
base_size = zs->nir->info.num_inlinable_uniforms * sizeof(uint32_t);
}
if (needs_base_size)
key.size += sizeof(struct zink_shader_key_base);
keybox = make_keybox(prog->shader_cache, stage, &key, key.size);
keybox = make_keybox(prog->shader_cache, stage, &key, key.size, &key.base, base_size);
hash = keybox_hash(keybox);
struct hash_entry *entry = _mesa_hash_table_search_pre_hashed(prog->shader_cache->shader_cache,
hash, keybox);