3 files changed, 43 insertions, 25 deletions

diff --git a/src/amd/vulkan/radv_meta.c b/src/amd/vulkan/radv_meta.c
index b17076703ae..2e16c9b9f46 100644
--- a/src/amd/vulkan/radv_meta.c
+++ b/src/amd/vulkan/radv_meta.c
@@ -32,15 +32,22 @@
 
 static void
 radv_meta_save_novertex(struct radv_meta_saved_state *state,
-	       const struct radv_cmd_buffer *cmd_buffer,
-	       uint32_t dynamic_mask)
+			const struct radv_cmd_buffer *cmd_buffer)
 {
 	state->old_pipeline = cmd_buffer->state.pipeline;
 	state->old_descriptor_set0 = cmd_buffer->state.descriptors[0];
 
-	state->dynamic_mask = dynamic_mask;
-	radv_dynamic_state_copy(&state->dynamic, &cmd_buffer->state.dynamic,
-				dynamic_mask);
+	/* Save all viewports. */
+	state->viewport.count = cmd_buffer->state.dynamic.viewport.count;
+	typed_memcpy(state->viewport.viewports,
+		     cmd_buffer->state.dynamic.viewport.viewports,
+		     MAX_VIEWPORTS);
+
+	/* Save all scissors. */
+	state->scissor.count = cmd_buffer->state.dynamic.scissor.count;
+	typed_memcpy(state->scissor.scissors,
+		     cmd_buffer->state.dynamic.scissor.scissors,
+		     MAX_SCISSORS);
 
 	memcpy(state->push_constants, cmd_buffer->push_constants, MAX_PUSH_CONSTANTS_SIZE);
 }
@@ -55,9 +62,20 @@ radv_meta_restore(const struct radv_meta_saved_state *state,
 
 	cmd_buffer->state.dirty |= RADV_CMD_DIRTY_PIPELINE;
 
-	radv_dynamic_state_copy(&cmd_buffer->state.dynamic, &state->dynamic,
-				state->dynamic_mask);
-	cmd_buffer->state.dirty |= state->dynamic_mask;
+	/* Restore all viewports. */
+	cmd_buffer->state.dynamic.viewport.count = state->viewport.count;
+	typed_memcpy(cmd_buffer->state.dynamic.viewport.viewports,
+		     state->viewport.viewports,
+		     MAX_VIEWPORTS);
+
+	/* Restore all scissors. */
+	cmd_buffer->state.dynamic.scissor.count = state->scissor.count;
+	typed_memcpy(cmd_buffer->state.dynamic.scissor.scissors,
+		     state->scissor.scissors,
+		     MAX_SCISSORS);
+
+	cmd_buffer->state.dirty |= 1 << VK_DYNAMIC_STATE_VIEWPORT |
+				   1 << VK_DYNAMIC_STATE_SCISSOR;
 
 	memcpy(cmd_buffer->push_constants, state->push_constants, MAX_PUSH_CONSTANTS_SIZE);
 	cmd_buffer->push_constant_stages |= VK_SHADER_STAGE_ALL_GRAPHICS | VK_SHADER_STAGE_COMPUTE_BIT;
@@ -391,11 +409,11 @@ void
 radv_meta_save_graphics_reset_vport_scissor_novertex(struct radv_meta_saved_state *saved_state,
 						     struct radv_cmd_buffer *cmd_buffer)
 {
-	uint32_t dirty_state = (1 << VK_DYNAMIC_STATE_VIEWPORT) | (1 << VK_DYNAMIC_STATE_SCISSOR);
-	radv_meta_save_novertex(saved_state, cmd_buffer, dirty_state);
+	radv_meta_save_novertex(saved_state, cmd_buffer);
 	cmd_buffer->state.dynamic.viewport.count = 0;
 	cmd_buffer->state.dynamic.scissor.count = 0;
-	cmd_buffer->state.dirty |= dirty_state;
+	cmd_buffer->state.dirty |= 1 << VK_DYNAMIC_STATE_VIEWPORT |
+				   1 << VK_DYNAMIC_STATE_SCISSOR;
 }
 
 nir_ssa_def *radv_meta_gen_rect_vertices_comp2(nir_builder *vs_b, nir_ssa_def *comp2)
diff --git a/src/amd/vulkan/radv_meta.h b/src/amd/vulkan/radv_meta.h
index 5d28cc5f0f9..c7c9a6bd5e1 100644
--- a/src/amd/vulkan/radv_meta.h
+++ b/src/amd/vulkan/radv_meta.h
@@ -36,14 +36,10 @@ extern "C" {
 #define RADV_META_VERTEX_BINDING_COUNT 2
 
 struct radv_meta_saved_state {
-	/**
-	 * Bitmask of (1 << VK_DYNAMIC_STATE_*). Defines the set of saved dynamic
-	 * state.
-	 */
-	uint32_t dynamic_mask;
-	struct radv_dynamic_state dynamic;
 	struct radv_descriptor_set *old_descriptor_set0;
 	struct radv_pipeline *old_pipeline;
+	struct radv_viewport_state viewport;
+	struct radv_scissor_state scissor;
 
 	char push_constants[128];
 };
diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h
index 79ac295a0fd..c23e8cf4995 100644
--- a/src/amd/vulkan/radv_private.h
+++ b/src/amd/vulkan/radv_private.h
@@ -700,16 +700,20 @@ struct radv_vertex_binding {
 	VkDeviceSize                                 offset;
 };
 
+struct radv_viewport_state {
+	uint32_t                                          count;
+	VkViewport                                        viewports[MAX_VIEWPORTS];
+};
+
+struct radv_scissor_state {
+	uint32_t                                          count;
+	VkRect2D                                          scissors[MAX_SCISSORS];
+};
+
 struct radv_dynamic_state {
-	struct {
-		uint32_t                                  count;
-		VkViewport                                viewports[MAX_VIEWPORTS];
-	} viewport;
+	struct radv_viewport_state                        viewport;
 
-	struct {
-		uint32_t                                  count;
-		VkRect2D                                  scissors[MAX_SCISSORS];
-	} scissor;
+	struct radv_scissor_state                         scissor;
 
 	float                                        line_width;