From 33e2444384caf1443b61b78d7cdaf9629f6ca818 Mon Sep 17 00:00:00 2001 From: Jesse Natalie Date: Fri, 16 Dec 2022 13:33:58 -0800 Subject: [PATCH] dzn: For CmdBindIndexBuffer, look at the graphics pipeline instead of last used Part-of: --- src/microsoft/ci/warp-flakes.txt | 4 ---- src/microsoft/vulkan/dzn_cmd_buffer.c | 5 +++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/microsoft/ci/warp-flakes.txt b/src/microsoft/ci/warp-flakes.txt index 713d8143a52..495a829efe9 100644 --- a/src/microsoft/ci/warp-flakes.txt +++ b/src/microsoft/ci/warp-flakes.txt @@ -1,6 +1,2 @@ dEQP-VK.query_pool.concurrent_queries.primary_command_buffer .*multiple_interpolation.* -dEQP-VK.draw.renderpass.indirect_draw.indexed_data_from_compute.indirect_draw_param_count_instanced.first_instance.triangle_strip - -dEQP-VK.draw.renderpass.indirect_draw.indexed_data_from_compute.indirect_draw.triangle_list -dEQP-VK.draw.renderpass.indirect_draw.indexed_data_from_compute.indirect_draw_count_instanced.no_first_instance.triangle_list diff --git a/src/microsoft/vulkan/dzn_cmd_buffer.c b/src/microsoft/vulkan/dzn_cmd_buffer.c index ba475f4b774..b366b16e472 100644 --- a/src/microsoft/vulkan/dzn_cmd_buffer.c +++ b/src/microsoft/vulkan/dzn_cmd_buffer.c @@ -4898,9 +4898,10 @@ dzn_CmdBindIndexBuffer(VkCommandBuffer commandBuffer, cmdbuf->state.dirty |= DZN_CMD_DIRTY_IB; const struct dzn_graphics_pipeline *pipeline = - (const struct dzn_graphics_pipeline *)cmdbuf->state.pipeline; + (const struct dzn_graphics_pipeline *)cmdbuf->state.bindpoint[VK_PIPELINE_BIND_POINT_GRAPHICS].pipeline; - if (pipeline && dzn_graphics_pipeline_get_desc_template(pipeline, ib_strip_cut)) + if (pipeline && + dzn_graphics_pipeline_get_desc_template(pipeline, ib_strip_cut)) cmdbuf->state.bindpoint[VK_PIPELINE_BIND_POINT_GRAPHICS].dirty |= DZN_CMD_BINDPOINT_DIRTY_PIPELINE; }