radv: load the fast color clear values from the base level

[mesa.git] / src / amd / vulkan / radv_meta.c

diff --git a/src/amd/vulkan/radv_meta.c b/src/amd/vulkan/radv_meta.c
index ec4fc4a6d4bf03fa248edda20496a421ecdbb95d..5e619c2f181644e936b0a0a7e100cfa87f81dde3 100644 (file)
--- a/src/amd/vulkan/radv_meta.c
+++ b/src/amd/vulkan/radv_meta.c
@@ -73,6 +73,11 @@ radv_meta_save(struct radv_meta_saved_state *state,
                                           1 << VK_DYNAMIC_STATE_SCISSOR;
        }
 
+       if (state->flags & RADV_META_SAVE_SAMPLE_LOCATIONS) {
+               typed_memcpy(&state->sample_location,
+                            &cmd_buffer->state.dynamic.sample_location, 1);
+       }
+
        if (state->flags & RADV_META_SAVE_COMPUTE_PIPELINE) {
                assert(!(state->flags & RADV_META_SAVE_GRAPHICS_PIPELINE));
 
@@ -127,8 +132,15 @@ radv_meta_restore(const struct radv_meta_saved_state *state,
                             state->scissor.scissors,
                             MAX_SCISSORS);
 
-               cmd_buffer->state.dirty |= 1 << VK_DYNAMIC_STATE_VIEWPORT |
-                                          1 << VK_DYNAMIC_STATE_SCISSOR;
+               cmd_buffer->state.dirty |= RADV_CMD_DIRTY_DYNAMIC_VIEWPORT |
+                                          RADV_CMD_DIRTY_DYNAMIC_SCISSOR;
+       }
+
+       if (state->flags & RADV_META_SAVE_SAMPLE_LOCATIONS) {
+               typed_memcpy(&cmd_buffer->state.dynamic.sample_location.locations,
+                            &state->sample_location.locations, 1);
+
+               cmd_buffer->state.dirty |= RADV_CMD_DIRTY_DYNAMIC_SAMPLE_LOCATIONS;
        }
 
        if (state->flags & RADV_META_SAVE_COMPUTE_PIPELINE) {
@@ -143,13 +155,15 @@ radv_meta_restore(const struct radv_meta_saved_state *state,
        }
 
        if (state->flags & RADV_META_SAVE_CONSTANTS) {
-               memcpy(cmd_buffer->push_constants, state->push_constants,
-                      MAX_PUSH_CONSTANTS_SIZE);
-               cmd_buffer->push_constant_stages |= VK_SHADER_STAGE_COMPUTE_BIT;
+               VkShaderStageFlags stages = VK_SHADER_STAGE_COMPUTE_BIT;
 
-               if (state->flags & RADV_META_SAVE_GRAPHICS_PIPELINE) {
-                       cmd_buffer->push_constant_stages |= VK_SHADER_STAGE_ALL_GRAPHICS;
-               }
+               if (state->flags & RADV_META_SAVE_GRAPHICS_PIPELINE)
+                       stages |= VK_SHADER_STAGE_ALL_GRAPHICS;
+
+               radv_CmdPushConstants(radv_cmd_buffer_to_handle(cmd_buffer),
+                                     VK_NULL_HANDLE, stages, 0,
+                                     MAX_PUSH_CONSTANTS_SIZE,
+                                     state->push_constants);
        }
 
        if (state->flags & RADV_META_SAVE_PASS) {