From 4be5ef5caab75923eab09f8d423a7cbc3507c713 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Thu, 16 Jan 2020 17:05:10 -0600 Subject: [PATCH] anv: Emit URB setup earlier Cc: "20.0" mesa-stable@lists.freedesktop.org Reviewed-by: Kenneth Graunke Part-of: (cherry picked from commit e340a79b9c4b6ee35eaa10a685395a67d0b0b440) --- .pick_status.json | 2 +- src/intel/vulkan/genX_pipeline.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 8b37f45ff1e..4dfaff8cdf2 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -157,7 +157,7 @@ "description": "anv: Emit URB setup earlier", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": null }, diff --git a/src/intel/vulkan/genX_pipeline.c b/src/intel/vulkan/genX_pipeline.c index 92bb04d07d3..b23be6b1152 100644 --- a/src/intel/vulkan/genX_pipeline.c +++ b/src/intel/vulkan/genX_pipeline.c @@ -2144,6 +2144,8 @@ genX(graphics_pipeline_create)( vk_find_struct_const(pCreateInfo->pRasterizationState->pNext, PIPELINE_RASTERIZATION_LINE_STATE_CREATE_INFO_EXT); + emit_urb_setup(pipeline); + assert(pCreateInfo->pVertexInputState); emit_vertex_input(pipeline, pCreateInfo->pVertexInputState); assert(pCreateInfo->pRasterizationState); @@ -2155,8 +2157,6 @@ genX(graphics_pipeline_create)( emit_cb_state(pipeline, cb_info, ms_info); compute_kill_pixel(pipeline, ms_info, subpass); - emit_urb_setup(pipeline); - emit_3dstate_clip(pipeline, pCreateInfo->pInputAssemblyState, vp_info,