diff --git a/.pick_status.json b/.pick_status.json index 2f8ca16b24c..97b295a8100 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -301,7 +301,7 @@ "description": "zink: allocate program shader caches from the program's mem ctx", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/drivers/zink/zink_program.c b/src/gallium/drivers/zink/zink_program.c index 879c3d051e0..1e742a31c8c 100644 --- a/src/gallium/drivers/zink/zink_program.c +++ b/src/gallium/drivers/zink/zink_program.c @@ -886,10 +886,10 @@ zink_create_gfx_program(struct zink_context *ctx, prog->ctx = ctx; for (int i = 0; i < ZINK_GFX_SHADER_COUNT; ++i) { - util_dynarray_init(&prog->shader_cache[i][0][0], NULL); - util_dynarray_init(&prog->shader_cache[i][0][1], NULL); - util_dynarray_init(&prog->shader_cache[i][1][0], NULL); - util_dynarray_init(&prog->shader_cache[i][1][1], NULL); + util_dynarray_init(&prog->shader_cache[i][0][0], prog); + util_dynarray_init(&prog->shader_cache[i][0][1], prog); + util_dynarray_init(&prog->shader_cache[i][1][0], prog); + util_dynarray_init(&prog->shader_cache[i][1][1], prog); if (stages[i]) { prog->shaders[i] = stages[i]; prog->stages_present |= BITFIELD_BIT(i); @@ -1011,8 +1011,8 @@ precompile_compute_job(void *data, void *gdata, int thread_index) assert(comp->module); comp->module->shader = zink_shader_compile(screen, comp->shader, comp->shader->nir, NULL); assert(comp->module->shader); - util_dynarray_init(&comp->shader_cache[0], NULL); - util_dynarray_init(&comp->shader_cache[1], NULL); + util_dynarray_init(&comp->shader_cache[0], comp); + util_dynarray_init(&comp->shader_cache[1], comp); struct blob blob = {0}; blob_init(&blob);