dri3: Only update number of back buffers in loader_dri3_get_buffers

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

diff --git a/src/amd/vulkan/radv_meta_resolve_fs.c b/src/amd/vulkan/radv_meta_resolve_fs.c
index 99314d94e5338278c5ae2d44ef83627b244c4cc6..ef8c1d8b1da5c796ef69645f8376e8b61faff15b 100644 (file)
--- a/src/amd/vulkan/radv_meta_resolve_fs.c
+++ b/src/amd/vulkan/radv_meta_resolve_fs.c
@@ -319,16 +319,9 @@ create_resolve_pipeline(struct radv_device *device,
                                               &vk_pipeline_info, &radv_pipeline_info,
                                               &device->meta_state.alloc,
                                               pipeline);
-
        ralloc_free(vs.nir);
        ralloc_free(fs.nir);
-       if (result != VK_SUCCESS)
-               goto fail;
 
-       return VK_SUCCESS;
-fail:
-       ralloc_free(vs.nir);
-       ralloc_free(fs.nir);
        return result;
 }
 
@@ -339,14 +332,19 @@ radv_device_init_meta_resolve_fragment_state(struct radv_device *device)
 
        res = create_layout(device);
        if (res != VK_SUCCESS)
-               return res;
+               goto fail;
 
        for (uint32_t i = 0; i < MAX_SAMPLES_LOG2; ++i) {
                for (unsigned j = 0; j < ARRAY_SIZE(pipeline_formats); ++j) {
                        res = create_resolve_pipeline(device, i, pipeline_formats[j]);
+                       if (res != VK_SUCCESS)
+                               goto fail;
                }
        }
 
+       return VK_SUCCESS;
+fail:
+       radv_device_finish_meta_resolve_fragment_state(device);
        return res;
 }
 
@@ -459,19 +457,9 @@ void radv_meta_resolve_fragment_image(struct radv_cmd_buffer *cmd_buffer,
        unsigned fs_key = radv_format_meta_fs_key(dest_image->vk_format);
        unsigned dst_layout = radv_meta_dst_layout_from_layout(dest_image_layout);
        VkRenderPass rp;
-       for (uint32_t r = 0; r < region_count; ++r) {
-               const VkImageResolve *region = &regions[r];
-               const uint32_t src_base_layer =
-                       radv_meta_get_iview_layer(src_image, &region->srcSubresource,
-                                                 &region->srcOffset);
-               VkImageSubresourceRange range;
-               range.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
-               range.baseMipLevel = region->srcSubresource.mipLevel;
-               range.levelCount = 1;
-               range.baseArrayLayer = src_base_layer;
-               range.layerCount = region->srcSubresource.layerCount;
-               radv_fast_clear_flush_image_inplace(cmd_buffer, src_image, &range);
-       }
+
+       radv_decompress_resolve_src(cmd_buffer, src_image, src_image_layout,
+                                   region_count, regions);
 
        rp = device->meta_state.resolve_fragment.rc[samples_log2].render_pass[fs_key][dst_layout];
 
@@ -620,6 +608,8 @@ radv_cmd_buffer_resolve_subpass_fs(struct radv_cmd_buffer *cmd_buffer)
                                        RADV_CMD_FLAG_INV_GLOBAL_L2 |
                                        RADV_CMD_FLAG_INV_VMEM_L1;
 
+       radv_decompress_resolve_subpass_src(cmd_buffer);
+
        for (uint32_t i = 0; i < subpass->color_count; ++i) {
                VkAttachmentReference src_att = subpass->color_attachments[i];
                VkAttachmentReference dest_att = subpass->resolve_attachments[i];
@@ -631,16 +621,6 @@ radv_cmd_buffer_resolve_subpass_fs(struct radv_cmd_buffer *cmd_buffer)
                struct radv_image_view *dest_iview = cmd_buffer->state.framebuffer->attachments[dest_att.attachment].attachment;
                struct radv_image_view *src_iview = cmd_buffer->state.framebuffer->attachments[src_att.attachment].attachment;
 
-               {
-                       VkImageSubresourceRange range;
-                       range.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
-                       range.baseMipLevel = 0;
-                       range.levelCount = 1;
-                       range.baseArrayLayer = 0;
-                       range.layerCount = 1;
-                       radv_fast_clear_flush_image_inplace(cmd_buffer, src_iview->image, &range);
-               }
-
                struct radv_subpass resolve_subpass = {
                        .color_count = 1,
                        .color_attachments = (VkAttachmentReference[]) { dest_att },