vulkan: Remove gsk_vulkan_image_new_for_framebuffer()

Use gsk_vulkan_image_new_for_offscreen() instead, it does the same thing
pretty much.

diff --git a/gsk/vulkan/gskvulkanimage.c b/gsk/vulkan/gskvulkanimage.c
index 42bb3ff653f4393a2324d38c3a88a77c1835f4fc..d289f7834f653970a0f5741e1875cf30818e96e0 100644 (file)
--- a/gsk/vulkan/gskvulkanimage.c
+++ b/gsk/vulkan/gskvulkanimage.c
@@ -744,26 +744,6 @@ gsk_vulkan_image_new_for_swapchain (GdkVulkanContext *context,
   return self;
 }
 
-GskVulkanImage *
-gsk_vulkan_image_new_for_framebuffer (GdkVulkanContext *context,
-                                      gsize             width,
-                                      gsize             height)
-{
-  GskVulkanImage *self;
-
-  self = gsk_vulkan_image_new (context,
-                               GDK_MEMORY_DEFAULT,
-                               width,
-                               height,
-                               VK_IMAGE_TILING_OPTIMAL,
-                               VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT,
-                               VK_IMAGE_LAYOUT_UNDEFINED,
-                               VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT,
-                               VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT);
-
-  return self;
-}
-
 GskVulkanImage *
 gsk_vulkan_image_new_for_atlas (GdkVulkanContext *context,
                                 gsize             width,

diff --git a/gsk/vulkan/gskvulkanimageprivate.h b/gsk/vulkan/gskvulkanimageprivate.h
index 51aae186de8318d6c61530dd7ef0467d959370d9..cb87e93bdb274be348b09caf55593eba1d0bfa44 100644 (file)
--- a/gsk/vulkan/gskvulkanimageprivate.h
+++ b/gsk/vulkan/gskvulkanimageprivate.h
@@ -40,9 +40,6 @@ void                    gsk_vulkan_image_upload_regions                 (GskVulk
                                                                          GskVulkanUploader      *uploader,
                                                                          guint                   num_regions,
                                                                          GskImageRegion         *regions);
-GskVulkanImage *        gsk_vulkan_image_new_for_framebuffer            (GdkVulkanContext       *context,
-                                                                         gsize                   width,
-                                                                         gsize                   height);
 GskVulkanImage *        gsk_vulkan_image_new_for_atlas                  (GdkVulkanContext       *context,
                                                                          gsize                   width,
                                                                          gsize                   height);

diff --git a/gsk/vulkan/gskvulkanrenderer.c b/gsk/vulkan/gskvulkanrenderer.c
index 0a495e8679cbcac951baa040f879fe5ad10de03f..a163e25350ef657a76ad76e7a0d18ea2e4c21596 100644 (file)
--- a/gsk/vulkan/gskvulkanrenderer.c
+++ b/gsk/vulkan/gskvulkanrenderer.c
@@ -284,9 +284,9 @@ gsk_vulkan_renderer_render_texture (GskRenderer           *renderer,
                                          viewport->origin.y,
                                          ceil (viewport->size.width),
                                          ceil (viewport->size.height));
-  image = gsk_vulkan_image_new_for_framebuffer (self->vulkan,
-                                                rounded_viewport.size.width,
-                                                rounded_viewport.size.height);
+  image = gsk_vulkan_image_new_for_offscreen (self->vulkan,
+                                              rounded_viewport.size.width,
+                                              rounded_viewport.size.height);
 
   gsk_vulkan_render_reset (render, image, &rounded_viewport, NULL);
   gsk_vulkan_render_add_node (render, root);