From 1f4172e4ec9d33434f7fda26dbb9e25331886a1f Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 20 Oct 2022 12:23:04 -0400 Subject: [PATCH] zink: fix gpl compile optimization this is supposed to create the non-optimized pipeline first and then compile the optimized version in the background, not the other way around facepalm. Reviewed-by: Dave Airlie Part-of: --- src/gallium/drivers/zink/zink_program.c | 2 +- src/gallium/drivers/zink/zink_program_state.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/zink/zink_program.c b/src/gallium/drivers/zink/zink_program.c index 7a20ae69881..c9b2778fffb 100644 --- a/src/gallium/drivers/zink/zink_program.c +++ b/src/gallium/drivers/zink/zink_program.c @@ -683,7 +683,7 @@ optimized_compile_job(void *data, void *gdata, int thread_index) struct zink_screen *screen = gdata; VkPipeline pipeline; if (pc_entry->gkey) - pipeline = zink_create_gfx_pipeline_combined(screen, pc_entry->prog, pc_entry->ikey->pipeline, pc_entry->gkey->pipeline, pc_entry->okey->pipeline, false); + pipeline = zink_create_gfx_pipeline_combined(screen, pc_entry->prog, pc_entry->ikey->pipeline, pc_entry->gkey->pipeline, pc_entry->okey->pipeline, true); else pipeline = zink_create_gfx_pipeline(screen, pc_entry->prog, &pc_entry->state, pc_entry->state.element_state->binding_map, zink_primitive_topology(pc_entry->state.gfx_prim_mode), true); if (pipeline) { diff --git a/src/gallium/drivers/zink/zink_program_state.hpp b/src/gallium/drivers/zink/zink_program_state.hpp index 2bf588e75d7..12df9dfeca6 100644 --- a/src/gallium/drivers/zink/zink_program_state.hpp +++ b/src/gallium/drivers/zink/zink_program_state.hpp @@ -247,7 +247,7 @@ zink_get_gfx_pipeline(struct zink_context *ctx, pc_entry->ikey = ikey; pc_entry->gkey = gkey; pc_entry->okey = okey; - pipeline = zink_create_gfx_pipeline_combined(screen, prog, ikey->pipeline, gkey->pipeline, okey->pipeline, true); + pipeline = zink_create_gfx_pipeline_combined(screen, prog, ikey->pipeline, gkey->pipeline, okey->pipeline, false); } else { /* optimize by default only when expecting precompiles in order to reduce stuttering */ pipeline = zink_create_gfx_pipeline(screen, prog, state, state->element_state->binding_map, vkmode, !HAVE_LIB);