Ignore pre-rotation suboptimality

Author: artdeell

src/main/java/net/vulkanmod/vulkan/Renderer.java

@@ -258,13 +258,13 @@ public void beginFrame() {
             int vkResult = vkAcquireNextImageKHR(device, swapChain.getId(), VUtil.UINT64_MAX,
                                                  imageAvailableSemaphores.get(currentFrame), VK_NULL_HANDLE, pImageIndex);
 
-            if (vkResult == VK_SUBOPTIMAL_KHR || vkResult == VK_ERROR_OUT_OF_DATE_KHR || swapChainUpdate) {
+            if (swapChain.isActuallySuboptimal(vkResult) || vkResult == VK_ERROR_OUT_OF_DATE_KHR || swapChainUpdate) {
                 swapChainUpdate = true;
                 skipRendering = true;
                 beginFrame();
 
                 return;
-            } else if (vkResult != VK_SUCCESS) {
+            } else if (vkResult != VK_SUCCESS && vkResult != VK_SUBOPTIMAL_KHR) {
                 throw new RuntimeException("Cannot acquire next swap chain image: %s".formatted(VkResult.decode(vkResult)));
             }
 
@@ -347,10 +347,10 @@ private void submitFrame() {
 
             vkResult = vkQueuePresentKHR(DeviceManager.getPresentQueue().queue(), presentInfo);
 
-            if (vkResult == VK_ERROR_OUT_OF_DATE_KHR || vkResult == VK_SUBOPTIMAL_KHR || swapChainUpdate) {
+            if (vkResult == VK_ERROR_OUT_OF_DATE_KHR || swapChain.isActuallySuboptimal(vkResult) || swapChainUpdate) {
                 swapChainUpdate = true;
                 return;
-            } else if (vkResult != VK_SUCCESS) {
+            } else if (vkResult != VK_SUCCESS && vkResult != VK_SUBOPTIMAL_KHR) {
                 throw new RuntimeException("Failed to present rendered frame: %s".formatted(VkResult.decode(vkResult)));
             }
 

src/main/java/net/vulkanmod/vulkan/framebuffer/SwapChain.java

@@ -40,6 +40,7 @@ public class SwapChain extends Framebuffer {
     private VkExtent2D extent2D;
     public boolean isBGRAformat;
     private boolean vsync = false;
+    private boolean shouldPreRotate = false;
 
     private int[] glIds;
 
@@ -120,7 +121,11 @@ private void createSwapChain() {
                 createInfo.imageSharingMode(VK_SHARING_MODE_EXCLUSIVE);
             }
 
-            createInfo.preTransform(surfaceProperties.capabilities.currentTransform());
+            int surfaceTransform = surfaceProperties.capabilities.currentTransform();
+            shouldPreRotate = (surfaceTransform &
+                    (VK_SURFACE_TRANSFORM_ROTATE_90_BIT_KHR |VK_SURFACE_TRANSFORM_ROTATE_180_BIT_KHR | VK_SURFACE_TRANSFORM_ROTATE_270_BIT_KHR)) != 0;
+
+            createInfo.preTransform(VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR);
 
             int supportedCompositeAlpha = surfaceProperties.capabilities.supportedCompositeAlpha();
             if((supportedCompositeAlpha & VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR) != 0) {
@@ -352,6 +357,11 @@ private static int checkPresentMode(int... requestedModes) {
         }
     }
 
+    public boolean isActuallySuboptimal(int result) {
+        // Make android shut the fuck up about the stupid pre-rotation
+        return result == VK_SUBOPTIMAL_KHR && !shouldPreRotate;
+    }
+
     public boolean isVsync() {
         return this.vsync;
     }