vulkan: fixes for copying framebuffer to RAM

panda/src/vulkandisplay/vulkanGraphicsBuffer.cxx

@@ -280,7 +280,7 @@ open_buffer() {
     {16,  5,  6,  5,  0, false, VK_FORMAT_R5G6B5_UNORM_PACK16},
     {15,  5,  5,  5,  1, false, VK_FORMAT_A1R5G5B5_UNORM_PACK16},
     {16, 16,  0,  0,  0,  true, VK_FORMAT_R16_SFLOAT},
-    {24,  8,  8,  8,  8, false, VK_FORMAT_R8G8B8A8_UNORM},
+    {24,  8,  8,  8,  8, false, VK_FORMAT_B8G8R8A8_UNORM},
     {32, 16, 16,  0,  0, false, VK_FORMAT_R16G16_SFLOAT},
     {30, 10, 10, 10,  2, false, VK_FORMAT_A2B10G10R10_UNORM_PACK32},
     {48, 16, 16, 16, 16,  true, VK_FORMAT_R16G16B16A16_SFLOAT},
@@ -294,7 +294,7 @@ open_buffer() {
 
   if (_fb_properties.get_srgb_color()) {
     // This the only sRGB format.  Deal with it.
-    _color_format = VK_FORMAT_R8G8B8A8_SRGB;
+    _color_format = VK_FORMAT_B8G8R8A8_SRGB;
     _fb_properties.set_rgba_bits(8, 8, 8, 8);
     _fb_properties.set_float_color(false);
 

panda/src/vulkandisplay/vulkanGraphicsStateGuardian.cxx

@@ -3250,11 +3250,26 @@ lookup_image_format(VkFormat vk_format, Texture::Format &format,
     type = Texture::T_float;
     format = Texture::F_r16;
     break;
+  case VK_FORMAT_R8G8B8_UNORM:
+  case VK_FORMAT_B8G8R8_UNORM:
+    type = Texture::T_unsigned_byte;
+    format = Texture::F_rgb8;
+    break;
+  case VK_FORMAT_R8G8B8_SRGB:
+  case VK_FORMAT_B8G8R8_SRGB:
+    type = Texture::T_unsigned_byte;
+    format = Texture::F_srgb;
+    break;
   case VK_FORMAT_R8G8B8A8_UNORM:
   case VK_FORMAT_B8G8R8A8_UNORM:
     type = Texture::T_unsigned_byte;
     format = Texture::F_rgba8;
     break;
+  case VK_FORMAT_R8G8B8A8_SRGB:
+  case VK_FORMAT_B8G8R8A8_SRGB:
+    type = Texture::T_unsigned_byte;
+    format = Texture::F_srgb_alpha;
+    break;
   case VK_FORMAT_R16G16_SFLOAT:
     type = Texture::T_float;
     format = Texture::F_rg16;