vulkan: merge vulkan_util and vulkan_posix_util

This CL git rid of Posix suffix from ImportVkSemaphoreHandlePosix and
GetVkSemaphoreHandlePosix, and rename gpu/vulkan/vulkan_posix_util.cc
to gpu/vulkan/vulkan_util_posix.cc. gpu/vulkan/vulkan_util_posix.h is
removed.

Bug: 1067709
Change-Id: I49551052e2c20b4a7435f020c3f9ae0ec99e7821
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2135815
Commit-Queue: Peng Huang <penghuang@chromium.org>
Commit-Queue: Daniele Castagna <dcastagna@chromium.org>
Auto-Submit: Peng Huang <penghuang@chromium.org>
Reviewed-by: Daniele Castagna <dcastagna@chromium.org>
Cr-Commit-Position: refs/heads/master@{#756386}

gpu/vulkan/BUILD.gn

@@ -80,8 +80,7 @@ if (enable_vulkan) {
     if (is_posix) {
       sources += [
         "vulkan_image_linux.cc",
-        "vulkan_posix_util.cc",
-        "vulkan_posix_util.h",
+        "vulkan_util_posix.cc",
       ]
     }
 

gpu/vulkan/android/vulkan_implementation_android.cc

@@ -13,7 +13,6 @@
 #include "gpu/vulkan/vulkan_function_pointers.h"
 #include "gpu/vulkan/vulkan_image.h"
 #include "gpu/vulkan/vulkan_instance.h"
-#include "gpu/vulkan/vulkan_posix_util.h"
 #include "gpu/vulkan/vulkan_surface.h"
 #include "gpu/vulkan/vulkan_util.h"
 #include "ui/gfx/gpu_fence.h"
@@ -121,7 +120,7 @@ VkSemaphore VulkanImplementationAndroid::CreateExternalSemaphore(
 VkSemaphore VulkanImplementationAndroid::ImportSemaphoreHandle(
     VkDevice vk_device,
     SemaphoreHandle sync_handle) {
-  return ImportVkSemaphoreHandlePosix(vk_device, std::move(sync_handle));
+  return ImportVkSemaphoreHandle(vk_device, std::move(sync_handle));
 }
 
 SemaphoreHandle VulkanImplementationAndroid::GetSemaphoreHandle(
@@ -129,8 +128,8 @@ SemaphoreHandle VulkanImplementationAndroid::GetSemaphoreHandle(
     VkSemaphore vk_semaphore) {
   // VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT specifies a POSIX file
   // descriptor handle to a Linux Sync File or Android Fence object.
-  return GetVkSemaphoreHandlePosix(
-      vk_device, vk_semaphore, VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT);
+  return GetVkSemaphoreHandle(vk_device, vk_semaphore,
+                              VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT);
 }
 
 VkExternalMemoryHandleTypeFlagBits

gpu/vulkan/vulkan_posix_util.h

-// Copyright 2019 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.
-//
-// This file contains helpers used by VulkanImplementation's on POSIX platforms
-// to import/export Vulkan objects to POSIX file descriptors. They should not
-// be used directly except in VulkanImplementation children.
-
-#ifndef GPU_VULKAN_VULKAN_POSIX_UTIL_H_
-#define GPU_VULKAN_VULKAN_POSIX_UTIL_H_
-
-#include <vulkan/vulkan.h>
-
-#include "gpu/vulkan/semaphore_handle.h"
-#include "gpu/vulkan/vulkan_export.h"
-
-namespace gpu {
-
-VULKAN_EXPORT VkSemaphore ImportVkSemaphoreHandlePosix(VkDevice vk_device,
-                                                       SemaphoreHandle handle);
-VULKAN_EXPORT SemaphoreHandle
-GetVkSemaphoreHandlePosix(VkDevice vk_device,
-                          VkSemaphore vk_semaphore,
-                          VkExternalSemaphoreHandleTypeFlagBits handle_type);
-
-}  // namespace gpu
-
-#endif  // GPU_VULKAN_VULKAN_POSIX_UTIL_H_
\ No newline at end of file

gpu/vulkan/vulkan_util.h

@@ -13,6 +13,7 @@
 #include <vector>
 
 #include "base/containers/span.h"
+#include "gpu/vulkan/semaphore_handle.h"
 #include "gpu/vulkan/vulkan_export.h"
 
 namespace gpu {
@@ -53,6 +54,16 @@ VULKAN_EXPORT VkSemaphore
 CreateExternalVkSemaphore(VkDevice vk_device,
                           VkExternalSemaphoreHandleTypeFlags handle_types);
 
+// Imports a semaphore from a handle.
+VULKAN_EXPORT VkSemaphore ImportVkSemaphoreHandle(VkDevice vk_device,
+                                                  SemaphoreHandle handle);
+
+// Gets a handle from a semaphore
+VULKAN_EXPORT SemaphoreHandle
+GetVkSemaphoreHandle(VkDevice vk_device,
+                     VkSemaphore vk_semaphore,
+                     VkExternalSemaphoreHandleTypeFlagBits handle_type);
+
 }  // namespace gpu
 
 #endif  // GPU_VULKAN_VULKAN_UTIL_H_

gpu/vulkan/vulkan_posix_util.cc → gpu/vulkan/vulkan_util_posix.cc

@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "gpu/vulkan/vulkan_posix_util.h"
+#include "gpu/vulkan/vulkan_util.h"
 
 #include "gpu/vulkan/vulkan_function_pointers.h"
 
 namespace gpu {
 
-VkSemaphore ImportVkSemaphoreHandlePosix(VkDevice vk_device,
-                                         SemaphoreHandle handle) {
+VkSemaphore ImportVkSemaphoreHandle(VkDevice vk_device,
+                                    SemaphoreHandle handle) {
   auto handle_type = handle.vk_handle_type();
   if (!handle.is_valid() ||
       (handle_type != VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT &&
@@ -44,7 +44,7 @@ VkSemaphore ImportVkSemaphoreHandlePosix(VkDevice vk_device,
   return semaphore;
 }
 
-SemaphoreHandle GetVkSemaphoreHandlePosix(
+SemaphoreHandle GetVkSemaphoreHandle(
     VkDevice vk_device,
     VkSemaphore vk_semaphore,
     VkExternalSemaphoreHandleTypeFlagBits handle_type) {

gpu/vulkan/x/vulkan_implementation_x11.cc

@@ -13,7 +13,6 @@
 #include "gpu/vulkan/vulkan_function_pointers.h"
 #include "gpu/vulkan/vulkan_image.h"
 #include "gpu/vulkan/vulkan_instance.h"
-#include "gpu/vulkan/vulkan_posix_util.h"
 #include "gpu/vulkan/vulkan_surface.h"
 #include "gpu/vulkan/vulkan_util.h"
 #include "gpu/vulkan/x/vulkan_surface_x11.h"
@@ -186,14 +185,14 @@ VkSemaphore VulkanImplementationX11::CreateExternalSemaphore(
 VkSemaphore VulkanImplementationX11::ImportSemaphoreHandle(
     VkDevice vk_device,
     SemaphoreHandle sync_handle) {
-  return ImportVkSemaphoreHandlePosix(vk_device, std::move(sync_handle));
+  return ImportVkSemaphoreHandle(vk_device, std::move(sync_handle));
 }
 
 SemaphoreHandle VulkanImplementationX11::GetSemaphoreHandle(
     VkDevice vk_device,
     VkSemaphore vk_semaphore) {
-  return GetVkSemaphoreHandlePosix(
-      vk_device, vk_semaphore, VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT);
+  return GetVkSemaphoreHandle(vk_device, vk_semaphore,
+                              VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT);
 }
 
 VkExternalMemoryHandleTypeFlagBits

ui/ozone/platform/drm/gpu/vulkan_implementation_gbm.cc

@@ -11,7 +11,6 @@
 #include "gpu/vulkan/vulkan_function_pointers.h"
 #include "gpu/vulkan/vulkan_image.h"
 #include "gpu/vulkan/vulkan_instance.h"
-#include "gpu/vulkan/vulkan_posix_util.h"
 #include "gpu/vulkan/vulkan_surface.h"
 #include "gpu/vulkan/vulkan_util.h"
 #include "ui/gfx/gpu_fence.h"
@@ -149,13 +148,13 @@ VkSemaphore VulkanImplementationGbm::CreateExternalSemaphore(
 VkSemaphore VulkanImplementationGbm::ImportSemaphoreHandle(
     VkDevice vk_device,
     gpu::SemaphoreHandle sync_handle) {
-  return gpu::ImportVkSemaphoreHandlePosix(vk_device, std::move(sync_handle));
+  return gpu::ImportVkSemaphoreHandle(vk_device, std::move(sync_handle));
 }
 
 gpu::SemaphoreHandle VulkanImplementationGbm::GetSemaphoreHandle(
     VkDevice vk_device,
     VkSemaphore vk_semaphore) {
-  return gpu::GetVkSemaphoreHandlePosix(
+  return gpu::GetVkSemaphoreHandle(
       vk_device, vk_semaphore, VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT);
 }