vulkan: Change fallback formats

Always fall back to a format that isn't swizzled.

That way it can be used as a target format for rendering.

diff --git a/gsk/vulkan/gskvulkanimage.c b/gsk/vulkan/gskvulkanimage.c
index c9eff3f501392e9ca04bcca2deb83a06dd6ff0f3..80a0502094410939fde0c9cecf2648b7afa8e09c 100644 (file)
--- a/gsk/vulkan/gskvulkanimage.c
+++ b/gsk/vulkan/gskvulkanimage.c
@@ -262,53 +262,53 @@ gsk_memory_format_get_fallback (GdkMemoryFormat format)
   switch (format)
     {
     case GDK_MEMORY_B8G8R8A8_PREMULTIPLIED:
-      return GDK_MEMORY_R8G8B8A8_PREMULTIPLIED;
     case GDK_MEMORY_A8R8G8B8_PREMULTIPLIED:
-      return GDK_MEMORY_R8G8B8A8_PREMULTIPLIED;
     case GDK_MEMORY_R8G8B8A8_PREMULTIPLIED:
-      return GDK_MEMORY_R8G8B8A8_PREMULTIPLIED;
     case GDK_MEMORY_B8G8R8A8:
-      return GDK_MEMORY_B8G8R8A8_PREMULTIPLIED;
     case GDK_MEMORY_A8R8G8B8:
-      return GDK_MEMORY_A8R8G8B8_PREMULTIPLIED;
     case GDK_MEMORY_R8G8B8A8:
-      return GDK_MEMORY_R8G8B8A8_PREMULTIPLIED;
     case GDK_MEMORY_A8B8G8R8:
-      return GDK_MEMORY_R8G8B8A8_PREMULTIPLIED;
     case GDK_MEMORY_R8G8B8:
       return GDK_MEMORY_R8G8B8A8_PREMULTIPLIED;
+
     case GDK_MEMORY_B8G8R8:
       return GDK_MEMORY_R8G8B8;
-    case GDK_MEMORY_R16G16B16:
-      return GDK_MEMORY_R16G16B16A16_PREMULTIPLIED;
+
     case GDK_MEMORY_R16G16B16A16_PREMULTIPLIED:
       return GDK_MEMORY_R32G32B32A32_FLOAT_PREMULTIPLIED;
+
+    case GDK_MEMORY_R16G16B16:
     case GDK_MEMORY_R16G16B16A16:
       return GDK_MEMORY_R16G16B16A16_PREMULTIPLIED;
-    case GDK_MEMORY_R16G16B16_FLOAT:
-      return GDK_MEMORY_R16G16B16A16_FLOAT_PREMULTIPLIED;
+
     case GDK_MEMORY_R16G16B16A16_FLOAT_PREMULTIPLIED:
       return GDK_MEMORY_R32G32B32A32_FLOAT_PREMULTIPLIED;
+
+    case GDK_MEMORY_R16G16B16_FLOAT:
     case GDK_MEMORY_R16G16B16A16_FLOAT:
       return GDK_MEMORY_R16G16B16A16_FLOAT_PREMULTIPLIED;
-    case GDK_MEMORY_R32G32B32_FLOAT:
-      return GDK_MEMORY_R32G32B32A32_FLOAT_PREMULTIPLIED;
+
     case GDK_MEMORY_R32G32B32A32_FLOAT_PREMULTIPLIED:
       return GDK_MEMORY_R8G8B8A8_PREMULTIPLIED;
+
+    case GDK_MEMORY_R32G32B32_FLOAT:
     case  GDK_MEMORY_R32G32B32A32_FLOAT:
       return GDK_MEMORY_R32G32B32A32_FLOAT_PREMULTIPLIED;
+
     case GDK_MEMORY_G8A8_PREMULTIPLIED:
-      return GDK_MEMORY_R8G8B8A8_PREMULTIPLIED;
     case GDK_MEMORY_G8A8:
-      return GDK_MEMORY_G8A8_PREMULTIPLIED;
+      return GDK_MEMORY_R8G8B8A8_PREMULTIPLIED;
+
     case GDK_MEMORY_G8:
       return GDK_MEMORY_R8G8B8;
+
     case GDK_MEMORY_G16A16_PREMULTIPLIED:
-      return GDK_MEMORY_R16G16B16A16_PREMULTIPLIED;
     case GDK_MEMORY_G16A16:
-      return GDK_MEMORY_G16A16_PREMULTIPLIED;
+      return GDK_MEMORY_R16G16B16A16_PREMULTIPLIED;
+
     case GDK_MEMORY_G16:
       return GDK_MEMORY_R16G16B16;
+
     case GDK_MEMORY_A8:
       return GDK_MEMORY_R8G8B8A8_PREMULTIPLIED;
     case GDK_MEMORY_A16: