From 617ee2855bc71f8943acd351676ba4bb3665caeb Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Sun, 25 Sep 2022 12:18:59 -0400 Subject: [PATCH] zink: don't deref prog->shaders during pipeline construction this may or may not be valid depending on (upcoming) threading changes, and the nir pointers are all readily available Reviewed-by: Adam Jackson Part-of: --- src/gallium/drivers/zink/zink_pipeline.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/drivers/zink/zink_pipeline.c b/src/gallium/drivers/zink/zink_pipeline.c index 04f29cb2a77..4ffa5ee46a8 100644 --- a/src/gallium/drivers/zink/zink_pipeline.c +++ b/src/gallium/drivers/zink/zink_pipeline.c @@ -108,7 +108,7 @@ zink_create_gfx_pipeline(struct zink_screen *screen, blend_state.logicOp = state->blend_state->logicop_func; } if (screen->info.have_EXT_rasterization_order_attachment_access && - prog->shaders[MESA_SHADER_FRAGMENT]->nir->info.fs.uses_fbfetch_output) + prog->nir[MESA_SHADER_FRAGMENT]->info.fs.uses_fbfetch_output) blend_state.flags |= VK_PIPELINE_COLOR_BLEND_STATE_CREATE_RASTERIZATION_ORDER_ATTACHMENT_ACCESS_BIT_EXT; VkPipelineMultisampleStateCreateInfo ms_state = {0};