Android swapchain format selection prefer to use srgb format

Android to use similar swapchain format and dimension as Windows

Author: thisisjimmyfb

util/test/demos/android/android_window.cpp

@@ -32,6 +32,9 @@ AndroidWindow::AndroidWindow(int width, int height, const char *title) : Graphic
 {
   window = android_state->window;
   TEST_LOG("android window %p", window);
+
+  if(window)
+    ANativeWindow_setBuffersGeometry(window, width, height, AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM);
 }
 
 AndroidWindow::~AndroidWindow()

util/test/demos/vk/vk_test.cpp

@@ -1541,7 +1541,8 @@ bool VulkanWindow::CreateSwapchain()
 
   for(const VkSurfaceFormatKHR &f : formats)
   {
-    if(f.format == VK_FORMAT_B8G8R8A8_SRGB && f.colorSpace == VK_COLOR_SPACE_SRGB_NONLINEAR_KHR)
+    if((f.format == VK_FORMAT_B8G8R8A8_SRGB || f.format == VK_FORMAT_R8G8B8A8_SRGB) &&
+       f.colorSpace == VK_COLOR_SPACE_SRGB_NONLINEAR_KHR)
     {
       surfaceFormat = f;
       break;