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: 97da0a7734 ("tu: Rewrite to use common Vulkan dynamic state")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25225>
(cherry picked from commit 749e1de9d3)
This commit is contained in:
Connor Abbott 2023-09-06 18:57:01 +02:00 committed by Dylan Baker
parent 9eb180b310
commit 8ddfe6b743
3 changed files with 3 additions and 8 deletions

View file

@ -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

View file

@ -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;
}

View file

@ -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;