/* 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++) {
}
}
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);
}
{
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++) {
/**
slice_array++;
}
}
- radv_meta_end_bufimage(cmd_buffer, &saved_state);
+ radv_meta_restore_compute(&saved_state, cmd_buffer, 12);
}
void radv_CmdCopyImageToBuffer(
* 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 ==
}
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);
}
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,