Support vulkan surface formats for Android.

gpu/vulkan/vulkan_surface.cc

 // Copyright (c) 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gpu/vulkan/vulkan_surface.h"
 
 #include <vulkan/vulkan.h>
 
 #include "base/macros.h"
 #include "gpu/vulkan/vulkan_command_buffer.h"
 #include "gpu/vulkan/vulkan_device_queue.h"
 #include "gpu/vulkan/vulkan_implementation.h"
 #include "gpu/vulkan/vulkan_platform.h"
 #include "gpu/vulkan/vulkan_swap_chain.h"
 
 #if defined(USE_X11)
 #include "ui/gfx/x/x11_types.h"
 #endif  // defined(USE_X11)
 
 namespace gpu {
 
 namespace {
 const VkFormat kNativeVkFormat[] = {
     VK_FORMAT_B8G8R8A8_UNORM,       // FORMAT_BGRA8888,
+    VK_FORMAT_R8G8B8A8_UNORM,       // FORMAT_RGBA8888,
     VK_FORMAT_R5G6B5_UNORM_PACK16,  // FORMAT_RGB565,
 };
-static_assert(arraysize(kNativeVkFormat) == VulkanSurface::NUM_SURFACE_FORMATS,
+static_assert(arraysize(kNativeVkFormat) ==
+                  VulkanSurface::NUM_SURFACE_FORMATS + 1,
               "Array size for kNativeVkFormat must match surface formats.");
 
 }  // namespace
 
 class VulkanWSISurface : public VulkanSurface {
  public:
   explicit VulkanWSISurface(gfx::AcceleratedWidget window) : window_(window) {}
 
   ~VulkanWSISurface() override {
     DCHECK_EQ(static_cast<VkSurfaceKHR>(VK_NULL_HANDLE), surface_);
@@ skipping 49 matching lines @@
     std::vector<VkSurfaceFormatKHR> formats(format_count);
     result = vkGetPhysicalDeviceSurfaceFormatsKHR(
         device_queue_->GetVulkanPhysicalDevice(), surface_, &format_count,
         formats.data());
     if (VK_SUCCESS != result) {
       DLOG(ERROR) << "vkGetPhysicalDeviceSurfaceFormatsKHR() failed: "
                   << result;
       return false;
     }
 
     const VkFormat preferred_format = kNativeVkFormat[format];

[piman, 2016/05/10 19:52:44]

nit: this is not used anymore, please remove.

[sohanjg, 2016/05/11 09:25:50]

Acknowledged.

+
+    std::vector<VkFormat> preferred_formats(VulkanSurface::NUM_SURFACE_FORMATS);
+    if (format == VulkanSurface::Format::FORMAT_RGBA_32) {
+      preferred_formats[0] = kNativeVkFormat[format];
+      preferred_formats[1] = kNativeVkFormat[format + 1];
+    } else if (format == VulkanSurface::Format::FORMAT_RGB_16) {
+      preferred_formats[0] = kNativeVkFormat[format + 1];
+    }

[piman, 2016/05/10 19:52:44]

I think we could instead have 2 arrays, kPreferredVkFormats32 (with
VK_FORMAT_B8G8R8A8_UNORM and VK_FORMAT_R8G8B8A8_UNORM) and kPreferredVkFormats16
(with VK_FORMAT_R5G6B5_UNORM_PACK16), and we could pick here:
const VkFormat* preferred_formats = (format == FORMAT_RGBA_32) ?
kPreferredVkFormats32 : kPreferredVkFormats16;

[sohanjg, 2016/05/11 09:25:50]

Done.

+
     if (formats.size() == 1 && VK_FORMAT_UNDEFINED == formats[0].format) {
-      surface_format_.format = preferred_format;
+      surface_format_.format = preferred_formats[0];
       surface_format_.colorSpace = VK_COLORSPACE_SRGB_NONLINEAR_KHR;
     } else {
       bool format_set = false;
       for (VkSurfaceFormatKHR supported_format : formats) {
-        if (supported_format.format == preferred_format) {
-          surface_format_ = supported_format;
-          surface_format_.colorSpace = VK_COLORSPACE_SRGB_NONLINEAR_KHR;
-          format_set = true;
-          break;
+        for (VkFormat fmt : preferred_formats) {
+          if (supported_format.format == fmt) {
+            surface_format_ = supported_format;
+            surface_format_.colorSpace = VK_COLORSPACE_SRGB_NONLINEAR_KHR;
+            format_set = true;
+            break;
+          }
         }
       }
       if (!format_set) {
         DLOG(ERROR) << "Format not supported.";
         return false;
       }
     }
 
     // Get Surface Information.
     VkSurfaceCapabilitiesKHR surface_caps;
@@ skipping 43 matching lines @@
 
 // static
 std::unique_ptr<VulkanSurface> VulkanSurface::CreateViewSurface(
     gfx::AcceleratedWidget window) {
   return std::unique_ptr<VulkanSurface>(new VulkanWSISurface(window));
 }
 
 VulkanSurface::VulkanSurface() {}
 
 }  // namespace gpu