anv: Delete meta_blit2d

[mesa.git] / src / intel / vulkan / anv_meta_resolve.c

diff --git a/src/intel/vulkan/anv_meta_resolve.c b/src/intel/vulkan/anv_meta_resolve.c
index 9efe6f7d9864d0e4ea4f805ff1375a13d469cb68..dd2f768577dd27761b25deabfc7ca41c5955a0c7 100644 (file)
--- a/src/intel/vulkan/anv_meta_resolve.c
+++ b/src/intel/vulkan/anv_meta_resolve.c
@@ -42,9 +42,6 @@ meta_resolve_save(struct anv_meta_saved_state *saved_state,
                   struct anv_cmd_buffer *cmd_buffer)
 {
    anv_meta_save(saved_state, cmd_buffer, 0);
-
-   cmd_buffer->state.dynamic.viewport.count = 0;
-   cmd_buffer->state.dynamic.scissor.count = 0;
 }
 
 static void
@@ -343,7 +340,6 @@ create_pipeline(struct anv_device *device,
       &(struct anv_graphics_pipeline_create_info) {
          .color_attachment_count = -1,
          .use_repclear = false,
-         .disable_scissor = true,
          .disable_vs = true,
          .use_rectlist = true
       },
@@ -721,7 +717,7 @@ void anv_CmdResolveImage(
                .sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO,
                .image = src_image_h,
                .viewType = anv_meta_get_view_type(src_image),
-               .format = src_image->format->vk_format,
+               .format = src_image->vk_format,
                .subresourceRange = {
                   .aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
                   .baseMipLevel = region->srcSubresource.mipLevel,
@@ -738,7 +734,7 @@ void anv_CmdResolveImage(
                .sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO,
                .image = dest_image_h,
                .viewType = anv_meta_get_view_type(dest_image),
-               .format = dest_image->format->vk_format,
+               .format = dest_image->vk_format,
                .subresourceRange = {
                   .aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
                   .baseMipLevel = region->dstSubresource.mipLevel,