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[] = {

[piman, 2016/05/11 17:11:56]

This is not used anymore, please remove.

[sohanjg, 2016/05/12 06:34:30]

Done.

     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,
+
+const VkFormat kPreferredVkFormats32[] = {
+    VK_FORMAT_B8G8R8A8_UNORM,  // FORMAT_BGRA8888,
+    VK_FORMAT_R8G8B8A8_UNORM,  // FORMAT_RGBA8888,
+};
+
+const VkFormat kPreferredVkFormats16[] = {
+    VK_FORMAT_R5G6B5_UNORM_PACK16,  // FORMAT_RGB565,
+};
+
+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];
+    const VkFormat* preferred_formats = (format == FORMAT_RGBA_32)
+                                            ? kPreferredVkFormats32
+                                            : kPreferredVkFormats16;
+
     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;
+        uint counter = 0;

[piman, 2016/05/11 17:11:56]

nit: uint->unsigned int

[sohanjg, 2016/05/12 06:34:30]

Done.

+        uint size = (format == FORMAT_RGBA_32)

[piman, 2016/05/11 17:11:56]

nit: uint->unsigned int. This can be hoisted out of the loop (next to the
preferred_formats definition)

[sohanjg, 2016/05/12 06:34:30]

Done.

+                        ? arraysize(kPreferredVkFormats32)
+                        : arraysize(kPreferredVkFormats16);
+        while (counter < size && format_set == false) {
+          if (supported_format.format == *(preferred_formats + counter)) {

[piman, 2016/05/11 17:11:56]

nit: *(preferred_formats + counter) -> preferred_formats[counter]

[sohanjg, 2016/05/12 06:34:30]

Done.

+            surface_format_ = supported_format;
+            surface_format_.colorSpace = VK_COLORSPACE_SRGB_NONLINEAR_KHR;
+            format_set = true;
+          }
+          counter++;
+        }
+        if (format_set)
           break;
-        }
       }
       if (!format_set) {
         DLOG(ERROR) << "Format not supported.";
         return false;
       }
     }
 
     // Get Surface Information.
     VkSurfaceCapabilitiesKHR surface_caps;
     result = vkGetPhysicalDeviceSurfaceCapabilitiesKHR(
@@ skipping 42 matching lines @@
 
 // static
 std::unique_ptr<VulkanSurface> VulkanSurface::CreateViewSurface(
     gfx::AcceleratedWidget window) {
   return std::unique_ptr<VulkanSurface>(new VulkanWSISurface(window));
 }
 
 VulkanSurface::VulkanSurface() {}
 
 }  // namespace gpu