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

zink: use different key comparison for local_size-using compute pipelines

Browse Source 
this should be more correct

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18197>
This commit is contained in:
Mike Blumenkrantz
2022-08-12 11:11:11 -04:00
committed by Marge Bot
parent 8731ffa238
commit 48ebc60e80
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -722,6 +722,16 @@ equals_compute_pipeline_state(const void *a, const void *b)
sa->module == sb->module; sa->module == sb->module;
} }
static bool
equals_compute_pipeline_state_local_size(const void *a, const void *b)
{
const struct zink_compute_pipeline_state *sa = a;
const struct zink_compute_pipeline_state *sb = b;
return !memcmp(a, b, offsetof(struct zink_compute_pipeline_state, hash)) &&
!memcmp(sa->local_size, sb->local_size, sizeof(sa->local_size)) &&
sa->module == sb->module;
}
static struct zink_compute_program * static struct zink_compute_program *
create_compute_program(struct zink_context *ctx, nir_shader *nir) create_compute_program(struct zink_context *ctx, nir_shader *nir)
{ {
@@ -742,7 +752,9 @@ create_compute_program(struct zink_context *ctx, nir_shader *nir)
nir->info.workgroup_size[1] || nir->info.workgroup_size[1] ||
nir->info.workgroup_size[2]); nir->info.workgroup_size[2]);
_mesa_hash_table_init(&comp->pipelines, comp, NULL, equals_compute_pipeline_state); _mesa_hash_table_init(&comp->pipelines, comp, NULL, comp->use_local_size ?
equals_compute_pipeline_state_local_size :
equals_compute_pipeline_state);
memcpy(comp->base.sha1, comp->shader->base.sha1, sizeof(comp->shader->base.sha1)); memcpy(comp->base.sha1, comp->shader->base.sha1, sizeof(comp->shader->base.sha1));