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

zink: fix gpl compile optimization

Browse source 
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 <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19201>
This commit is contained in:
Mike Blumenkrantz 2022-10-20 12:23:04 -04:00 • committed by Marge Bot
parent 490ddbd0b7
commit 1f4172e4ec
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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) {

2
src/gallium/drivers/zink/zink_program_state.hpp
View file

@ -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);