encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename Service Files in external_memory and external_semaphore 

This CL do a pure rename work as the base of External memory
service refactory.

Bug: dawn:1593
Change-Id: If9595e8d8be97f5eb725acff8891e0bd1baf8928
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/125480
Reviewed-by: Austin Eng <enga@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: Shaobo Yan <shaobo.yan@intel.com>
This commit is contained in:
Yan,Shaobo 2023-03-28 01:17:19 +00:00 committed by Dawn LUCI CQ
parent df714941d3
commit ef62a88f89
13 changed files with 36 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/dawn/native/BUILD.gn
View File

@ -700,33 +700,40 @@ source_set("sources") {
"vulkan/external_memory/MemoryService.h", "vulkan/external_memory/MemoryService.h",
"vulkan/external_semaphore/SemaphoreService.cpp", "vulkan/external_semaphore/SemaphoreService.cpp",
"vulkan/external_semaphore/SemaphoreService.h", "vulkan/external_semaphore/SemaphoreService.h",
"vulkan/external_semaphore/ServiceImplementation.cpp", "vulkan/external_semaphore/SemaphoreServiceImplementation.cpp",
"vulkan/external_semaphore/ServiceImplementation.h", "vulkan/external_semaphore/SemaphoreServiceImplementation.h",
] ]
if (is_android || is_linux || is_chromeos) { if (is_android || is_linux || is_chromeos) {
sources += [ sources += [
"vulkan/external_semaphore/ServiceImplementationFD.cpp", "vulkan/external_semaphore/SemaphoreServiceImplementationFD.cpp",
"vulkan/external_semaphore/ServiceImplementationFD.h", "vulkan/external_semaphore/SemaphoreServiceImplementationFD.h",
] ]
} else if (is_fuchsia) { } else if (is_fuchsia) {
sources += [ sources += [
"vulkan/external_semaphore/ServiceImplementationZirconHandle.cpp", "vulkan/external_semaphore/SemaphoreServiceImplementationZirconHandle.cpp",
"vulkan/external_semaphore/ServiceImplementationZirconHandle.h", "vulkan/external_semaphore/SemaphoreServiceImplementationZirconHandle.h",
] ]
} }
if (is_chromeos) { if (is_chromeos) {
sources += [ "vulkan/external_memory/MemoryServiceDmaBuf.cpp" ] sources +=
[ "vulkan/external_memory/MemoryServiceImplementationDmaBuf.cpp" ]
} else if (is_linux) { } else if (is_linux) {
sources += [ "vulkan/external_memory/MemoryServiceOpaqueFD.cpp" ] sources +=
[ "vulkan/external_memory/MemoryServiceImplementationOpaqueFD.cpp" ]
} else if (is_fuchsia) { } else if (is_fuchsia) {
sources += [ "vulkan/external_memory/MemoryServiceZirconHandle.cpp" ] sources += [
"vulkan/external_memory/MemoryServiceImplementationZirconHandle.cpp",
]
} else if (is_android) { } else if (is_android) {
sources += [ "vulkan/external_memory/MemoryServiceAHardwareBuffer.cpp" ] sources += [
"vulkan/external_memory/MemoryServiceImplementationAHardwareBuffer.cpp",
]
} else { } else {
sources += [ "vulkan/external_memory/MemoryServiceNull.cpp" ] sources += [ "vulkan/external_memory/MemoryServiceNull.cpp" ]
} }
if (build_with_chromium && is_fuchsia) { if (build_with_chromium && is_fuchsia) {
# Necessary to ensure that the Vulkan libraries will be in the # Necessary to ensure that the Vulkan libraries will be in the
# final Fuchsia package. # final Fuchsia package.

10
src/dawn/native/CMakeLists.txt
View File

@ -573,8 +573,8 @@ if (DAWN_ENABLE_VULKAN)
"vulkan/external_memory/MemoryService.h" "vulkan/external_memory/MemoryService.h"
"vulkan/external_semaphore/SemaphoreService.cpp" "vulkan/external_semaphore/SemaphoreService.cpp"
"vulkan/external_semaphore/SemaphoreService.h" "vulkan/external_semaphore/SemaphoreService.h"
"vulkan/external_semaphore/ServiceImplementation.cpp" "vulkan/external_semaphore/SemaphoreServiceImplementation.cpp"
"vulkan/external_semaphore/ServiceImplementation.h" "vulkan/external_semaphore/SemaphoreServiceImplementation.h"
) )
target_link_libraries(dawn_native PUBLIC Vulkan-Headers) target_link_libraries(dawn_native PUBLIC Vulkan-Headers)
@ -582,9 +582,9 @@ if (DAWN_ENABLE_VULKAN)
if (UNIX AND NOT APPLE) if (UNIX AND NOT APPLE)
target_sources(dawn_native PRIVATE target_sources(dawn_native PRIVATE
"vulkan/external_memory/MemoryServiceOpaqueFD.cpp" "vulkan/external_memory/MemoryServiceImplementationOpaqueFD.cpp"
"vulkan/external_semaphore/ServiceImplementationFD.cpp" "vulkan/external_semaphore/SemaphoreServiceImplementationFD.cpp"
"vulkan/external_semaphore/ServiceImplementationFD.h" "vulkan/external_semaphore/SemaphoreServiceImplementationFD.h"
) )
else() else()
target_sources(dawn_native PRIVATE target_sources(dawn_native PRIVATE

0
src/dawn/native/vulkan/external_memory/MemoryServiceAHardwareBuffer.cpp → src/dawn/native/vulkan/external_memory/MemoryServiceImplementationAHardwareBuffer.cpp
View File

0
src/dawn/native/vulkan/external_memory/MemoryServiceDmaBuf.cpp → src/dawn/native/vulkan/external_memory/MemoryServiceImplementationDmaBuf.cpp
View File

0
src/dawn/native/vulkan/external_memory/MemoryServiceOpaqueFD.cpp → src/dawn/native/vulkan/external_memory/MemoryServiceImplementationOpaqueFD.cpp
View File

0
src/dawn/native/vulkan/external_memory/MemoryServiceZirconHandle.cpp → src/dawn/native/vulkan/external_memory/MemoryServiceImplementationZirconHandle.cpp
View File

6
src/dawn/native/vulkan/external_semaphore/SemaphoreService.cpp
View File

@ -15,15 +15,15 @@
#include "dawn/native/vulkan/external_semaphore/SemaphoreService.h" #include "dawn/native/vulkan/external_semaphore/SemaphoreService.h"
#include "dawn/native/vulkan/VulkanFunctions.h" #include "dawn/native/vulkan/VulkanFunctions.h"
#include "dawn/native/vulkan/VulkanInfo.h" #include "dawn/native/vulkan/VulkanInfo.h"
#include "dawn/native/vulkan/external_semaphore/ServiceImplementation.h" #include "dawn/native/vulkan/external_semaphore/SemaphoreServiceImplementation.h"
#if DAWN_PLATFORM_IS(FUCHSIA) #if DAWN_PLATFORM_IS(FUCHSIA)
#include "dawn/native/vulkan/external_semaphore/ServiceImplementationZirconHandle.h" #include "dawn/native/vulkan/external_semaphore/SemaphoreServiceImplementationZirconHandle.h"
#endif // DAWN_PLATFORM_IS(FUCHSIA) #endif // DAWN_PLATFORM_IS(FUCHSIA)
// Android, ChromeOS and Linux // Android, ChromeOS and Linux
#if DAWN_PLATFORM_IS(LINUX) #if DAWN_PLATFORM_IS(LINUX)
#include "dawn/native/vulkan/external_semaphore/ServiceImplementationFD.h" #include "dawn/native/vulkan/external_semaphore/SemaphoreServiceImplementationFD.h"
#endif // DAWN_PLATFORM_IS(LINUX) #endif // DAWN_PLATFORM_IS(LINUX)
namespace dawn::native::vulkan::external_semaphore { namespace dawn::native::vulkan::external_semaphore {

2
src/dawn/native/vulkan/external_semaphore/ServiceImplementation.cpp → src/dawn/native/vulkan/external_semaphore/SemaphoreServiceImplementation.cpp
View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
#include "dawn/native/vulkan/external_semaphore/ServiceImplementation.h" #include "dawn/native/vulkan/external_semaphore/SemaphoreServiceImplementation.h"
namespace dawn::native::vulkan::external_semaphore { namespace dawn::native::vulkan::external_semaphore {

6
src/dawn/native/vulkan/external_semaphore/ServiceImplementation.h → src/dawn/native/vulkan/external_semaphore/SemaphoreServiceImplementation.h
View File

@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
#ifndef SRC_DAWN_NATIVE_VULKAN_EXTERNAL_SEMAPHORE_SERVICEIMPLEMENTATION_H_ #ifndef SRC_DAWN_NATIVE_VULKAN_EXTERNAL_SEMAPHORE_SEMAPHORESERVICEIMPLEMENTATION_H_
#define SRC_DAWN_NATIVE_VULKAN_EXTERNAL_SEMAPHORE_SERVICEIMPLEMENTATION_H_ #define SRC_DAWN_NATIVE_VULKAN_EXTERNAL_SEMAPHORE_SEMAPHORESERVICEIMPLEMENTATION_H_
#include "dawn/native/Error.h" #include "dawn/native/Error.h"
#include "dawn/native/vulkan/ExternalHandle.h" #include "dawn/native/vulkan/ExternalHandle.h"
@ -53,4 +53,4 @@ class ServiceImplementation {
} // namespace dawn::native::vulkan::external_semaphore } // namespace dawn::native::vulkan::external_semaphore
#endif // SRC_DAWN_NATIVE_VULKAN_EXTERNAL_SEMAPHORE_SERVICEIMPLEMENTATION_H_ #endif // SRC_DAWN_NATIVE_VULKAN_EXTERNAL_SEMAPHORE_SEMAPHORESERVICEIMPLEMENTATION_H_

4
src/dawn/native/vulkan/external_semaphore/ServiceImplementationFD.cpp → src/dawn/native/vulkan/external_semaphore/SemaphoreServiceImplementationFD.cpp
View File

@ -19,8 +19,8 @@
#include "dawn/native/vulkan/BackendVk.h" #include "dawn/native/vulkan/BackendVk.h"
#include "dawn/native/vulkan/DeviceVk.h" #include "dawn/native/vulkan/DeviceVk.h"
#include "dawn/native/vulkan/VulkanError.h" #include "dawn/native/vulkan/VulkanError.h"
#include "dawn/native/vulkan/external_semaphore/ServiceImplementation.h" #include "dawn/native/vulkan/external_semaphore/SemaphoreServiceImplementation.h"
#include "dawn/native/vulkan/external_semaphore/ServiceImplementationFD.h" #include "dawn/native/vulkan/external_semaphore/SemaphoreServiceImplementationFD.h"
static constexpr VkExternalSemaphoreHandleTypeFlagBits kHandleType = static constexpr VkExternalSemaphoreHandleTypeFlagBits kHandleType =
#if DAWN_PLATFORM_IS(ANDROID) || DAWN_PLATFORM_IS(CHROMEOS) #if DAWN_PLATFORM_IS(ANDROID) || DAWN_PLATFORM_IS(CHROMEOS)

0
src/dawn/native/vulkan/external_semaphore/ServiceImplementationFD.h → src/dawn/native/vulkan/external_semaphore/SemaphoreServiceImplementationFD.h
View File

4
src/dawn/native/vulkan/external_semaphore/ServiceImplementationZirconHandle.cpp → src/dawn/native/vulkan/external_semaphore/SemaphoreServiceImplementationZirconHandle.cpp
View File

@ -19,8 +19,8 @@
#include "dawn/native/vulkan/BackendVk.h" #include "dawn/native/vulkan/BackendVk.h"
#include "dawn/native/vulkan/DeviceVk.h" #include "dawn/native/vulkan/DeviceVk.h"
#include "dawn/native/vulkan/VulkanError.h" #include "dawn/native/vulkan/VulkanError.h"
#include "dawn/native/vulkan/external_semaphore/ServiceImplementation.h" #include "dawn/native/vulkan/external_semaphore/SemaphoreServiceImplementation.h"
#include "dawn/native/vulkan/external_semaphore/ServiceImplementationZirconHandle.h" #include "dawn/native/vulkan/external_semaphore/SemaphoreServiceImplementationZirconHandle.h"
namespace dawn::native::vulkan::external_semaphore { namespace dawn::native::vulkan::external_semaphore {

6
src/dawn/native/vulkan/external_semaphore/ServiceImplementationZirconHandle.h → src/dawn/native/vulkan/external_semaphore/SemaphoreServiceImplementationZirconHandle.h
View File

@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
#ifndef SRC_DAWN_NATIVE_VULKAN_EXTERNAL_SEMAPHORE_SERVICEIMPLEMENTATIONZIRCONHANDLE_H_ #ifndef SRC_DAWN_NATIVE_VULKAN_EXTERNAL_SEMAPHORE_SEMAPHORESERVICEIMPLEMENTATIONZIRCONHANDLE_H_
#define SRC_DAWN_NATIVE_VULKAN_EXTERNAL_SEMAPHORE_SERVICEIMPLEMENTATIONZIRCONHANDLE_H_ #define SRC_DAWN_NATIVE_VULKAN_EXTERNAL_SEMAPHORE_SEMAPHORESERVICEIMPLEMENTATIONZIRCONHANDLE_H_
#include <memory> #include <memory>
@ -33,4 +33,4 @@ std::unique_ptr<ServiceImplementation> CreateZirconHandleService(Device* device)
} // namespace dawn::native::vulkan::external_semaphore } // namespace dawn::native::vulkan::external_semaphore
#endif // SRC_DAWN_NATIVE_VULKAN_EXTERNAL_SEMAPHORE_SERVICEIMPLEMENTATIONZIRCONHANDLE_H_ #endif // SRC_DAWN_NATIVE_VULKAN_EXTERNAL_SEMAPHORE_SEMAPHORESERVICEIMPLEMENTATIONZIRCONHANDLE_H_