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

zink: move uniform size calc for shader keys into keybox

Browse source 
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:09:22 -04:00
parent 19fbdb9064
commit 8e78a6f67d
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -73,15 +73,15 @@ struct keybox {
};
static struct keybox *
make_keybox(void *mem_ctx, const void *key, uint32_t key_size, const void *base, uint32_t base_size)
make_keybox(void *mem_ctx, const void *key, uint32_t key_size, const void *base, uint32_t num_uniforms)
{
struct keybox *keybox =
ralloc_size(mem_ctx, sizeof(struct keybox) + key_size + base_size);
unsigned uniform_size = num_uniforms * sizeof(uint32_t);
struct keybox *keybox = ralloc_size(mem_ctx, sizeof(struct keybox) + key_size + uniform_size);
keybox->size = key_size + base_size;
keybox->size = key_size + uniform_size;
memcpy(keybox->data, key, key_size);
if (base_size)
memcpy(&keybox->data[key_size], base, base_size);
if (num_uniforms)
memcpy(&keybox->data[key_size], base, uniform_size);
return keybox;
}
@ -143,7 +143,7 @@ get_shader_module_for_stage(struct zink_context *ctx, struct zink_screen *screen
if (ctx && zs->nir->info.num_inlinable_uniforms &&
ctx->inlinable_uniforms_valid_mask & BITFIELD64_BIT(pstage)) {
base_size = zs->nir->info.num_inlinable_uniforms * sizeof(uint32_t);
base_size = zs->nir->info.num_inlinable_uniforms;
is_default_variant = false;
}
if (is_default_variant) {