From 8ddfe6b743113e227172906b19ecf131abf5e146 Mon Sep 17 00:00:00 2001 From: Connor Abbott Date: Wed, 6 Sep 2023 18:57:01 +0200 Subject: [PATCH] tu: Fix per-view viewport state propagation We no longer use viewport::per_view_viewport, it's part of the program state instead, but we forgot to delete it and rewrite all users. Fixes: 97da0a77341 ("tu: Rewrite to use common Vulkan dynamic state") Part-of: (cherry picked from commit 749e1de9d33694d7be5190f03fe11a204694e4f4) --- .pick_status.json | 2 +- src/freedreno/vulkan/tu_cmd_buffer.cc | 4 ++-- src/freedreno/vulkan/tu_pipeline.h | 5 ----- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index d94d1d27fb4..dc7908eec30 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2144,7 +2144,7 @@ "description": "tu: Fix per-view viewport state propagation", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "97da0a7734188f4b666bc38833bfadc8b4c53f84", "notes": null diff --git a/src/freedreno/vulkan/tu_cmd_buffer.cc b/src/freedreno/vulkan/tu_cmd_buffer.cc index 5731fce05b2..0577b1f8b9b 100644 --- a/src/freedreno/vulkan/tu_cmd_buffer.cc +++ b/src/freedreno/vulkan/tu_cmd_buffer.cc @@ -2852,8 +2852,8 @@ tu_CmdBindPipeline(VkCommandBuffer commandBuffer, cmd->state.rp.has_tess = true; } - if (pipeline->viewport.per_view_viewport != cmd->state.per_view_viewport) { - cmd->state.per_view_viewport = pipeline->viewport.per_view_viewport; + if (pipeline->program.per_view_viewport != cmd->state.per_view_viewport) { + cmd->state.per_view_viewport = pipeline->program.per_view_viewport; cmd->state.dirty |= TU_CMD_DIRTY_PER_VIEW_VIEWPORT; } diff --git a/src/freedreno/vulkan/tu_pipeline.h b/src/freedreno/vulkan/tu_pipeline.h index d860ef78b09..c184bb8dc7b 100644 --- a/src/freedreno/vulkan/tu_pipeline.h +++ b/src/freedreno/vulkan/tu_pipeline.h @@ -140,11 +140,6 @@ struct tu_pipeline unsigned patch_type; } tess; - /* for dynamic states which use the same register: */ - struct { - bool per_view_viewport; - } viewport; - struct { bool raster_order_attachment_access; } ds;