radv: remove useless radv_meta_{begin,end}_XXX() helpers

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

diff --git a/src/amd/vulkan/radv_meta_copy.c b/src/amd/vulkan/radv_meta_copy.c
index 64e0ea8648f26182aa2fd73ac9190d7b4c0f1749..fdef37f39f0fafc6d7433d965b91e046fb87df4f 100644 (file)
--- a/src/amd/vulkan/radv_meta_copy.c
+++ b/src/amd/vulkan/radv_meta_copy.c
@@ -118,12 +118,12 @@ meta_copy_buffer_to_image(struct radv_cmd_buffer *cmd_buffer,
        /* The Vulkan 1.0 spec says "dstImage must have a sample count equal to
         * VK_SAMPLE_COUNT_1_BIT."
         */
-       assert(image->samples == 1);
+       assert(image->info.samples == 1);
 
        if (cs)
-               radv_meta_begin_bufimage(cmd_buffer, &saved_state.compute);
+               radv_meta_save_compute(&saved_state.compute, cmd_buffer, 12);
        else
-               radv_meta_save_graphics_reset_vport_scissor(&saved_state.gfx, cmd_buffer);
+               radv_meta_save_graphics_reset_vport_scissor_novertex(&saved_state.gfx, cmd_buffer);
 
        for (unsigned r = 0; r < regionCount; r++) {
 
@@ -169,6 +169,8 @@ meta_copy_buffer_to_image(struct radv_cmd_buffer *cmd_buffer,
                        .pitch = buf_extent_el.width,
                };
 
+               if (image->type == VK_IMAGE_TYPE_3D)
+                       img_bsurf.layer = img_offset_el.z;
                /* Loop through each 3D or array slice */
                unsigned num_slices_3d = img_extent_el.depth;
                unsigned num_slices_array = pRegions[r].imageSubresource.layerCount;
@@ -201,7 +203,7 @@ meta_copy_buffer_to_image(struct radv_cmd_buffer *cmd_buffer,
                }
        }
        if (cs)
-               radv_meta_end_bufimage(cmd_buffer, &saved_state.compute);
+               radv_meta_restore_compute(&saved_state.compute, cmd_buffer, 12);
        else
                radv_meta_restore(&saved_state.gfx, cmd_buffer);
 }
@@ -231,7 +233,8 @@ meta_copy_image_to_buffer(struct radv_cmd_buffer *cmd_buffer,
 {
        struct radv_meta_saved_compute_state saved_state;
 
-       radv_meta_begin_bufimage(cmd_buffer, &saved_state);
+       radv_meta_save_compute(&saved_state, cmd_buffer, 12);
+
        for (unsigned r = 0; r < regionCount; r++) {
 
                /**
@@ -276,6 +279,8 @@ meta_copy_image_to_buffer(struct radv_cmd_buffer *cmd_buffer,
                        .pitch = buf_extent_el.width,
                };
 
+               if (image->type == VK_IMAGE_TYPE_3D)
+                       img_info.layer = img_offset_el.z;
                /* Loop through each 3D or array slice */
                unsigned num_slices_3d = img_extent_el.depth;
                unsigned num_slices_array = pRegions[r].imageSubresource.layerCount;
@@ -299,7 +304,7 @@ meta_copy_image_to_buffer(struct radv_cmd_buffer *cmd_buffer,
                                slice_array++;
                }
        }
-       radv_meta_end_bufimage(cmd_buffer, &saved_state);
+       radv_meta_restore_compute(&saved_state, cmd_buffer, 12);
 }
 
 void radv_CmdCopyImageToBuffer(
@@ -333,11 +338,11 @@ meta_copy_image(struct radv_cmd_buffer *cmd_buffer,
         *    vkCmdCopyImage can be used to copy image data between multisample
         *    images, but both images must have the same number of samples.
         */
-       assert(src_image->samples == dest_image->samples);
+       assert(src_image->info.samples == dest_image->info.samples);
        if (cs)
-               radv_meta_begin_itoi(cmd_buffer, &saved_state.compute);
+               radv_meta_save_compute(&saved_state.compute, cmd_buffer, 16);
        else
-               radv_meta_save_graphics_reset_vport_scissor(&saved_state.gfx, cmd_buffer);
+               radv_meta_save_graphics_reset_vport_scissor_novertex(&saved_state.gfx, cmd_buffer);
 
        for (unsigned r = 0; r < regionCount; r++) {
                assert(pRegions[r].srcSubresource.aspectMask ==
@@ -369,7 +374,7 @@ meta_copy_image(struct radv_cmd_buffer *cmd_buffer,
                const VkOffset3D src_offset_el =
                        meta_region_offset_el(src_image, &pRegions[r].srcOffset);
                const VkExtent3D img_extent_el =
-                       meta_region_extent_el(src_image, &pRegions[r].extent);
+                       meta_region_extent_el(dest_image, &pRegions[r].extent);
 
                /* Start creating blit rect */
                struct radv_meta_blit2d_rect rect = {
@@ -377,6 +382,9 @@ meta_copy_image(struct radv_cmd_buffer *cmd_buffer,
                        .height = img_extent_el.height,
                };
 
+               if (dest_image->type == VK_IMAGE_TYPE_3D)
+                       b_dst.layer = dst_offset_el.z;
+
                /* Loop through each 3D or array slice */
                unsigned num_slices_3d = img_extent_el.depth;
                unsigned num_slices_array = pRegions[r].dstSubresource.layerCount;
@@ -406,7 +414,7 @@ meta_copy_image(struct radv_cmd_buffer *cmd_buffer,
        }
 
        if (cs)
-               radv_meta_end_itoi(cmd_buffer, &saved_state.compute);
+               radv_meta_restore_compute(&saved_state.compute, cmd_buffer, 16);
        else
                radv_meta_restore(&saved_state.gfx, cmd_buffer);
 }
@@ -427,3 +435,23 @@ void radv_CmdCopyImage(
        meta_copy_image(cmd_buffer, src_image, dest_image,
                        regionCount, pRegions);
 }
+
+void radv_blit_to_prime_linear(struct radv_cmd_buffer *cmd_buffer,
+                              struct radv_image *image,
+                              struct radv_image *linear_image)
+{
+       struct VkImageCopy image_copy = { 0 };
+
+       image_copy.srcSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+       image_copy.srcSubresource.layerCount = 1;
+
+       image_copy.dstSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+       image_copy.dstSubresource.layerCount = 1;
+
+       image_copy.extent.width = image->info.width;
+       image_copy.extent.height = image->info.height;
+       image_copy.extent.depth = 1;
+
+       meta_copy_image(cmd_buffer, image, linear_image,
+                       1, &image_copy);
+}