Tolerate empty support format lists.

io7m-com · Dec 17, 2024 · f99d34a · f99d34a
1 parent 421e200
commit f99d34a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/...ado.lwjgl/src/main/java/com/io7m/jcoronado/lwjgl/internal/VulkanLWJGLExtKHRSwapChain.java b/...ado.lwjgl/src/main/java/com/io7m/jcoronado/lwjgl/internal/VulkanLWJGLExtKHRSwapChain.java
@@ -207,7 +207,7 @@ private static List<VulkanImageType> images(
       .collect(Collectors.toList());
   }
 
-  private VulkanSwapChainAcquisitionResultType acquireImage(
+  private static VulkanSwapChainAcquisitionResultType acquireImage(
     final VulkanLWJGLKHRSwapChain chain,
     final long timeout,
     final VulkanSemaphoreBinaryType semaphore,
@@ -467,7 +467,7 @@ public VulkanSwapChainAcquisitionResultType acquireImageWithSemaphore(
       throws VulkanException
     {
       Objects.requireNonNull(semaphore, "semaphore");
-      return this.extension.acquireImage(this, timeout, semaphore, null);
+      return acquireImage(this, timeout, semaphore, null);
     }
 
     @Override
@@ -477,7 +477,7 @@ public VulkanSwapChainAcquisitionResultType acquireImageWithFence(
       throws VulkanException
     {
       Objects.requireNonNull(fence, "fence");
-      return this.extension.acquireImage(this, timeout, null, fence);
+      return acquireImage(this, timeout, null, fence);
     }
 
     @Override
@@ -489,7 +489,7 @@ public VulkanSwapChainAcquisitionResultType acquireImageWithSemaphoreAndFence(
     {
       Objects.requireNonNull(semaphore, "semaphore");
       Objects.requireNonNull(fence, "fence");
-      return this.extension.acquireImage(this, timeout, semaphore, fence);
+      return acquireImage(this, timeout, semaphore, fence);
     }
   }
 }
diff --git a/...lity.swapchain/src/main/java/com/io7m/jcoronado/utility/swapchain/JCSwapchainManager.java b/...lity.swapchain/src/main/java/com/io7m/jcoronado/utility/swapchain/JCSwapchainManager.java
@@ -38,6 +38,7 @@
 import com.io7m.jcoronado.extensions.khr_surface.api.VulkanExtKHRSurfaceType;
 import com.io7m.jcoronado.extensions.khr_surface.api.VulkanSurfaceCapabilitiesKHR;
 import com.io7m.jcoronado.extensions.khr_surface.api.VulkanSurfaceFormatKHR;
+import com.io7m.jcoronado.extensions.khr_swapchain.api.VulkanColorSpaceKHR;
 import com.io7m.jcoronado.extensions.khr_swapchain.api.VulkanExtKHRSwapChainType;
 import com.io7m.jcoronado.extensions.khr_swapchain.api.VulkanPresentInfoKHR;
 import com.io7m.jcoronado.extensions.khr_swapchain.api.VulkanPresentModeKHR;
@@ -657,9 +658,19 @@ private VulkanSurfaceFormatKHR pickSurfaceFormat()
 
     /*
      * None of our preferred formats were supported (or we didn't claim to
-     * prefer any). Use the first supported format.
+     * prefer any). The spec says that at least one format must be returned,
+     * but implementations have been seen in the wild that return an empty
+     * list. For those implementations, the assumption is that any RGBA
+     * format mandated by the spec as renderable can be used.
      */
 
+    if (availableList.isEmpty()) {
+      return VulkanSurfaceFormatKHR.of(
+        VulkanFormat.VK_FORMAT_B8G8R8A8_UNORM,
+        VulkanColorSpaceKHR.VK_COLOR_SPACE_SRGB_NONLINEAR_KHR
+      );
+    }
+
     return availableList.get(0);
   }