From d158ed2a6b8e6fd4bcb6ec6c6dc8aeecd8af688a Mon Sep 17 00:00:00 2001
From: Jake Turner <jake@evansturner.co.uk>
Date: Thu, 29 Apr 2021 06:05:19 +0100
Subject: [PATCH] Renamed vk_apple.mm -> vk_apple_helpers.mm

Support for Xcode project generation.
Distinguish object file between .cpp & .mm versions.
Xcode project build did not work when had the same source file with .cpp and .mm extensions ie. vk_apple.cpp & vk_apple.mm
The makefile generator explicitly distinguishes the targets ie. vk_apple.cpp.o & vk_apple.mm.o
---
 renderdoc/driver/vulkan/CMakeLists.txt                       | 2 +-
 renderdoc/driver/vulkan/renderdoc_vulkan.vcxproj             | 2 +-
 renderdoc/driver/vulkan/renderdoc_vulkan.vcxproj.filters     | 2 +-
 renderdoc/driver/vulkan/vk_apple.cpp                         | 2 +-
 renderdoc/driver/vulkan/{vk_apple.mm => vk_apple_helpers.mm} | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename renderdoc/driver/vulkan/{vk_apple.mm => vk_apple_helpers.mm} (100%)

diff --git a/renderdoc/driver/vulkan/CMakeLists.txt b/renderdoc/driver/vulkan/CMakeLists.txt
index cf74b3fad..28a24be0c 100644
--- a/renderdoc/driver/vulkan/CMakeLists.txt
+++ b/renderdoc/driver/vulkan/CMakeLists.txt
@@ -88,7 +88,7 @@ if(ANDROID)
     list(APPEND sources vk_posix.cpp vk_android.cpp vk_layer_android.cpp)
     list(APPEND definitions PRIVATE -DVK_USE_PLATFORM_ANDROID_KHR)
 elseif(APPLE)
-    list(APPEND sources vk_posix.cpp vk_apple.cpp vk_apple.mm)
+    list(APPEND sources vk_posix.cpp vk_apple.cpp vk_apple_helpers.mm)
 
     add_definitions(-DVK_USE_PLATFORM_MACOS_MVK -DVK_USE_PLATFORM_METAL_EXT)
 elseif(ENABLE_GGP)
diff --git a/renderdoc/driver/vulkan/renderdoc_vulkan.vcxproj b/renderdoc/driver/vulkan/renderdoc_vulkan.vcxproj
index 8114a8e3e..fb6d4b6ec 100644
--- a/renderdoc/driver/vulkan/renderdoc_vulkan.vcxproj
+++ b/renderdoc/driver/vulkan/renderdoc_vulkan.vcxproj
@@ -202,7 +202,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="renderdoc.json" />
-    <None Include="vk_apple.mm" />
+    <None Include="vk_apple_helpers.mm" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\shaders\spirv\renderdoc_spirv.vcxproj">
diff --git a/renderdoc/driver/vulkan/renderdoc_vulkan.vcxproj.filters b/renderdoc/driver/vulkan/renderdoc_vulkan.vcxproj.filters
index 8830e7c53..baadbebc2 100644
--- a/renderdoc/driver/vulkan/renderdoc_vulkan.vcxproj.filters
+++ b/renderdoc/driver/vulkan/renderdoc_vulkan.vcxproj.filters
@@ -283,7 +283,7 @@
     <None Include="renderdoc.json">
       <Filter>Layer</Filter>
     </None>
-    <None Include="vk_apple.mm">
+    <None Include="vk_apple_helpers.mm">
       <Filter>OS\Posix</Filter>
     </None>
   </ItemGroup>
diff --git a/renderdoc/driver/vulkan/vk_apple.cpp b/renderdoc/driver/vulkan/vk_apple.cpp
index 1650c3cd1..e4222721b 100644
--- a/renderdoc/driver/vulkan/vk_apple.cpp
+++ b/renderdoc/driver/vulkan/vk_apple.cpp
@@ -28,7 +28,7 @@
 
 #include <dlfcn.h>
 
-// helpers defined in vk_apple.mm
+// helpers defined in vk_apple_helpers.mm
 void getMetalLayerSize(void *layerHandle, int &width, int &height);
 
 #if defined(VK_USE_PLATFORM_MACOS_MVK)
diff --git a/renderdoc/driver/vulkan/vk_apple.mm b/renderdoc/driver/vulkan/vk_apple_helpers.mm
similarity index 100%
rename from renderdoc/driver/vulkan/vk_apple.mm
rename to renderdoc/driver/vulkan/vk_apple_helpers.mm