diff --git a/src/gpgmm/BUILD.gn b/src/gpgmm/BUILD.gn index c13d7fee2..0eb2d951a 100644 --- a/src/gpgmm/BUILD.gn +++ b/src/gpgmm/BUILD.gn @@ -117,6 +117,7 @@ source_set("gpgmm_sources") { "d3d12/BufferAllocatorD3D12.h", "d3d12/CapsD3D12.cpp", "d3d12/CapsD3D12.h", + "d3d12/D3D12Platform.h", "d3d12/DebugObjectD3D12.cpp", "d3d12/DebugObjectD3D12.h", "d3d12/DebugResourceAllocatorD3D12.cpp", @@ -144,7 +145,6 @@ source_set("gpgmm_sources") { "d3d12/UnknownD3D12.h", "d3d12/UtilsD3D12.cpp", "d3d12/UtilsD3D12.h", - "d3d12/d3d12_platform.h", ] } diff --git a/src/gpgmm/CMakeLists.txt b/src/gpgmm/CMakeLists.txt index 72e8ebddd..6d914096f 100644 --- a/src/gpgmm/CMakeLists.txt +++ b/src/gpgmm/CMakeLists.txt @@ -85,7 +85,7 @@ if (GPGMM_ENABLE_D3D12) "d3d12/UnknownD3D12.h" "d3d12/UtilsD3D12.cpp" "d3d12/UtilsD3D12.h" - "d3d12/d3d12_platform.h" + "d3d12/D3D12Platform.h" ) target_link_libraries(gpgmm PRIVATE dxguid.lib) endif() @@ -108,7 +108,7 @@ if (GPGMM_ENABLE_VK) "vk/ResourceAllocatorVk.h" "vk/FunctionsVk.cpp" "vk/FunctionsVk.h" - "vk/vk_platform.h" + "vk/VKPlatform.h" ) # Only link to Vulkan if static linking is used diff --git a/src/gpgmm/d3d12/BufferAllocatorD3D12.h b/src/gpgmm/d3d12/BufferAllocatorD3D12.h index 210d9c137..85cd79ae8 100644 --- a/src/gpgmm/d3d12/BufferAllocatorD3D12.h +++ b/src/gpgmm/d3d12/BufferAllocatorD3D12.h @@ -17,7 +17,7 @@ #include "gpgmm/common/MemoryAllocator.h" -#include "gpgmm/d3d12/d3d12_platform.h" +#include "gpgmm/d3d12/D3D12Platform.h" namespace gpgmm::d3d12 { diff --git a/src/gpgmm/d3d12/CapsD3D12.h b/src/gpgmm/d3d12/CapsD3D12.h index c7f8ce0f7..fe3689986 100644 --- a/src/gpgmm/d3d12/CapsD3D12.h +++ b/src/gpgmm/d3d12/CapsD3D12.h @@ -16,7 +16,7 @@ #define GPGMM_D3D12_CAPSD3D12_H_ #include "gpgmm/common/GPUInfo.h" -#include "gpgmm/d3d12/d3d12_platform.h" +#include "gpgmm/d3d12/D3D12Platform.h" #include "gpgmm/utils/Limits.h" #include diff --git a/src/gpgmm/d3d12/d3d12_platform.h b/src/gpgmm/d3d12/D3D12Platform.h similarity index 100% rename from src/gpgmm/d3d12/d3d12_platform.h rename to src/gpgmm/d3d12/D3D12Platform.h diff --git a/src/gpgmm/d3d12/DebugObjectD3D12.h b/src/gpgmm/d3d12/DebugObjectD3D12.h index 5cd9fa246..96d4bfbde 100644 --- a/src/gpgmm/d3d12/DebugObjectD3D12.h +++ b/src/gpgmm/d3d12/DebugObjectD3D12.h @@ -17,7 +17,7 @@ #include "gpgmm/d3d12/UnknownD3D12.h" -#include "gpgmm/d3d12/d3d12_platform.h" +#include "gpgmm/d3d12/D3D12Platform.h" #include diff --git a/src/gpgmm/d3d12/ErrorD3D12.h b/src/gpgmm/d3d12/ErrorD3D12.h index 4d1a144f1..60528daa0 100644 --- a/src/gpgmm/d3d12/ErrorD3D12.h +++ b/src/gpgmm/d3d12/ErrorD3D12.h @@ -15,7 +15,7 @@ #define GPGMM_D3D12_ERRORD3D12_H_ #include "gpgmm/common/Error.h" -#include "gpgmm/d3d12/d3d12_platform.h" +#include "gpgmm/d3d12/D3D12Platform.h" #include "gpgmm/utils/Compiler.h" #include "gpgmm/utils/Log.h" diff --git a/src/gpgmm/d3d12/FenceD3D12.h b/src/gpgmm/d3d12/FenceD3D12.h index 22b0d1b95..1e20f0527 100644 --- a/src/gpgmm/d3d12/FenceD3D12.h +++ b/src/gpgmm/d3d12/FenceD3D12.h @@ -15,7 +15,7 @@ #ifndef GPGMM_D3D12_FENCED3D12_H_ #define GPGMM_D3D12_FENCED3D12_H_ -#include "gpgmm/d3d12/d3d12_platform.h" +#include "gpgmm/d3d12/D3D12Platform.h" #include "gpgmm/utils/NonCopyable.h" #include diff --git a/src/gpgmm/d3d12/JSONSerializerD3D12.h b/src/gpgmm/d3d12/JSONSerializerD3D12.h index 887889be0..2a727d27c 100644 --- a/src/gpgmm/d3d12/JSONSerializerD3D12.h +++ b/src/gpgmm/d3d12/JSONSerializerD3D12.h @@ -16,7 +16,7 @@ #define GPGMM_D3D12_JSONSERIALIZERD3D12_H_ #include "gpgmm/common/JSONSerializer.h" -#include "gpgmm/d3d12/d3d12_platform.h" +#include "gpgmm/d3d12/D3D12Platform.h" #include diff --git a/src/gpgmm/d3d12/ResidencyListD3D12.h b/src/gpgmm/d3d12/ResidencyListD3D12.h index 2583dc878..c9d2bfbd5 100644 --- a/src/gpgmm/d3d12/ResidencyListD3D12.h +++ b/src/gpgmm/d3d12/ResidencyListD3D12.h @@ -15,8 +15,8 @@ #ifndef GPGMM_D3D12_RESIDENCYLISTD3D12_H_ #define GPGMM_D3D12_RESIDENCYLISTD3D12_H_ +#include "gpgmm/d3d12/D3D12Platform.h" #include "gpgmm/d3d12/UnknownD3D12.h" -#include "gpgmm/d3d12/d3d12_platform.h" #include diff --git a/src/gpgmm/d3d12/ResourceHeapAllocatorD3D12.h b/src/gpgmm/d3d12/ResourceHeapAllocatorD3D12.h index edd420b0b..ce3fce2ca 100644 --- a/src/gpgmm/d3d12/ResourceHeapAllocatorD3D12.h +++ b/src/gpgmm/d3d12/ResourceHeapAllocatorD3D12.h @@ -17,7 +17,7 @@ #define GPGMM_D3D12_RESOURCEHEAPALLOCATORD3D12_H_ #include "gpgmm/common/MemoryAllocator.h" -#include "gpgmm/d3d12/d3d12_platform.h" +#include "gpgmm/d3d12/D3D12Platform.h" namespace gpgmm::d3d12 { diff --git a/src/gpgmm/d3d12/ResourceSizeD3D12.h b/src/gpgmm/d3d12/ResourceSizeD3D12.h index efdbf5862..6c5296c25 100644 --- a/src/gpgmm/d3d12/ResourceSizeD3D12.h +++ b/src/gpgmm/d3d12/ResourceSizeD3D12.h @@ -16,7 +16,7 @@ #define GPGMM_D3D12_RESOURCESIZE_H_ #include "gpgmm/common/SizeClass.h" -#include "gpgmm/d3d12/d3d12_platform.h" +#include "gpgmm/d3d12/D3D12Platform.h" #include "gpgmm/utils/Utils.h" namespace gpgmm::d3d12 { diff --git a/src/gpgmm/d3d12/UnknownD3D12.h b/src/gpgmm/d3d12/UnknownD3D12.h index 7f5223b5d..cdeb747bf 100644 --- a/src/gpgmm/d3d12/UnknownD3D12.h +++ b/src/gpgmm/d3d12/UnknownD3D12.h @@ -15,7 +15,7 @@ #ifndef GPGMM_D3D12_UnknownD3D12_H_ #define GPGMM_D3D12_UnknownD3D12_H_ -#include "gpgmm/d3d12/d3d12_platform.h" +#include "gpgmm/d3d12/D3D12Platform.h" #include "gpgmm/utils/NonCopyable.h" #ifndef GPGMM_REFCOUNT_TYPE diff --git a/src/gpgmm/d3d12/UtilsD3D12.h b/src/gpgmm/d3d12/UtilsD3D12.h index a368cc51b..8da6972c5 100644 --- a/src/gpgmm/d3d12/UtilsD3D12.h +++ b/src/gpgmm/d3d12/UtilsD3D12.h @@ -14,7 +14,7 @@ #ifndef GPGMM_D3D12_UTILSD3D12_H_ #define GPGMM_D3D12_UTILSD3D12_H_ -#include "gpgmm/d3d12/d3d12_platform.h" +#include "gpgmm/d3d12/D3D12Platform.h" #include "gpgmm/utils/Log.h" #include "gpgmm/utils/WindowsUtils.h" diff --git a/src/gpgmm/vk/CapsVk.h b/src/gpgmm/vk/CapsVk.h index 98ab77bfd..6b2406884 100644 --- a/src/gpgmm/vk/CapsVk.h +++ b/src/gpgmm/vk/CapsVk.h @@ -15,7 +15,7 @@ #ifndef GPGMM_VK_CAPSVK_H_ #define GPGMM_VK_CAPSVK_H_ -#include "gpgmm/vk/vk_platform.h" +#include "gpgmm/vk/VKPlatform.h" #include diff --git a/src/gpgmm/vk/DeviceMemoryVk.h b/src/gpgmm/vk/DeviceMemoryVk.h index 9101b852d..d7ac0c40f 100644 --- a/src/gpgmm/vk/DeviceMemoryVk.h +++ b/src/gpgmm/vk/DeviceMemoryVk.h @@ -17,7 +17,7 @@ #include "gpgmm/common/Memory.h" -#include "gpgmm/vk/vk_platform.h" +#include "gpgmm/vk/VKPlatform.h" namespace gpgmm::vk { diff --git a/src/gpgmm/vk/ErrorVk.h b/src/gpgmm/vk/ErrorVk.h index 58b71791a..b3834ac96 100644 --- a/src/gpgmm/vk/ErrorVk.h +++ b/src/gpgmm/vk/ErrorVk.h @@ -15,7 +15,7 @@ #define GPGMM_VK_ERRORVK_H_ #include "gpgmm/common/Error.h" -#include "gpgmm/vk/vk_platform.h" +#include "gpgmm/vk/VKPlatform.h" namespace gpgmm::vk { diff --git a/src/gpgmm/vk/FunctionsVk.h b/src/gpgmm/vk/FunctionsVk.h index 86bbd5676..80415d311 100644 --- a/src/gpgmm/vk/FunctionsVk.h +++ b/src/gpgmm/vk/FunctionsVk.h @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gpgmm/vk/vk_platform.h" +#include "gpgmm/vk/VKPlatform.h" namespace gpgmm::vk { diff --git a/src/gpgmm/vk/vk_platform.h b/src/gpgmm/vk/VkPlatform.h similarity index 86% rename from src/gpgmm/vk/vk_platform.h rename to src/gpgmm/vk/VkPlatform.h index fe3210f50..6993508d0 100644 --- a/src/gpgmm/vk/vk_platform.h +++ b/src/gpgmm/vk/VkPlatform.h @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GPGMM_VK_VKPLATFORM_H_ -#define GPGMM_VK_VKPLATFORM_H_ +#ifndef GPGMM_VK_VKPlatform_H_ +#define GPGMM_VK_VKPlatform_H_ #include -#endif // GPGMM_VK_VKPLATFORM_H_ +#endif // GPGMM_VK_VKPlatform_H_ diff --git a/src/tests/D3D12Test.h b/src/tests/D3D12Test.h index e3751dad4..1b9e4e6d6 100644 --- a/src/tests/D3D12Test.h +++ b/src/tests/D3D12Test.h @@ -21,7 +21,7 @@ #include #include -#include "gpgmm/d3d12/d3d12_platform.h" +#include "gpgmm/d3d12/D3D12Platform.h" #define ASSERT_FAILED(expr) ASSERT_TRUE(FAILED(expr)) #define ASSERT_SUCCEEDED(expr) ASSERT_TRUE(SUCCEEDED(expr)) diff --git a/src/tests/VKTest.h b/src/tests/VKTest.h index 3519750ad..d991f7922 100644 --- a/src/tests/VKTest.h +++ b/src/tests/VKTest.h @@ -17,7 +17,7 @@ #include "tests/GPGMMTest.h" -#include "gpgmm/vk/vk_platform.h" +#include "gpgmm/vk/VKPlatform.h" #define ASSERT_FAILED(expr) ASSERT_TRUE((expr) != VK_SUCCESS) #define ASSERT_SUCCESS(expr) ASSERT_TRUE((expr) == VK_SUCCESS)