From 3e371b146d044fbc894a6a605f14d5608b123f96 Mon Sep 17 00:00:00 2001 From: Corentin Wallez Date: Wed, 18 Jul 2018 14:32:45 +0200 Subject: [PATCH] Rename files in src/include nxt -> dawn --- examples/SampleUtils.cpp | 2 +- examples/SampleUtils.h | 2 +- generator/templates/apicpp.h | 2 +- src/backend/SwapChain.h | 2 +- src/backend/d3d12/NativeSwapChainImplD3D12.h | 2 +- src/backend/d3d12/SwapChainD3D12.cpp | 2 +- src/backend/metal/SwapChainMTL.mm | 2 +- src/backend/opengl/SwapChainGL.cpp | 2 +- src/backend/vulkan/NativeSwapChainImplVk.h | 2 +- src/include/{nxt => dawn}/EnumClassBitmasks.h | 0 src/include/{nxt/nxt_wsi.h => dawn/dawn_wsi.h} | 0 src/tests/unittests/EnumClassBitmasksTests.cpp | 2 +- src/utils/BackendBinding.h | 2 +- src/utils/D3D12Binding.cpp | 2 +- src/utils/MetalBinding.mm | 2 +- src/utils/OpenGLBinding.cpp | 2 +- src/utils/VulkanBinding.cpp | 2 +- 17 files changed, 15 insertions(+), 15 deletions(-) rename src/include/{nxt => dawn}/EnumClassBitmasks.h (100%) rename src/include/{nxt/nxt_wsi.h => dawn/dawn_wsi.h} (100%) diff --git a/examples/SampleUtils.cpp b/examples/SampleUtils.cpp index 0fd06f27c6..a43a483d5b 100644 --- a/examples/SampleUtils.cpp +++ b/examples/SampleUtils.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include "GLFW/glfw3.h" #include diff --git a/examples/SampleUtils.h b/examples/SampleUtils.h index b49a237353..bbe37b269f 100644 --- a/examples/SampleUtils.h +++ b/examples/SampleUtils.h @@ -13,7 +13,7 @@ // limitations under the License. #include -#include +#include bool InitSample(int argc, const char** argv); void DoFlush(); diff --git a/generator/templates/apicpp.h b/generator/templates/apicpp.h index 639159f5c6..fae1fc2a92 100644 --- a/generator/templates/apicpp.h +++ b/generator/templates/apicpp.h @@ -17,7 +17,7 @@ #include "dawn.h" -#include "nxt/EnumClassBitmasks.h" +#include "dawn/EnumClassBitmasks.h" // Temporary define to rename NXT to Dawn #define dawn nxt diff --git a/src/backend/SwapChain.h b/src/backend/SwapChain.h index e3ae3770a2..3a2865ee12 100644 --- a/src/backend/SwapChain.h +++ b/src/backend/SwapChain.h @@ -19,8 +19,8 @@ #include "backend/Forward.h" #include "backend/RefCounted.h" -#include "nxt/nxt_wsi.h" #include "dawn/dawncpp.h" +#include "dawn/dawn_wsi.h" namespace backend { diff --git a/src/backend/d3d12/NativeSwapChainImplD3D12.h b/src/backend/d3d12/NativeSwapChainImplD3D12.h index 9326d5eaa8..22c48a6ae0 100644 --- a/src/backend/d3d12/NativeSwapChainImplD3D12.h +++ b/src/backend/d3d12/NativeSwapChainImplD3D12.h @@ -17,8 +17,8 @@ #include "backend/d3d12/d3d12_platform.h" -#include "nxt/nxt_wsi.h" #include "dawn/dawncpp.h" +#include "dawn/dawn_wsi.h" #include diff --git a/src/backend/d3d12/SwapChainD3D12.cpp b/src/backend/d3d12/SwapChainD3D12.cpp index 97c4de9960..ac3f7c92a2 100644 --- a/src/backend/d3d12/SwapChainD3D12.cpp +++ b/src/backend/d3d12/SwapChainD3D12.cpp @@ -17,7 +17,7 @@ #include "backend/d3d12/DeviceD3D12.h" #include "backend/d3d12/TextureD3D12.h" -#include +#include namespace backend { namespace d3d12 { diff --git a/src/backend/metal/SwapChainMTL.mm b/src/backend/metal/SwapChainMTL.mm index 00c21a59f2..43eeec9d0f 100644 --- a/src/backend/metal/SwapChainMTL.mm +++ b/src/backend/metal/SwapChainMTL.mm @@ -17,7 +17,7 @@ #include "backend/metal/DeviceMTL.h" #include "backend/metal/TextureMTL.h" -#include +#include namespace backend { namespace metal { diff --git a/src/backend/opengl/SwapChainGL.cpp b/src/backend/opengl/SwapChainGL.cpp index 51833a9cb3..2486dd6dbd 100644 --- a/src/backend/opengl/SwapChainGL.cpp +++ b/src/backend/opengl/SwapChainGL.cpp @@ -17,7 +17,7 @@ #include "backend/Device.h" #include "backend/opengl/TextureGL.h" -#include +#include namespace backend { namespace opengl { diff --git a/src/backend/vulkan/NativeSwapChainImplVk.h b/src/backend/vulkan/NativeSwapChainImplVk.h index 07dd1ad024..dfe5f6820f 100644 --- a/src/backend/vulkan/NativeSwapChainImplVk.h +++ b/src/backend/vulkan/NativeSwapChainImplVk.h @@ -17,8 +17,8 @@ #include "backend/vulkan/VulkanInfo.h" -#include "nxt/nxt_wsi.h" #include "dawn/dawncpp.h" +#include "dawn/dawn_wsi.h" namespace backend { namespace vulkan { diff --git a/src/include/nxt/EnumClassBitmasks.h b/src/include/dawn/EnumClassBitmasks.h similarity index 100% rename from src/include/nxt/EnumClassBitmasks.h rename to src/include/dawn/EnumClassBitmasks.h diff --git a/src/include/nxt/nxt_wsi.h b/src/include/dawn/dawn_wsi.h similarity index 100% rename from src/include/nxt/nxt_wsi.h rename to src/include/dawn/dawn_wsi.h diff --git a/src/tests/unittests/EnumClassBitmasksTests.cpp b/src/tests/unittests/EnumClassBitmasksTests.cpp index 9980511e70..84516b6e91 100644 --- a/src/tests/unittests/EnumClassBitmasksTests.cpp +++ b/src/tests/unittests/EnumClassBitmasksTests.cpp @@ -14,7 +14,7 @@ #include "gtest/gtest.h" -#include "nxt/EnumClassBitmasks.h" +#include "dawn/EnumClassBitmasks.h" namespace nxt { diff --git a/src/utils/BackendBinding.h b/src/utils/BackendBinding.h index 7961b607b8..bee8636c7e 100644 --- a/src/utils/BackendBinding.h +++ b/src/utils/BackendBinding.h @@ -15,7 +15,7 @@ #ifndef UTILS_BACKENDBINDING_H_ #define UTILS_BACKENDBINDING_H_ -#include +#include struct GLFWwindow; typedef struct nxtProcTable_s nxtProcTable; diff --git a/src/utils/D3D12Binding.cpp b/src/utils/D3D12Binding.cpp index 8f598d8734..3ab9d714e0 100644 --- a/src/utils/D3D12Binding.cpp +++ b/src/utils/D3D12Binding.cpp @@ -15,7 +15,7 @@ #include "utils/BackendBinding.h" #include "common/Assert.h" -#include "nxt/nxt_wsi.h" +#include "dawn/dawn_wsi.h" #include "GLFW/glfw3.h" #define GLFW_EXPOSE_NATIVE_WIN32 diff --git a/src/utils/MetalBinding.mm b/src/utils/MetalBinding.mm index 1ec971575c..b84b0a262b 100644 --- a/src/utils/MetalBinding.mm +++ b/src/utils/MetalBinding.mm @@ -16,7 +16,7 @@ #include "common/Assert.h" #include "common/SwapChainUtils.h" -#include "nxt/nxt_wsi.h" +#include "dawn/dawn_wsi.h" #define GLFW_EXPOSE_NATIVE_COCOA #include "GLFW/glfw3.h" diff --git a/src/utils/OpenGLBinding.cpp b/src/utils/OpenGLBinding.cpp index 8e7e64a17b..250b0db933 100644 --- a/src/utils/OpenGLBinding.cpp +++ b/src/utils/OpenGLBinding.cpp @@ -17,7 +17,7 @@ #include "common/Assert.h" #include "common/Platform.h" #include "common/SwapChainUtils.h" -#include "nxt/nxt_wsi.h" +#include "dawn/dawn_wsi.h" // Glad needs to be included before GLFW otherwise it complain that GL.h was already included #include "glad/glad.h" diff --git a/src/utils/VulkanBinding.cpp b/src/utils/VulkanBinding.cpp index 55a2414f9a..0990808a80 100644 --- a/src/utils/VulkanBinding.cpp +++ b/src/utils/VulkanBinding.cpp @@ -16,7 +16,7 @@ #include "common/Assert.h" #include "common/vulkan_platform.h" -#include "nxt/nxt_wsi.h" +#include "dawn/dawn_wsi.h" #include "GLFW/glfw3.h"