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: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25225>

diff --git a/src/freedreno/vulkan/tu_cmd_buffer.cc b/src/freedreno/vulkan/tu_cmd_buffer.cc
index 3cb990b..58efdb9 100644 (file)
--- a/src/freedreno/vulkan/tu_cmd_buffer.cc
+++ b/src/freedreno/vulkan/tu_cmd_buffer.cc
@@ -3041,8 +3041,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 19005db..59b1c10 100644 (file)
--- a/src/freedreno/vulkan/tu_pipeline.h
+++ b/src/freedreno/vulkan/tu_pipeline.h
@@ -125,11 +125,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;