ac,radv: remove the vec3 restriction with LLVM 9+

[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 1ec8896afa26d64a1641d5fb6609cfecc1fa2e3b..3bfe49b4dab515da9fc85586700771be3ce1cb3a 100644 (file)
--- a/src/amd/vulkan/radv_meta.c
+++ b/src/amd/vulkan/radv_meta.c
@@ -127,8 +127,8 @@ 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_COMPUTE_PIPELINE) {
@@ -143,13 +143,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) {
@@ -389,8 +391,15 @@ radv_device_init_meta(struct radv_device *device)
        result = radv_device_init_meta_resolve_fragment_state(device, on_demand);
        if (result != VK_SUCCESS)
                goto fail_resolve_fragment;
+
+       result = radv_device_init_meta_fmask_expand_state(device);
+       if (result != VK_SUCCESS)
+               goto fail_fmask_expand;
+
        return VK_SUCCESS;
 
+fail_fmask_expand:
+       radv_device_finish_meta_resolve_fragment_state(device);
 fail_resolve_fragment:
        radv_device_finish_meta_resolve_compute_state(device);
 fail_resolve_compute:
@@ -431,6 +440,7 @@ radv_device_finish_meta(struct radv_device *device)
        radv_device_finish_meta_fast_clear_flush_state(device);
        radv_device_finish_meta_resolve_compute_state(device);
        radv_device_finish_meta_resolve_fragment_state(device);
+       radv_device_finish_meta_fmask_expand_state(device);
 
        radv_store_meta_pipeline(device);
        radv_pipeline_cache_finish(&device->meta_state.cache);