radv: add surface helper variable in radv_GetImageSubresourceLayout

[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 54dadde788d9fb0fd27ac636f08fbe0caf7864eb..411d0b897459761c0a99ac86542e47a2ba61c6d5 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);
        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++) {
 
@@ -337,11 +337,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);
        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 ==
@@ -447,8 +447,8 @@ void radv_blit_to_prime_linear(struct radv_cmd_buffer *cmd_buffer,
        image_copy.dstSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
        image_copy.dstSubresource.layerCount = 1;
 
-       image_copy.extent.width = image->extent.width;
-       image_copy.extent.height = image->extent.height;
+       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,