From 49a65d0c0cfd09004edb873b7d285b34d60338b6 Mon Sep 17 00:00:00 2001 From: Corentin Wallez Date: Tue, 24 Jul 2018 16:45:45 +0200 Subject: [PATCH] dawn_native: Fixup namespace from backend:: to dawn_native:: --- generator/templates/dawn_native/ProcTable.cpp | 2 +- .../templates/dawn_native/ValidationUtils.cpp | 4 ++-- generator/templates/dawn_native/ValidationUtils.h | 4 ++-- src/dawn_native/BindGroup.cpp | 4 ++-- src/dawn_native/BindGroup.h | 4 ++-- src/dawn_native/BindGroupLayout.cpp | 4 ++-- src/dawn_native/BindGroupLayout.h | 4 ++-- src/dawn_native/BlendState.cpp | 4 ++-- src/dawn_native/BlendState.h | 4 ++-- src/dawn_native/Buffer.cpp | 4 ++-- src/dawn_native/Buffer.h | 4 ++-- src/dawn_native/Builder.cpp | 4 ++-- src/dawn_native/Builder.h | 4 ++-- src/dawn_native/CommandAllocator.cpp | 4 ++-- src/dawn_native/CommandAllocator.h | 4 ++-- src/dawn_native/CommandBuffer.cpp | 4 ++-- src/dawn_native/CommandBuffer.h | 4 ++-- src/dawn_native/CommandBufferStateTracker.cpp | 4 ++-- src/dawn_native/CommandBufferStateTracker.h | 4 ++-- src/dawn_native/Commands.cpp | 4 ++-- src/dawn_native/Commands.h | 4 ++-- src/dawn_native/ComputePipeline.cpp | 4 ++-- src/dawn_native/ComputePipeline.h | 4 ++-- src/dawn_native/DepthStencilState.cpp | 4 ++-- src/dawn_native/DepthStencilState.h | 4 ++-- src/dawn_native/Device.cpp | 4 ++-- src/dawn_native/Device.h | 4 ++-- src/dawn_native/Error.cpp | 4 ++-- src/dawn_native/Error.h | 4 ++-- src/dawn_native/ErrorData.cpp | 4 ++-- src/dawn_native/ErrorData.h | 4 ++-- src/dawn_native/Forward.h | 4 ++-- src/dawn_native/InputState.cpp | 4 ++-- src/dawn_native/InputState.h | 4 ++-- src/dawn_native/PassResourceUsage.h | 4 ++-- src/dawn_native/PerStage.cpp | 4 ++-- src/dawn_native/PerStage.h | 4 ++-- src/dawn_native/Pipeline.cpp | 4 ++-- src/dawn_native/Pipeline.h | 4 ++-- src/dawn_native/PipelineLayout.cpp | 4 ++-- src/dawn_native/PipelineLayout.h | 4 ++-- src/dawn_native/Queue.cpp | 4 ++-- src/dawn_native/Queue.h | 4 ++-- src/dawn_native/RefCounted.cpp | 4 ++-- src/dawn_native/RefCounted.h | 4 ++-- src/dawn_native/RenderPassDescriptor.cpp | 4 ++-- src/dawn_native/RenderPassDescriptor.h | 4 ++-- src/dawn_native/RenderPipeline.cpp | 4 ++-- src/dawn_native/RenderPipeline.h | 4 ++-- src/dawn_native/Sampler.cpp | 4 ++-- src/dawn_native/Sampler.h | 4 ++-- src/dawn_native/ShaderModule.cpp | 4 ++-- src/dawn_native/ShaderModule.h | 4 ++-- src/dawn_native/SwapChain.cpp | 4 ++-- src/dawn_native/SwapChain.h | 4 ++-- src/dawn_native/Texture.cpp | 4 ++-- src/dawn_native/Texture.h | 4 ++-- src/dawn_native/ToBackend.h | 4 ++-- src/dawn_native/d3d12/BindGroupD3D12.cpp | 4 ++-- src/dawn_native/d3d12/BindGroupD3D12.h | 4 ++-- src/dawn_native/d3d12/BindGroupLayoutD3D12.cpp | 4 ++-- src/dawn_native/d3d12/BindGroupLayoutD3D12.h | 4 ++-- src/dawn_native/d3d12/BlendStateD3D12.cpp | 4 ++-- src/dawn_native/d3d12/BlendStateD3D12.h | 4 ++-- src/dawn_native/d3d12/BufferD3D12.cpp | 4 ++-- src/dawn_native/d3d12/BufferD3D12.h | 4 ++-- src/dawn_native/d3d12/CommandAllocatorManager.cpp | 4 ++-- src/dawn_native/d3d12/CommandAllocatorManager.h | 4 ++-- src/dawn_native/d3d12/CommandBufferD3D12.cpp | 4 ++-- src/dawn_native/d3d12/CommandBufferD3D12.h | 4 ++-- src/dawn_native/d3d12/ComputePipelineD3D12.cpp | 4 ++-- src/dawn_native/d3d12/ComputePipelineD3D12.h | 4 ++-- src/dawn_native/d3d12/DepthStencilStateD3D12.cpp | 6 +++--- src/dawn_native/d3d12/DepthStencilStateD3D12.h | 4 ++-- src/dawn_native/d3d12/DescriptorHeapAllocator.cpp | 4 ++-- src/dawn_native/d3d12/DescriptorHeapAllocator.h | 4 ++-- src/dawn_native/d3d12/DeviceD3D12.cpp | 4 ++-- src/dawn_native/d3d12/DeviceD3D12.h | 4 ++-- src/dawn_native/d3d12/Forward.h | 4 ++-- src/dawn_native/d3d12/InputStateD3D12.cpp | 4 ++-- src/dawn_native/d3d12/InputStateD3D12.h | 4 ++-- src/dawn_native/d3d12/NativeSwapChainImplD3D12.cpp | 4 ++-- src/dawn_native/d3d12/NativeSwapChainImplD3D12.h | 4 ++-- src/dawn_native/d3d12/PipelineLayoutD3D12.cpp | 4 ++-- src/dawn_native/d3d12/PipelineLayoutD3D12.h | 4 ++-- src/dawn_native/d3d12/QueueD3D12.cpp | 4 ++-- src/dawn_native/d3d12/QueueD3D12.h | 4 ++-- .../d3d12/RenderPassDescriptorD3D12.cpp | 4 ++-- src/dawn_native/d3d12/RenderPassDescriptorD3D12.h | 4 ++-- src/dawn_native/d3d12/RenderPipelineD3D12.cpp | 4 ++-- src/dawn_native/d3d12/RenderPipelineD3D12.h | 4 ++-- src/dawn_native/d3d12/ResourceAllocator.cpp | 4 ++-- src/dawn_native/d3d12/ResourceAllocator.h | 4 ++-- src/dawn_native/d3d12/ResourceUploader.cpp | 4 ++-- src/dawn_native/d3d12/ResourceUploader.h | 4 ++-- src/dawn_native/d3d12/SamplerD3D12.cpp | 4 ++-- src/dawn_native/d3d12/SamplerD3D12.h | 4 ++-- src/dawn_native/d3d12/ShaderModuleD3D12.cpp | 4 ++-- src/dawn_native/d3d12/ShaderModuleD3D12.h | 4 ++-- src/dawn_native/d3d12/SwapChainD3D12.cpp | 4 ++-- src/dawn_native/d3d12/SwapChainD3D12.h | 4 ++-- src/dawn_native/d3d12/TextureCopySplitter.cpp | 4 ++-- src/dawn_native/d3d12/TextureCopySplitter.h | 4 ++-- src/dawn_native/d3d12/TextureD3D12.cpp | 4 ++-- src/dawn_native/d3d12/TextureD3D12.h | 4 ++-- src/dawn_native/metal/BlendStateMTL.h | 4 ++-- src/dawn_native/metal/BlendStateMTL.mm | 4 ++-- src/dawn_native/metal/BufferMTL.h | 4 ++-- src/dawn_native/metal/BufferMTL.mm | 4 ++-- src/dawn_native/metal/CommandBufferMTL.h | 6 +++--- src/dawn_native/metal/CommandBufferMTL.mm | 4 ++-- src/dawn_native/metal/ComputePipelineMTL.h | 4 ++-- src/dawn_native/metal/ComputePipelineMTL.mm | 4 ++-- src/dawn_native/metal/DepthStencilStateMTL.h | 4 ++-- src/dawn_native/metal/DepthStencilStateMTL.mm | 4 ++-- src/dawn_native/metal/DeviceMTL.h | 4 ++-- src/dawn_native/metal/DeviceMTL.mm | 4 ++-- src/dawn_native/metal/Forward.h | 4 ++-- src/dawn_native/metal/InputStateMTL.h | 4 ++-- src/dawn_native/metal/InputStateMTL.mm | 4 ++-- src/dawn_native/metal/PipelineLayoutMTL.h | 4 ++-- src/dawn_native/metal/PipelineLayoutMTL.mm | 4 ++-- src/dawn_native/metal/QueueMTL.h | 4 ++-- src/dawn_native/metal/QueueMTL.mm | 4 ++-- src/dawn_native/metal/RenderPipelineMTL.h | 4 ++-- src/dawn_native/metal/RenderPipelineMTL.mm | 4 ++-- src/dawn_native/metal/ResourceUploader.h | 4 ++-- src/dawn_native/metal/ResourceUploader.mm | 4 ++-- src/dawn_native/metal/SamplerMTL.h | 4 ++-- src/dawn_native/metal/SamplerMTL.mm | 4 ++-- src/dawn_native/metal/ShaderModuleMTL.h | 4 ++-- src/dawn_native/metal/ShaderModuleMTL.mm | 4 ++-- src/dawn_native/metal/SwapChainMTL.h | 4 ++-- src/dawn_native/metal/SwapChainMTL.mm | 4 ++-- src/dawn_native/metal/TextureMTL.h | 4 ++-- src/dawn_native/metal/TextureMTL.mm | 4 ++-- src/dawn_native/null/NullBackend.cpp | 4 ++-- src/dawn_native/null/NullBackend.h | 4 ++-- src/dawn_native/opengl/BlendStateGL.cpp | 4 ++-- src/dawn_native/opengl/BlendStateGL.h | 4 ++-- src/dawn_native/opengl/BufferGL.cpp | 4 ++-- src/dawn_native/opengl/BufferGL.h | 4 ++-- src/dawn_native/opengl/CommandBufferGL.cpp | 4 ++-- src/dawn_native/opengl/CommandBufferGL.h | 8 ++++---- src/dawn_native/opengl/ComputePipelineGL.cpp | 4 ++-- src/dawn_native/opengl/ComputePipelineGL.h | 4 ++-- src/dawn_native/opengl/DepthStencilStateGL.cpp | 4 ++-- src/dawn_native/opengl/DepthStencilStateGL.h | 4 ++-- src/dawn_native/opengl/DeviceGL.cpp | 4 ++-- src/dawn_native/opengl/DeviceGL.h | 4 ++-- src/dawn_native/opengl/Forward.h | 4 ++-- src/dawn_native/opengl/InputStateGL.cpp | 4 ++-- src/dawn_native/opengl/InputStateGL.h | 4 ++-- .../opengl/PersistentPipelineStateGL.cpp | 4 ++-- src/dawn_native/opengl/PersistentPipelineStateGL.h | 4 ++-- src/dawn_native/opengl/PipelineGL.cpp | 4 ++-- src/dawn_native/opengl/PipelineGL.h | 4 ++-- src/dawn_native/opengl/PipelineLayoutGL.cpp | 4 ++-- src/dawn_native/opengl/PipelineLayoutGL.h | 4 ++-- src/dawn_native/opengl/QueueGL.cpp | 4 ++-- src/dawn_native/opengl/QueueGL.h | 4 ++-- src/dawn_native/opengl/RenderPipelineGL.cpp | 4 ++-- src/dawn_native/opengl/RenderPipelineGL.h | 4 ++-- src/dawn_native/opengl/SamplerGL.cpp | 4 ++-- src/dawn_native/opengl/SamplerGL.h | 4 ++-- src/dawn_native/opengl/ShaderModuleGL.cpp | 4 ++-- src/dawn_native/opengl/ShaderModuleGL.h | 4 ++-- src/dawn_native/opengl/SwapChainGL.cpp | 4 ++-- src/dawn_native/opengl/SwapChainGL.h | 4 ++-- src/dawn_native/opengl/TextureGL.cpp | 4 ++-- src/dawn_native/opengl/TextureGL.h | 4 ++-- src/dawn_native/vulkan/BindGroupLayoutVk.cpp | 4 ++-- src/dawn_native/vulkan/BindGroupLayoutVk.h | 4 ++-- src/dawn_native/vulkan/BindGroupVk.cpp | 4 ++-- src/dawn_native/vulkan/BindGroupVk.h | 4 ++-- src/dawn_native/vulkan/BlendStateVk.cpp | 4 ++-- src/dawn_native/vulkan/BlendStateVk.h | 4 ++-- src/dawn_native/vulkan/BufferUploader.cpp | 4 ++-- src/dawn_native/vulkan/BufferUploader.h | 4 ++-- src/dawn_native/vulkan/BufferVk.cpp | 4 ++-- src/dawn_native/vulkan/BufferVk.h | 4 ++-- src/dawn_native/vulkan/CommandBufferVk.cpp | 4 ++-- src/dawn_native/vulkan/CommandBufferVk.h | 4 ++-- src/dawn_native/vulkan/ComputePipelineVk.cpp | 4 ++-- src/dawn_native/vulkan/ComputePipelineVk.h | 4 ++-- src/dawn_native/vulkan/DepthStencilStateVk.cpp | 4 ++-- src/dawn_native/vulkan/DepthStencilStateVk.h | 4 ++-- src/dawn_native/vulkan/DeviceVk.cpp | 4 ++-- src/dawn_native/vulkan/DeviceVk.h | 4 ++-- src/dawn_native/vulkan/FencedDeleter.cpp | 4 ++-- src/dawn_native/vulkan/FencedDeleter.h | 4 ++-- src/dawn_native/vulkan/Forward.h | 6 +++--- src/dawn_native/vulkan/InputStateVk.cpp | 4 ++-- src/dawn_native/vulkan/InputStateVk.h | 4 ++-- src/dawn_native/vulkan/MemoryAllocator.cpp | 4 ++-- src/dawn_native/vulkan/MemoryAllocator.h | 4 ++-- src/dawn_native/vulkan/NativeSwapChainImplVk.cpp | 4 ++-- src/dawn_native/vulkan/NativeSwapChainImplVk.h | 4 ++-- src/dawn_native/vulkan/PipelineLayoutVk.cpp | 4 ++-- src/dawn_native/vulkan/PipelineLayoutVk.h | 4 ++-- src/dawn_native/vulkan/QueueVk.cpp | 4 ++-- src/dawn_native/vulkan/QueueVk.h | 4 ++-- src/dawn_native/vulkan/RenderPassCache.cpp | 4 ++-- src/dawn_native/vulkan/RenderPassCache.h | 4 ++-- src/dawn_native/vulkan/RenderPassDescriptorVk.cpp | 4 ++-- src/dawn_native/vulkan/RenderPassDescriptorVk.h | 4 ++-- src/dawn_native/vulkan/RenderPipelineVk.cpp | 4 ++-- src/dawn_native/vulkan/RenderPipelineVk.h | 4 ++-- src/dawn_native/vulkan/SamplerVk.cpp | 4 ++-- src/dawn_native/vulkan/SamplerVk.h | 4 ++-- src/dawn_native/vulkan/ShaderModuleVk.cpp | 4 ++-- src/dawn_native/vulkan/ShaderModuleVk.h | 4 ++-- src/dawn_native/vulkan/SwapChainVk.cpp | 4 ++-- src/dawn_native/vulkan/SwapChainVk.h | 4 ++-- src/dawn_native/vulkan/TextureVk.cpp | 4 ++-- src/dawn_native/vulkan/TextureVk.h | 4 ++-- src/dawn_native/vulkan/VulkanFunctions.cpp | 4 ++-- src/dawn_native/vulkan/VulkanFunctions.h | 4 ++-- src/dawn_native/vulkan/VulkanInfo.cpp | 4 ++-- src/dawn_native/vulkan/VulkanInfo.h | 4 ++-- src/tests/unittests/CommandAllocatorTests.cpp | 2 +- src/tests/unittests/ErrorTests.cpp | 2 +- src/tests/unittests/PerStageTests.cpp | 2 +- src/tests/unittests/RefCountedTests.cpp | 2 +- src/tests/unittests/ToBackendTests.cpp | 4 ++-- src/tests/unittests/d3d12/CopySplitTests.cpp | 2 +- src/tests/unittests/validation/ValidationTest.cpp | 4 ++-- src/utils/D3D12Binding.cpp | 10 +++++----- src/utils/MetalBinding.mm | 4 ++-- src/utils/NullBinding.cpp | 6 +++--- src/utils/OpenGLBinding.cpp | 8 ++++---- src/utils/VulkanBinding.cpp | 14 +++++++------- 232 files changed, 474 insertions(+), 474 deletions(-) diff --git a/generator/templates/dawn_native/ProcTable.cpp b/generator/templates/dawn_native/ProcTable.cpp index cdbf92bfeb..69899e41bb 100644 --- a/generator/templates/dawn_native/ProcTable.cpp +++ b/generator/templates/dawn_native/ProcTable.cpp @@ -21,7 +21,7 @@ #include "dawn_native/ValidationUtils_autogen.h" #include "dawn_native/{{namespace}}/GeneratedCodeIncludes.h" -namespace backend { +namespace dawn_native { namespace {{namespace}} { namespace { diff --git a/generator/templates/dawn_native/ValidationUtils.cpp b/generator/templates/dawn_native/ValidationUtils.cpp index c33966f1c1..9c5ef70a6c 100644 --- a/generator/templates/dawn_native/ValidationUtils.cpp +++ b/generator/templates/dawn_native/ValidationUtils.cpp @@ -14,7 +14,7 @@ #include "dawn_native/ValidationUtils_autogen.h" -namespace backend { +namespace dawn_native { {% for type in by_category["enum"] %} MaybeError Validate{{type.name.CamelCase()}}(dawn::{{as_cppType(type.name)}} value) { @@ -40,4 +40,4 @@ namespace backend { {% endfor %} -} // namespace backend +} // namespace dawn_native diff --git a/generator/templates/dawn_native/ValidationUtils.h b/generator/templates/dawn_native/ValidationUtils.h index b5f744c5bc..0e0d3854cf 100644 --- a/generator/templates/dawn_native/ValidationUtils.h +++ b/generator/templates/dawn_native/ValidationUtils.h @@ -19,13 +19,13 @@ #include "dawn_native/Error.h" -namespace backend { +namespace dawn_native { // Helper functions to check the value of enums and bitmasks {% for type in by_category["enum"] + by_category["bitmask"] %} MaybeError Validate{{type.name.CamelCase()}}(dawn::{{as_cppType(type.name)}} value); {% endfor %} -} // namespace backend +} // namespace dawn_native #endif // BACKEND_VALIDATIONUTILS_H_ diff --git a/src/dawn_native/BindGroup.cpp b/src/dawn_native/BindGroup.cpp index a4c8a7f913..388f2a70ef 100644 --- a/src/dawn_native/BindGroup.cpp +++ b/src/dawn_native/BindGroup.cpp @@ -21,7 +21,7 @@ #include "dawn_native/Device.h" #include "dawn_native/Texture.h" -namespace backend { +namespace dawn_native { // BindGroup @@ -226,4 +226,4 @@ namespace backend { return true; } -} // namespace backend +} // namespace dawn_native diff --git a/src/dawn_native/BindGroup.h b/src/dawn_native/BindGroup.h index 2a26b43688..46c272eb97 100644 --- a/src/dawn_native/BindGroup.h +++ b/src/dawn_native/BindGroup.h @@ -27,7 +27,7 @@ #include #include -namespace backend { +namespace dawn_native { class BindGroupBase : public RefCounted { public: @@ -91,6 +91,6 @@ namespace backend { std::array, kMaxBindingsPerGroup> mBindings; }; -} // namespace backend +} // namespace dawn_native #endif // DAWNNATIVE_BINDGROUP_H_ diff --git a/src/dawn_native/BindGroupLayout.cpp b/src/dawn_native/BindGroupLayout.cpp index 550b08319a..86f5dbae98 100644 --- a/src/dawn_native/BindGroupLayout.cpp +++ b/src/dawn_native/BindGroupLayout.cpp @@ -21,7 +21,7 @@ #include -namespace backend { +namespace dawn_native { MaybeError ValidateBindGroupLayoutDescriptor( DeviceBase*, @@ -115,4 +115,4 @@ namespace backend { return a->GetBindingInfo() == b->GetBindingInfo(); } -} // namespace backend +} // namespace dawn_native diff --git a/src/dawn_native/BindGroupLayout.h b/src/dawn_native/BindGroupLayout.h index 0d5f9389aa..8cdf4ffd9a 100644 --- a/src/dawn_native/BindGroupLayout.h +++ b/src/dawn_native/BindGroupLayout.h @@ -25,7 +25,7 @@ #include #include -namespace backend { +namespace dawn_native { MaybeError ValidateBindGroupLayoutDescriptor(DeviceBase*, const dawn::BindGroupLayoutDescriptor* descriptor); @@ -61,6 +61,6 @@ namespace backend { bool operator()(const BindGroupLayoutBase* a, const BindGroupLayoutBase* b) const; }; -} // namespace backend +} // namespace dawn_native #endif // DAWNNATIVE_BINDGROUPLAYOUT_H_ diff --git a/src/dawn_native/BlendState.cpp b/src/dawn_native/BlendState.cpp index ea5ab7e663..ef9e19239e 100644 --- a/src/dawn_native/BlendState.cpp +++ b/src/dawn_native/BlendState.cpp @@ -16,7 +16,7 @@ #include "dawn_native/Device.h" -namespace backend { +namespace dawn_native { // BlendStateBase @@ -90,4 +90,4 @@ namespace backend { mBlendInfo.colorWriteMask = colorWriteMask; } -} // namespace backend +} // namespace dawn_native diff --git a/src/dawn_native/BlendState.h b/src/dawn_native/BlendState.h index 4012d31895..793a70dfa7 100644 --- a/src/dawn_native/BlendState.h +++ b/src/dawn_native/BlendState.h @@ -21,7 +21,7 @@ #include "dawn/dawncpp.h" -namespace backend { +namespace dawn_native { class BlendStateBase : public RefCounted { public: @@ -70,6 +70,6 @@ namespace backend { BlendStateBase::BlendInfo mBlendInfo; }; -} // namespace backend +} // namespace dawn_native #endif // DAWNNATIVE_BLENDSTATE_H_ diff --git a/src/dawn_native/Buffer.cpp b/src/dawn_native/Buffer.cpp index 31ed2d8de2..721117650c 100644 --- a/src/dawn_native/Buffer.cpp +++ b/src/dawn_native/Buffer.cpp @@ -20,7 +20,7 @@ #include #include -namespace backend { +namespace dawn_native { // Buffer @@ -292,4 +292,4 @@ namespace backend { mPropertiesSet |= BUFFER_VIEW_PROPERTY_EXTENT; } -} // namespace backend +} // namespace dawn_native diff --git a/src/dawn_native/Buffer.h b/src/dawn_native/Buffer.h index 9fda88184c..282dde6b11 100644 --- a/src/dawn_native/Buffer.h +++ b/src/dawn_native/Buffer.h @@ -22,7 +22,7 @@ #include "dawn/dawncpp.h" -namespace backend { +namespace dawn_native { static constexpr dawn::BufferUsageBit kReadOnlyBufferUsages = dawn::BufferUsageBit::MapRead | dawn::BufferUsageBit::TransferSrc | @@ -137,6 +137,6 @@ namespace backend { int mPropertiesSet = 0; }; -} // namespace backend +} // namespace dawn_native #endif // DAWNNATIVE_BUFFER_H_ diff --git a/src/dawn_native/Builder.cpp b/src/dawn_native/Builder.cpp index 917b34381e..e6b70ad722 100644 --- a/src/dawn_native/Builder.cpp +++ b/src/dawn_native/Builder.cpp @@ -17,7 +17,7 @@ #include "common/Assert.h" #include "dawn_native/Device.h" -namespace backend { +namespace dawn_native { bool BuilderBase::CanBeUsed() const { return !mIsConsumed && !mGotStatus; @@ -94,4 +94,4 @@ namespace backend { return result != nullptr; } -} // namespace backend +} // namespace dawn_native diff --git a/src/dawn_native/Builder.h b/src/dawn_native/Builder.h index 52eb5c8ae4..f8c7b85d22 100644 --- a/src/dawn_native/Builder.h +++ b/src/dawn_native/Builder.h @@ -22,7 +22,7 @@ #include -namespace backend { +namespace dawn_native { // This class implements behavior shared by all builders: // - Tracking whether GetResult has been called already, needed by the autogenerated code to @@ -102,6 +102,6 @@ namespace backend { } } -} // namespace backend +} // namespace dawn_native #endif // DAWNNATIVE_BUILDER_H_ diff --git a/src/dawn_native/CommandAllocator.cpp b/src/dawn_native/CommandAllocator.cpp index cb85f9a4fa..3f90f6f5cb 100644 --- a/src/dawn_native/CommandAllocator.cpp +++ b/src/dawn_native/CommandAllocator.cpp @@ -21,7 +21,7 @@ #include #include -namespace backend { +namespace dawn_native { constexpr uint32_t EndOfBlock = UINT_MAX; // std::numeric_limits::max(); constexpr uint32_t AdditionalData = UINT_MAX - 1; // std::numeric_limits::max() - 1; @@ -225,4 +225,4 @@ namespace backend { return true; } -} // namespace backend +} // namespace dawn_native diff --git a/src/dawn_native/CommandAllocator.h b/src/dawn_native/CommandAllocator.h index d39176a82c..06257c6ed4 100644 --- a/src/dawn_native/CommandAllocator.h +++ b/src/dawn_native/CommandAllocator.h @@ -19,7 +19,7 @@ #include #include -namespace backend { +namespace dawn_native { // Allocation for command buffers should be fast. To avoid doing an allocation per command // or to avoid copying commands when reallocing, we use a linear allocator in a growing set @@ -145,6 +145,6 @@ namespace backend { uint32_t mDummyEnum[1] = {0}; }; -} // namespace backend +} // namespace dawn_native #endif // DAWNNATIVE_COMMAND_ALLOCATOR_H_ diff --git a/src/dawn_native/CommandBuffer.cpp b/src/dawn_native/CommandBuffer.cpp index df4f15d88e..4d6c762e5f 100644 --- a/src/dawn_native/CommandBuffer.cpp +++ b/src/dawn_native/CommandBuffer.cpp @@ -28,7 +28,7 @@ #include #include -namespace backend { +namespace dawn_native { namespace { @@ -780,4 +780,4 @@ namespace backend { memcpy(cmdOffsets, offsets, count * sizeof(uint32_t)); } -} // namespace backend +} // namespace dawn_native diff --git a/src/dawn_native/CommandBuffer.h b/src/dawn_native/CommandBuffer.h index a42ac96d97..a378936ae4 100644 --- a/src/dawn_native/CommandBuffer.h +++ b/src/dawn_native/CommandBuffer.h @@ -27,7 +27,7 @@ #include #include -namespace backend { +namespace dawn_native { class BindGroupBase; class BufferBase; @@ -146,6 +146,6 @@ namespace backend { std::vector mPassResourceUsages; }; -} // namespace backend +} // namespace dawn_native #endif // DAWNNATIVE_COMMANDBUFFER_H_ diff --git a/src/dawn_native/CommandBufferStateTracker.cpp b/src/dawn_native/CommandBufferStateTracker.cpp index 8de6c69a1a..25ea3f3176 100644 --- a/src/dawn_native/CommandBufferStateTracker.cpp +++ b/src/dawn_native/CommandBufferStateTracker.cpp @@ -23,7 +23,7 @@ #include "dawn_native/PipelineLayout.h" #include "dawn_native/RenderPipeline.h" -namespace backend { +namespace dawn_native { enum ValidationAspect { VALIDATION_ASPECT_PIPELINE, @@ -167,4 +167,4 @@ namespace backend { mAspects &= ~kLazyAspects; } -} // namespace backend +} // namespace dawn_native diff --git a/src/dawn_native/CommandBufferStateTracker.h b/src/dawn_native/CommandBufferStateTracker.h index 3dc29065d2..9dd1edbac6 100644 --- a/src/dawn_native/CommandBufferStateTracker.h +++ b/src/dawn_native/CommandBufferStateTracker.h @@ -23,7 +23,7 @@ #include #include -namespace backend { +namespace dawn_native { class CommandBufferStateTracker { public: @@ -58,6 +58,6 @@ namespace backend { RenderPipelineBase* mLastRenderPipeline = nullptr; }; -} // namespace backend +} // namespace dawn_native #endif // DAWNNATIVE_COMMANDBUFFERSTATETRACKER_H diff --git a/src/dawn_native/Commands.cpp b/src/dawn_native/Commands.cpp index ea98ab8d45..455675a5b6 100644 --- a/src/dawn_native/Commands.cpp +++ b/src/dawn_native/Commands.cpp @@ -21,7 +21,7 @@ #include "dawn_native/RenderPipeline.h" #include "dawn_native/Texture.h" -namespace backend { +namespace dawn_native { void FreeCommands(CommandIterator* commands) { commands->Reset(); @@ -199,4 +199,4 @@ namespace backend { } } -} // namespace backend +} // namespace dawn_native diff --git a/src/dawn_native/Commands.h b/src/dawn_native/Commands.h index 839245c820..a10ef3aa3f 100644 --- a/src/dawn_native/Commands.h +++ b/src/dawn_native/Commands.h @@ -20,7 +20,7 @@ #include "dawn/dawncpp.h" -namespace backend { +namespace dawn_native { // Definition of the commands that are present in the CommandIterator given by the // CommandBufferBuilder. There are not defined in CommandBuffer.h to break some header @@ -158,6 +158,6 @@ namespace backend { // consuming the correct amount of data from the command iterator. void SkipCommand(CommandIterator* commands, Command type); -} // namespace backend +} // namespace dawn_native #endif // DAWNNATIVE_COMMANDS_H_ diff --git a/src/dawn_native/ComputePipeline.cpp b/src/dawn_native/ComputePipeline.cpp index c5f4bb653f..0ffcfe6b52 100644 --- a/src/dawn_native/ComputePipeline.cpp +++ b/src/dawn_native/ComputePipeline.cpp @@ -16,7 +16,7 @@ #include "dawn_native/Device.h" -namespace backend { +namespace dawn_native { // ComputePipelineBase @@ -38,4 +38,4 @@ namespace backend { return mDevice->CreateComputePipeline(this); } -} // namespace backend +} // namespace dawn_native diff --git a/src/dawn_native/ComputePipeline.h b/src/dawn_native/ComputePipeline.h index 526891a510..f81ab992c8 100644 --- a/src/dawn_native/ComputePipeline.h +++ b/src/dawn_native/ComputePipeline.h @@ -17,7 +17,7 @@ #include "dawn_native/Pipeline.h" -namespace backend { +namespace dawn_native { class ComputePipelineBase : public RefCounted, public PipelineBase { public: @@ -32,6 +32,6 @@ namespace backend { ComputePipelineBase* GetResultImpl() override; }; -} // namespace backend +} // namespace dawn_native #endif // DAWNNATIVE_COMPUTEPIPELINE_H_ diff --git a/src/dawn_native/DepthStencilState.cpp b/src/dawn_native/DepthStencilState.cpp index 2aa4f9c418..5647d9e031 100644 --- a/src/dawn_native/DepthStencilState.cpp +++ b/src/dawn_native/DepthStencilState.cpp @@ -16,7 +16,7 @@ #include "dawn_native/Device.h" -namespace backend { +namespace dawn_native { // DepthStencilStateBase @@ -132,4 +132,4 @@ namespace backend { mStencilInfo.writeMask = writeMask; } -} // namespace backend +} // namespace dawn_native diff --git a/src/dawn_native/DepthStencilState.h b/src/dawn_native/DepthStencilState.h index b5e56264db..d795d5dd84 100644 --- a/src/dawn_native/DepthStencilState.h +++ b/src/dawn_native/DepthStencilState.h @@ -21,7 +21,7 @@ #include "dawn/dawncpp.h" -namespace backend { +namespace dawn_native { class DepthStencilStateBase : public RefCounted { public: @@ -80,6 +80,6 @@ namespace backend { DepthStencilStateBase::StencilInfo mStencilInfo; }; -} // namespace backend +} // namespace dawn_native #endif // DAWNNATIVE_DEPTHSTENCILSTATE_H_ diff --git a/src/dawn_native/Device.cpp b/src/dawn_native/Device.cpp index 6b0f5de54a..b364f77657 100644 --- a/src/dawn_native/Device.cpp +++ b/src/dawn_native/Device.cpp @@ -34,7 +34,7 @@ #include -namespace backend { +namespace dawn_native { // DeviceBase::Caches @@ -227,4 +227,4 @@ namespace backend { delete error; } -} // namespace backend +} // namespace dawn_native diff --git a/src/dawn_native/Device.h b/src/dawn_native/Device.h index 1a40a85ceb..f10e378d70 100644 --- a/src/dawn_native/Device.h +++ b/src/dawn_native/Device.h @@ -21,7 +21,7 @@ #include "dawn/dawncpp.h" -namespace backend { +namespace dawn_native { using ErrorCallback = void (*)(const char* errorMessage, void* userData); @@ -133,6 +133,6 @@ namespace backend { uint32_t mRefCount = 1; }; -} // namespace backend +} // namespace dawn_native #endif // DAWNNATIVE_DEVICEBASE_H_ diff --git a/src/dawn_native/Error.cpp b/src/dawn_native/Error.cpp index 9d89e6dfc9..06e029063c 100644 --- a/src/dawn_native/Error.cpp +++ b/src/dawn_native/Error.cpp @@ -16,7 +16,7 @@ #include "dawn_native/ErrorData.h" -namespace backend { +namespace dawn_native { ErrorData* MakeError(const char* message, const char* file, const char* function, int line) { ErrorData* error = new ErrorData(message); @@ -28,4 +28,4 @@ namespace backend { error->AppendBacktrace(file, function, line); } -} // namespace backend +} // namespace dawn_native diff --git a/src/dawn_native/Error.h b/src/dawn_native/Error.h index 7d718a8a84..3c2ea46073 100644 --- a/src/dawn_native/Error.h +++ b/src/dawn_native/Error.h @@ -17,7 +17,7 @@ #include "common/Result.h" -namespace backend { +namespace dawn_native { // This is the content of an error value for MaybeError or ResultOrError, split off to its own // file to avoid having all files including headers like and @@ -86,6 +86,6 @@ namespace backend { // Implementation detail of DAWN_RETURN_ERROR ErrorData* MakeError(const char* message, const char* file, const char* function, int line); -} // namespace backend +} // namespace dawn_native #endif // DAWNNATIVE_ERROR_H_ diff --git a/src/dawn_native/ErrorData.cpp b/src/dawn_native/ErrorData.cpp index d7fe868db0..cd8c3be077 100644 --- a/src/dawn_native/ErrorData.cpp +++ b/src/dawn_native/ErrorData.cpp @@ -14,7 +14,7 @@ #include "dawn_native/ErrorData.h" -namespace backend { +namespace dawn_native { ErrorData::ErrorData() = default; @@ -38,4 +38,4 @@ namespace backend { return mBacktrace; } -} // namespace backend +} // namespace dawn_native diff --git a/src/dawn_native/ErrorData.h b/src/dawn_native/ErrorData.h index 2e26d578be..534ce5cd2a 100644 --- a/src/dawn_native/ErrorData.h +++ b/src/dawn_native/ErrorData.h @@ -18,7 +18,7 @@ #include #include -namespace backend { +namespace dawn_native { class ErrorData { public: @@ -40,6 +40,6 @@ namespace backend { std::vector mBacktrace; }; -} // namespace backend +} // namespace dawn_native #endif // DAWNNATIVE_ERRORDATA_H_ diff --git a/src/dawn_native/Forward.h b/src/dawn_native/Forward.h index 7f86640fb6..9a30a1a36e 100644 --- a/src/dawn_native/Forward.h +++ b/src/dawn_native/Forward.h @@ -17,7 +17,7 @@ #include -namespace backend { +namespace dawn_native { class BindGroupBase; class BindGroupBuilder; @@ -63,6 +63,6 @@ namespace backend { class PerStage; enum PushConstantType : uint8_t; -} // namespace backend +} // namespace dawn_native #endif // DAWNNATIVE_FORWARD_H_ diff --git a/src/dawn_native/InputState.cpp b/src/dawn_native/InputState.cpp index 4e14ed5c9c..54cbe97eec 100644 --- a/src/dawn_native/InputState.cpp +++ b/src/dawn_native/InputState.cpp @@ -17,7 +17,7 @@ #include "common/Assert.h" #include "dawn_native/Device.h" -namespace backend { +namespace dawn_native { // InputState helpers @@ -168,4 +168,4 @@ namespace backend { info.stepMode = stepMode; } -} // namespace backend +} // namespace dawn_native diff --git a/src/dawn_native/InputState.h b/src/dawn_native/InputState.h index d0fb19c92e..f3ed944574 100644 --- a/src/dawn_native/InputState.h +++ b/src/dawn_native/InputState.h @@ -25,7 +25,7 @@ #include #include -namespace backend { +namespace dawn_native { size_t IndexFormatSize(dawn::IndexFormat format); uint32_t VertexFormatNumComponents(dawn::VertexFormat format); @@ -81,6 +81,6 @@ namespace backend { std::array mInputInfos; }; -} // namespace backend +} // namespace dawn_native #endif // DAWNNATIVE_INPUTSTATE_H_ diff --git a/src/dawn_native/PassResourceUsage.h b/src/dawn_native/PassResourceUsage.h index a9b88575e1..1824b9d12b 100644 --- a/src/dawn_native/PassResourceUsage.h +++ b/src/dawn_native/PassResourceUsage.h @@ -19,7 +19,7 @@ #include -namespace backend { +namespace dawn_native { class BufferBase; class TextureBase; @@ -35,6 +35,6 @@ namespace backend { std::vector textureUsages; }; -} // namespace backend +} // namespace dawn_native #endif // DAWNNATIVE_PASSRESOURCEUSAGE_H diff --git a/src/dawn_native/PerStage.cpp b/src/dawn_native/PerStage.cpp index e2feb10b14..b29ede1c33 100644 --- a/src/dawn_native/PerStage.cpp +++ b/src/dawn_native/PerStage.cpp @@ -14,7 +14,7 @@ #include "dawn_native/PerStage.h" -namespace backend { +namespace dawn_native { BitSetIterator IterateStages(dawn::ShaderStageBit stages) { std::bitset bits(static_cast(stages)); @@ -26,4 +26,4 @@ namespace backend { return static_cast(1 << static_cast(stage)); } -} // namespace backend +} // namespace dawn_native diff --git a/src/dawn_native/PerStage.h b/src/dawn_native/PerStage.h index 411d5db5c0..e6a0b9d9a1 100644 --- a/src/dawn_native/PerStage.h +++ b/src/dawn_native/PerStage.h @@ -23,7 +23,7 @@ #include -namespace backend { +namespace dawn_native { static_assert(static_cast(dawn::ShaderStage::Vertex) < kNumStages, ""); static_assert(static_cast(dawn::ShaderStage::Fragment) < kNumStages, ""); @@ -72,6 +72,6 @@ namespace backend { std::array mData; }; -} // namespace backend +} // namespace dawn_native #endif // DAWNNATIVE_PERSTAGE_H_ diff --git a/src/dawn_native/Pipeline.cpp b/src/dawn_native/Pipeline.cpp index 6612a46856..6ea7505e97 100644 --- a/src/dawn_native/Pipeline.cpp +++ b/src/dawn_native/Pipeline.cpp @@ -20,7 +20,7 @@ #include "dawn_native/PipelineLayout.h" #include "dawn_native/ShaderModule.h" -namespace backend { +namespace dawn_native { // PipelineBase @@ -118,4 +118,4 @@ namespace backend { mStages[stage].entryPoint = entryPoint; } -} // namespace backend +} // namespace dawn_native diff --git a/src/dawn_native/Pipeline.h b/src/dawn_native/Pipeline.h index 1460e1cf5d..35d4ca3866 100644 --- a/src/dawn_native/Pipeline.h +++ b/src/dawn_native/Pipeline.h @@ -27,7 +27,7 @@ #include #include -namespace backend { +namespace dawn_native { enum PushConstantType : uint8_t { Int, @@ -80,6 +80,6 @@ namespace backend { PerStage mStages; }; -} // namespace backend +} // namespace dawn_native #endif // DAWNNATIVE_PIPELINE_H_ diff --git a/src/dawn_native/PipelineLayout.cpp b/src/dawn_native/PipelineLayout.cpp index 5629bcb3b1..75ec3b052f 100644 --- a/src/dawn_native/PipelineLayout.cpp +++ b/src/dawn_native/PipelineLayout.cpp @@ -18,7 +18,7 @@ #include "dawn_native/BindGroupLayout.h" #include "dawn_native/Device.h" -namespace backend { +namespace dawn_native { MaybeError ValidatePipelineLayoutDescriptor(DeviceBase*, const dawn::PipelineLayoutDescriptor* descriptor) { @@ -72,4 +72,4 @@ namespace backend { return mDevice; } -} // namespace backend +} // namespace dawn_native diff --git a/src/dawn_native/PipelineLayout.h b/src/dawn_native/PipelineLayout.h index c165c1c48d..31ac6cfbab 100644 --- a/src/dawn_native/PipelineLayout.h +++ b/src/dawn_native/PipelineLayout.h @@ -25,7 +25,7 @@ #include #include -namespace backend { +namespace dawn_native { MaybeError ValidatePipelineLayoutDescriptor(DeviceBase*, const dawn::PipelineLayoutDescriptor* descriptor); @@ -55,6 +55,6 @@ namespace backend { std::bitset mMask; }; -} // namespace backend +} // namespace dawn_native #endif // DAWNNATIVE_PIPELINELAYOUT_H_ diff --git a/src/dawn_native/Queue.cpp b/src/dawn_native/Queue.cpp index 803b166f95..7733e1a744 100644 --- a/src/dawn_native/Queue.cpp +++ b/src/dawn_native/Queue.cpp @@ -17,7 +17,7 @@ #include "dawn_native/CommandBuffer.h" #include "dawn_native/Device.h" -namespace backend { +namespace dawn_native { // QueueBase @@ -33,4 +33,4 @@ namespace backend { return {}; } -} // namespace backend +} // namespace dawn_native diff --git a/src/dawn_native/Queue.h b/src/dawn_native/Queue.h index 9db85e6c65..3284d8e4cb 100644 --- a/src/dawn_native/Queue.h +++ b/src/dawn_native/Queue.h @@ -22,7 +22,7 @@ #include "dawn/dawncpp.h" -namespace backend { +namespace dawn_native { class QueueBase : public RefCounted { public: @@ -47,6 +47,6 @@ namespace backend { DeviceBase* mDevice; }; -} // namespace backend +} // namespace dawn_native #endif // DAWNNATIVE_QUEUE_H_ diff --git a/src/dawn_native/RefCounted.cpp b/src/dawn_native/RefCounted.cpp index da543fed19..64a4817b04 100644 --- a/src/dawn_native/RefCounted.cpp +++ b/src/dawn_native/RefCounted.cpp @@ -16,7 +16,7 @@ #include "common/Assert.h" -namespace backend { +namespace dawn_native { RefCounted::RefCounted() { } @@ -74,4 +74,4 @@ namespace backend { } } -} // namespace backend +} // namespace dawn_native diff --git a/src/dawn_native/RefCounted.h b/src/dawn_native/RefCounted.h index 1e9557f17a..ccc63f9344 100644 --- a/src/dawn_native/RefCounted.h +++ b/src/dawn_native/RefCounted.h @@ -17,7 +17,7 @@ #include -namespace backend { +namespace dawn_native { class RefCounted { public: @@ -124,6 +124,6 @@ namespace backend { T* mPointee = nullptr; }; -} // namespace backend +} // namespace dawn_native #endif // DAWNNATIVE_REFCOUNTED_H_ diff --git a/src/dawn_native/RenderPassDescriptor.cpp b/src/dawn_native/RenderPassDescriptor.cpp index 7ec67a7be9..12212a2267 100644 --- a/src/dawn_native/RenderPassDescriptor.cpp +++ b/src/dawn_native/RenderPassDescriptor.cpp @@ -19,7 +19,7 @@ #include "dawn_native/Device.h" #include "dawn_native/Texture.h" -namespace backend { +namespace dawn_native { // RenderPassDescriptor @@ -178,4 +178,4 @@ namespace backend { mDepthStencilAttachment.clearStencil = clearStencil; } -} // namespace backend +} // namespace dawn_native diff --git a/src/dawn_native/RenderPassDescriptor.h b/src/dawn_native/RenderPassDescriptor.h index 9e0d21d491..cdc5d92a0d 100644 --- a/src/dawn_native/RenderPassDescriptor.h +++ b/src/dawn_native/RenderPassDescriptor.h @@ -26,7 +26,7 @@ #include #include -namespace backend { +namespace dawn_native { struct RenderPassColorAttachmentInfo { dawn::LoadOp loadOp; @@ -104,6 +104,6 @@ namespace backend { uint32_t mHeight = 0; }; -} // namespace backend +} // namespace dawn_native #endif // DAWNNATIVE_RENDERPASS_H_ diff --git a/src/dawn_native/RenderPipeline.cpp b/src/dawn_native/RenderPipeline.cpp index b333266086..3b5dbc616e 100644 --- a/src/dawn_native/RenderPipeline.cpp +++ b/src/dawn_native/RenderPipeline.cpp @@ -22,7 +22,7 @@ #include "dawn_native/RenderPassDescriptor.h" #include "dawn_native/Texture.h" -namespace backend { +namespace dawn_native { // RenderPipelineBase @@ -218,4 +218,4 @@ namespace backend { mPrimitiveTopology = primitiveTopology; } -} // namespace backend +} // namespace dawn_native diff --git a/src/dawn_native/RenderPipeline.h b/src/dawn_native/RenderPipeline.h index a5cdc1ab3e..b3580dbee3 100644 --- a/src/dawn_native/RenderPipeline.h +++ b/src/dawn_native/RenderPipeline.h @@ -25,7 +25,7 @@ #include #include -namespace backend { +namespace dawn_native { class RenderPipelineBase : public RefCounted, public PipelineBase { public: @@ -91,6 +91,6 @@ namespace backend { dawn::TextureFormat mDepthStencilFormat; }; -} // namespace backend +} // namespace dawn_native #endif // DAWNNATIVE_RENDERPIPELINE_H_ diff --git a/src/dawn_native/Sampler.cpp b/src/dawn_native/Sampler.cpp index cd8684f3f0..b5f418ff9a 100644 --- a/src/dawn_native/Sampler.cpp +++ b/src/dawn_native/Sampler.cpp @@ -17,7 +17,7 @@ #include "dawn_native/Device.h" #include "dawn_native/ValidationUtils_autogen.h" -namespace backend { +namespace dawn_native { MaybeError ValidateSamplerDescriptor(DeviceBase*, const dawn::SamplerDescriptor* descriptor) { DAWN_TRY_ASSERT(descriptor->nextInChain == nullptr, "nextInChain must be nullptr"); @@ -35,4 +35,4 @@ namespace backend { SamplerBase::SamplerBase(DeviceBase*, const dawn::SamplerDescriptor*) { } -} // namespace backend +} // namespace dawn_native diff --git a/src/dawn_native/Sampler.h b/src/dawn_native/Sampler.h index 816db69558..7573043bda 100644 --- a/src/dawn_native/Sampler.h +++ b/src/dawn_native/Sampler.h @@ -20,7 +20,7 @@ #include "dawn/dawncpp.h" -namespace backend { +namespace dawn_native { class DeviceBase; @@ -32,6 +32,6 @@ namespace backend { SamplerBase(DeviceBase* device, const dawn::SamplerDescriptor* descriptor); }; -} // namespace backend +} // namespace dawn_native #endif // DAWNNATIVE_SAMPLER_H_ diff --git a/src/dawn_native/ShaderModule.cpp b/src/dawn_native/ShaderModule.cpp index 9e3662153f..193ebf0a44 100644 --- a/src/dawn_native/ShaderModule.cpp +++ b/src/dawn_native/ShaderModule.cpp @@ -21,7 +21,7 @@ #include -namespace backend { +namespace dawn_native { ShaderModuleBase::ShaderModuleBase(ShaderModuleBuilder* builder) : mDevice(builder->mDevice) { } @@ -238,4 +238,4 @@ namespace backend { mSpirv.assign(code, code + codeSize); } -} // namespace backend +} // namespace dawn_native diff --git a/src/dawn_native/ShaderModule.h b/src/dawn_native/ShaderModule.h index 3084104e02..6ae92755d2 100644 --- a/src/dawn_native/ShaderModule.h +++ b/src/dawn_native/ShaderModule.h @@ -30,7 +30,7 @@ namespace spirv_cross { class Compiler; } -namespace backend { +namespace dawn_native { class ShaderModuleBase : public RefCounted { public: @@ -92,6 +92,6 @@ namespace backend { std::vector mSpirv; }; -} // namespace backend +} // namespace dawn_native #endif // DAWNNATIVE_SHADERMODULE_H_ diff --git a/src/dawn_native/SwapChain.cpp b/src/dawn_native/SwapChain.cpp index 267acee2b1..8dc96e8e4e 100644 --- a/src/dawn_native/SwapChain.cpp +++ b/src/dawn_native/SwapChain.cpp @@ -17,7 +17,7 @@ #include "dawn_native/Device.h" #include "dawn_native/Texture.h" -namespace backend { +namespace dawn_native { // SwapChain @@ -117,4 +117,4 @@ namespace backend { mImplementation = impl; } -} // namespace backend +} // namespace dawn_native diff --git a/src/dawn_native/SwapChain.h b/src/dawn_native/SwapChain.h index 5c751ce889..29bbf23868 100644 --- a/src/dawn_native/SwapChain.h +++ b/src/dawn_native/SwapChain.h @@ -22,7 +22,7 @@ #include "dawn/dawn_wsi.h" #include "dawn/dawncpp.h" -namespace backend { +namespace dawn_native { class SwapChainBase : public RefCounted { public: @@ -68,6 +68,6 @@ namespace backend { dawnSwapChainImplementation mImplementation = {}; }; -} // namespace backend +} // namespace dawn_native #endif // DAWNNATIVE_SWAPCHAIN_H_ diff --git a/src/dawn_native/Texture.cpp b/src/dawn_native/Texture.cpp index afb0182bc8..b756c06589 100644 --- a/src/dawn_native/Texture.cpp +++ b/src/dawn_native/Texture.cpp @@ -17,7 +17,7 @@ #include "common/Assert.h" #include "dawn_native/Device.h" -namespace backend { +namespace dawn_native { uint32_t TextureFormatPixelSize(dawn::TextureFormat format) { switch (format) { @@ -215,4 +215,4 @@ namespace backend { return mDevice->CreateTextureView(this); } -} // namespace backend +} // namespace dawn_native diff --git a/src/dawn_native/Texture.h b/src/dawn_native/Texture.h index 28c11ccc99..3fc283704c 100644 --- a/src/dawn_native/Texture.h +++ b/src/dawn_native/Texture.h @@ -21,7 +21,7 @@ #include "dawn/dawncpp.h" -namespace backend { +namespace dawn_native { uint32_t TextureFormatPixelSize(dawn::TextureFormat format); bool TextureFormatHasDepth(dawn::TextureFormat format); @@ -111,6 +111,6 @@ namespace backend { Ref mTexture; }; -} // namespace backend +} // namespace dawn_native #endif // DAWNNATIVE_TEXTURE_H_ diff --git a/src/dawn_native/ToBackend.h b/src/dawn_native/ToBackend.h index 7cb0d43481..1e64f2c80c 100644 --- a/src/dawn_native/ToBackend.h +++ b/src/dawn_native/ToBackend.h @@ -17,7 +17,7 @@ #include "dawn_native/Forward.h" -namespace backend { +namespace dawn_native { // ToBackendTraits implements the mapping from base type to member type of BackendTraits template @@ -149,6 +149,6 @@ namespace backend { common); } -} // namespace backend +} // namespace dawn_native #endif // DAWNNATIVE_TOBACKEND_H_ diff --git a/src/dawn_native/d3d12/BindGroupD3D12.cpp b/src/dawn_native/d3d12/BindGroupD3D12.cpp index 636935924b..a25ec692ee 100644 --- a/src/dawn_native/d3d12/BindGroupD3D12.cpp +++ b/src/dawn_native/d3d12/BindGroupD3D12.cpp @@ -21,7 +21,7 @@ #include "dawn_native/d3d12/DeviceD3D12.h" -namespace backend { namespace d3d12 { +namespace dawn_native { namespace d3d12 { BindGroup::BindGroup(Device* device, BindGroupBuilder* builder) : BindGroupBase(builder), mDevice(device) { @@ -96,4 +96,4 @@ namespace backend { namespace d3d12 { return mHeapSerial; } -}} // namespace backend::d3d12 +}} // namespace dawn_native::d3d12 diff --git a/src/dawn_native/d3d12/BindGroupD3D12.h b/src/dawn_native/d3d12/BindGroupD3D12.h index ae2ab74b19..819ff8cb41 100644 --- a/src/dawn_native/d3d12/BindGroupD3D12.h +++ b/src/dawn_native/d3d12/BindGroupD3D12.h @@ -21,7 +21,7 @@ #include "dawn_native/d3d12/DescriptorHeapAllocator.h" -namespace backend { namespace d3d12 { +namespace dawn_native { namespace d3d12 { class Device; @@ -47,6 +47,6 @@ namespace backend { namespace d3d12 { uint64_t mHeapSerial = 0; }; -}} // namespace backend::d3d12 +}} // namespace dawn_native::d3d12 #endif // DAWNNATIVE_D3D12_BINDGROUPD3D12_H_ diff --git a/src/dawn_native/d3d12/BindGroupLayoutD3D12.cpp b/src/dawn_native/d3d12/BindGroupLayoutD3D12.cpp index 36e70d9673..08775bcef8 100644 --- a/src/dawn_native/d3d12/BindGroupLayoutD3D12.cpp +++ b/src/dawn_native/d3d12/BindGroupLayoutD3D12.cpp @@ -17,7 +17,7 @@ #include "common/BitSetIterator.h" #include "dawn_native/d3d12/DeviceD3D12.h" -namespace backend { namespace d3d12 { +namespace dawn_native { namespace d3d12 { BindGroupLayout::BindGroupLayout(Device* device, const dawn::BindGroupLayoutDescriptor* descriptor) @@ -131,4 +131,4 @@ namespace backend { namespace d3d12 { return &mRanges[Sampler]; } -}} // namespace backend::d3d12 +}} // namespace dawn_native::d3d12 diff --git a/src/dawn_native/d3d12/BindGroupLayoutD3D12.h b/src/dawn_native/d3d12/BindGroupLayoutD3D12.h index 8189da07df..c55fbd2ad3 100644 --- a/src/dawn_native/d3d12/BindGroupLayoutD3D12.h +++ b/src/dawn_native/d3d12/BindGroupLayoutD3D12.h @@ -19,7 +19,7 @@ #include "dawn_native/d3d12/d3d12_platform.h" -namespace backend { namespace d3d12 { +namespace dawn_native { namespace d3d12 { class Device; @@ -49,6 +49,6 @@ namespace backend { namespace d3d12 { D3D12_DESCRIPTOR_RANGE mRanges[DescriptorType::Count]; }; -}} // namespace backend::d3d12 +}} // namespace dawn_native::d3d12 #endif // DAWNNATIVE_D3D12_BINDGROUPLAYOUTD3D12_H_ diff --git a/src/dawn_native/d3d12/BlendStateD3D12.cpp b/src/dawn_native/d3d12/BlendStateD3D12.cpp index 56d9330413..862315eb0c 100644 --- a/src/dawn_native/d3d12/BlendStateD3D12.cpp +++ b/src/dawn_native/d3d12/BlendStateD3D12.cpp @@ -17,7 +17,7 @@ #include "common/Assert.h" #include "dawn_native/d3d12/DeviceD3D12.h" -namespace backend { namespace d3d12 { +namespace dawn_native { namespace d3d12 { namespace { D3D12_BLEND D3D12Blend(dawn::BlendFactor factor) { @@ -105,4 +105,4 @@ namespace backend { namespace d3d12 { return mBlendDesc; } -}} // namespace backend::d3d12 +}} // namespace dawn_native::d3d12 diff --git a/src/dawn_native/d3d12/BlendStateD3D12.h b/src/dawn_native/d3d12/BlendStateD3D12.h index 938189e3ce..ea1a32da07 100644 --- a/src/dawn_native/d3d12/BlendStateD3D12.h +++ b/src/dawn_native/d3d12/BlendStateD3D12.h @@ -19,7 +19,7 @@ #include "dawn_native/d3d12/d3d12_platform.h" -namespace backend { namespace d3d12 { +namespace dawn_native { namespace d3d12 { class BlendState : public BlendStateBase { public: @@ -31,6 +31,6 @@ namespace backend { namespace d3d12 { D3D12_RENDER_TARGET_BLEND_DESC mBlendDesc; }; -}} // namespace backend::d3d12 +}} // namespace dawn_native::d3d12 #endif // DAWNNATIVE_D3D12_BLENDSTATED3D12_H_ diff --git a/src/dawn_native/d3d12/BufferD3D12.cpp b/src/dawn_native/d3d12/BufferD3D12.cpp index de7acd84d2..e21e30af79 100644 --- a/src/dawn_native/d3d12/BufferD3D12.cpp +++ b/src/dawn_native/d3d12/BufferD3D12.cpp @@ -21,7 +21,7 @@ #include "dawn_native/d3d12/ResourceAllocator.h" #include "dawn_native/d3d12/ResourceUploader.h" -namespace backend { namespace d3d12 { +namespace dawn_native { namespace d3d12 { namespace { D3D12_RESOURCE_FLAGS D3D12ResourceFlags(dawn::BufferUsageBit usage) { @@ -249,4 +249,4 @@ namespace backend { namespace d3d12 { mInflightRequests.ClearUpTo(finishedSerial); } -}} // namespace backend::d3d12 +}} // namespace dawn_native::d3d12 diff --git a/src/dawn_native/d3d12/BufferD3D12.h b/src/dawn_native/d3d12/BufferD3D12.h index d5ddfe21af..a00c7a586a 100644 --- a/src/dawn_native/d3d12/BufferD3D12.h +++ b/src/dawn_native/d3d12/BufferD3D12.h @@ -20,7 +20,7 @@ #include "dawn_native/d3d12/d3d12_platform.h" -namespace backend { namespace d3d12 { +namespace dawn_native { namespace d3d12 { class Device; @@ -82,6 +82,6 @@ namespace backend { namespace d3d12 { SerialQueue mInflightRequests; }; -}} // namespace backend::d3d12 +}} // namespace dawn_native::d3d12 #endif // DAWNNATIVE_D3D12_BUFFERD3D12_H_ diff --git a/src/dawn_native/d3d12/CommandAllocatorManager.cpp b/src/dawn_native/d3d12/CommandAllocatorManager.cpp index 14f9280be0..47072fcf6c 100644 --- a/src/dawn_native/d3d12/CommandAllocatorManager.cpp +++ b/src/dawn_native/d3d12/CommandAllocatorManager.cpp @@ -19,7 +19,7 @@ #include "common/Assert.h" #include "common/BitSetIterator.h" -namespace backend { namespace d3d12 { +namespace dawn_native { namespace d3d12 { CommandAllocatorManager::CommandAllocatorManager(Device* device) : device(device), mAllocatorCount(0) { @@ -66,4 +66,4 @@ namespace backend { namespace d3d12 { mInFlightCommandAllocators.ClearUpTo(lastCompletedSerial); } -}} // namespace backend::d3d12 +}} // namespace dawn_native::d3d12 diff --git a/src/dawn_native/d3d12/CommandAllocatorManager.h b/src/dawn_native/d3d12/CommandAllocatorManager.h index ec45ee6daf..fd7c8ce27d 100644 --- a/src/dawn_native/d3d12/CommandAllocatorManager.h +++ b/src/dawn_native/d3d12/CommandAllocatorManager.h @@ -21,7 +21,7 @@ #include -namespace backend { namespace d3d12 { +namespace dawn_native { namespace d3d12 { class Device; @@ -51,6 +51,6 @@ namespace backend { namespace d3d12 { SerialQueue mInFlightCommandAllocators; }; -}} // namespace backend::d3d12 +}} // namespace dawn_native::d3d12 #endif // DAWNNATIVE_D3D12_COMMANDALLOCATORMANAGER_H_ diff --git a/src/dawn_native/d3d12/CommandBufferD3D12.cpp b/src/dawn_native/d3d12/CommandBufferD3D12.cpp index b882365599..e4d1975143 100644 --- a/src/dawn_native/d3d12/CommandBufferD3D12.cpp +++ b/src/dawn_native/d3d12/CommandBufferD3D12.cpp @@ -31,7 +31,7 @@ #include "dawn_native/d3d12/TextureCopySplitter.h" #include "dawn_native/d3d12/TextureD3D12.h" -namespace backend { namespace d3d12 { +namespace dawn_native { namespace d3d12 { namespace { DXGI_FORMAT DXGIIndexFormat(dawn::IndexFormat format) { @@ -629,4 +629,4 @@ namespace backend { namespace d3d12 { } } -}} // namespace backend::d3d12 +}} // namespace dawn_native::d3d12 diff --git a/src/dawn_native/d3d12/CommandBufferD3D12.h b/src/dawn_native/d3d12/CommandBufferD3D12.h index db4655aa01..f737b78384 100644 --- a/src/dawn_native/d3d12/CommandBufferD3D12.h +++ b/src/dawn_native/d3d12/CommandBufferD3D12.h @@ -20,7 +20,7 @@ #include "dawn_native/d3d12/d3d12_platform.h" -namespace backend { namespace d3d12 { +namespace dawn_native { namespace d3d12 { class Device; class RenderPassDescriptor; @@ -45,6 +45,6 @@ namespace backend { namespace d3d12 { std::vector mPassResourceUsages; }; -}} // namespace backend::d3d12 +}} // namespace dawn_native::d3d12 #endif // DAWNNATIVE_D3D12_COMMANDBUFFERD3D12_H_ diff --git a/src/dawn_native/d3d12/ComputePipelineD3D12.cpp b/src/dawn_native/d3d12/ComputePipelineD3D12.cpp index e5c2426306..0535a650c4 100644 --- a/src/dawn_native/d3d12/ComputePipelineD3D12.cpp +++ b/src/dawn_native/d3d12/ComputePipelineD3D12.cpp @@ -21,7 +21,7 @@ #include -namespace backend { namespace d3d12 { +namespace dawn_native { namespace d3d12 { ComputePipeline::ComputePipeline(ComputePipelineBuilder* builder) : ComputePipelineBase(builder), mDevice(ToBackend(builder->GetDevice())) { @@ -65,4 +65,4 @@ namespace backend { namespace d3d12 { return mPipelineState; } -}} // namespace backend::d3d12 +}} // namespace dawn_native::d3d12 diff --git a/src/dawn_native/d3d12/ComputePipelineD3D12.h b/src/dawn_native/d3d12/ComputePipelineD3D12.h index a35a13e7e2..e3335c3774 100644 --- a/src/dawn_native/d3d12/ComputePipelineD3D12.h +++ b/src/dawn_native/d3d12/ComputePipelineD3D12.h @@ -19,7 +19,7 @@ #include "dawn_native/d3d12/d3d12_platform.h" -namespace backend { namespace d3d12 { +namespace dawn_native { namespace d3d12 { class Device; @@ -35,6 +35,6 @@ namespace backend { namespace d3d12 { Device* mDevice = nullptr; }; -}} // namespace backend::d3d12 +}} // namespace dawn_native::d3d12 #endif // DAWNNATIVE_D3D12_COMPUTEPIPELINED3D12_H_ diff --git a/src/dawn_native/d3d12/DepthStencilStateD3D12.cpp b/src/dawn_native/d3d12/DepthStencilStateD3D12.cpp index 3a426be004..b651281d25 100644 --- a/src/dawn_native/d3d12/DepthStencilStateD3D12.cpp +++ b/src/dawn_native/d3d12/DepthStencilStateD3D12.cpp @@ -16,7 +16,7 @@ #include "common/BitSetIterator.h" -namespace backend { namespace d3d12 { +namespace dawn_native { namespace d3d12 { static D3D12_STENCIL_OP StencilOp(dawn::StencilOperation op) { switch (op) { @@ -65,7 +65,7 @@ namespace backend { namespace d3d12 { } static D3D12_DEPTH_STENCILOP_DESC StencilOpDesc( - backend::DepthStencilStateBase::StencilFaceInfo faceInfo) { + DepthStencilStateBase::StencilFaceInfo faceInfo) { D3D12_DEPTH_STENCILOP_DESC desc; desc.StencilFailOp = StencilOp(faceInfo.stencilFail); @@ -95,4 +95,4 @@ namespace backend { namespace d3d12 { return mDepthStencilDescriptor; } -}} // namespace backend::d3d12 +}} // namespace dawn_native::d3d12 diff --git a/src/dawn_native/d3d12/DepthStencilStateD3D12.h b/src/dawn_native/d3d12/DepthStencilStateD3D12.h index 5db9c38794..898c7a7817 100644 --- a/src/dawn_native/d3d12/DepthStencilStateD3D12.h +++ b/src/dawn_native/d3d12/DepthStencilStateD3D12.h @@ -19,7 +19,7 @@ #include "dawn_native/d3d12/d3d12_platform.h" -namespace backend { namespace d3d12 { +namespace dawn_native { namespace d3d12 { class Device; @@ -34,6 +34,6 @@ namespace backend { namespace d3d12 { D3D12_DEPTH_STENCIL_DESC mDepthStencilDescriptor; }; -}} // namespace backend::d3d12 +}} // namespace dawn_native::d3d12 #endif // DAWNNATIVE_D3D12_DEPTHSTENCILSTATED3D12_H_ diff --git a/src/dawn_native/d3d12/DescriptorHeapAllocator.cpp b/src/dawn_native/d3d12/DescriptorHeapAllocator.cpp index a304b37f56..9374dae33d 100644 --- a/src/dawn_native/d3d12/DescriptorHeapAllocator.cpp +++ b/src/dawn_native/d3d12/DescriptorHeapAllocator.cpp @@ -17,7 +17,7 @@ #include "common/Assert.h" #include "dawn_native/d3d12/DeviceD3D12.h" -namespace backend { namespace d3d12 { +namespace dawn_native { namespace d3d12 { DescriptorHeapHandle::DescriptorHeapHandle() : mDescriptorHeap(nullptr), mSizeIncrement(0), mOffset(0) { @@ -129,4 +129,4 @@ namespace backend { namespace d3d12 { void DescriptorHeapAllocator::Release(DescriptorHeapHandle handle) { mReleasedHandles.Enqueue(handle, mDevice->GetSerial()); } -}} // namespace backend::d3d12 +}} // namespace dawn_native::d3d12 diff --git a/src/dawn_native/d3d12/DescriptorHeapAllocator.h b/src/dawn_native/d3d12/DescriptorHeapAllocator.h index e79c299fae..f1ba5029f8 100644 --- a/src/dawn_native/d3d12/DescriptorHeapAllocator.h +++ b/src/dawn_native/d3d12/DescriptorHeapAllocator.h @@ -21,7 +21,7 @@ #include #include "common/SerialQueue.h" -namespace backend { namespace d3d12 { +namespace dawn_native { namespace d3d12 { class Device; @@ -78,6 +78,6 @@ namespace backend { namespace d3d12 { SerialQueue mReleasedHandles; }; -}} // namespace backend::d3d12 +}} // namespace dawn_native::d3d12 #endif // DAWNNATIVE_D3D12_DESCRIPTORHEAPALLOCATOR_H_ diff --git a/src/dawn_native/d3d12/DeviceD3D12.cpp b/src/dawn_native/d3d12/DeviceD3D12.cpp index 6f0d11f320..a2aba668a9 100644 --- a/src/dawn_native/d3d12/DeviceD3D12.cpp +++ b/src/dawn_native/d3d12/DeviceD3D12.cpp @@ -38,7 +38,7 @@ #include "dawn_native/d3d12/SwapChainD3D12.h" #include "dawn_native/d3d12/TextureD3D12.h" -namespace backend { namespace d3d12 { +namespace dawn_native { namespace d3d12 { dawnProcTable GetNonValidatingProcs(); dawnProcTable GetValidatingProcs(); @@ -322,4 +322,4 @@ namespace backend { namespace d3d12 { return new TextureView(builder); } -}} // namespace backend::d3d12 +}} // namespace dawn_native::d3d12 diff --git a/src/dawn_native/d3d12/DeviceD3D12.h b/src/dawn_native/d3d12/DeviceD3D12.h index f666397a3b..d0180e3fc9 100644 --- a/src/dawn_native/d3d12/DeviceD3D12.h +++ b/src/dawn_native/d3d12/DeviceD3D12.h @@ -22,7 +22,7 @@ #include "dawn_native/d3d12/Forward.h" #include "dawn_native/d3d12/d3d12_platform.h" -namespace backend { namespace d3d12 { +namespace dawn_native { namespace d3d12 { class CommandAllocatorManager; class DescriptorHeapAllocator; @@ -108,6 +108,6 @@ namespace backend { namespace d3d12 { SerialQueue> mUsedComObjectRefs; }; -}} // namespace backend::d3d12 +}} // namespace dawn_native::d3d12 #endif // DAWNNATIVE_D3D12_DEVICED3D12_H_ diff --git a/src/dawn_native/d3d12/Forward.h b/src/dawn_native/d3d12/Forward.h index 03562bff95..80cf0d4241 100644 --- a/src/dawn_native/d3d12/Forward.h +++ b/src/dawn_native/d3d12/Forward.h @@ -17,7 +17,7 @@ #include "dawn_native/ToBackend.h" -namespace backend { namespace d3d12 { +namespace dawn_native { namespace d3d12 { class BindGroup; class BindGroupLayout; @@ -66,6 +66,6 @@ namespace backend { namespace d3d12 { return ToBackendBase(common); } -}} // namespace backend::d3d12 +}} // namespace dawn_native::d3d12 #endif // DAWNNATIVE_D3D12_FORWARD_H_ diff --git a/src/dawn_native/d3d12/InputStateD3D12.cpp b/src/dawn_native/d3d12/InputStateD3D12.cpp index a8c8626039..5ae5b47127 100644 --- a/src/dawn_native/d3d12/InputStateD3D12.cpp +++ b/src/dawn_native/d3d12/InputStateD3D12.cpp @@ -16,7 +16,7 @@ #include "common/BitSetIterator.h" -namespace backend { namespace d3d12 { +namespace dawn_native { namespace d3d12 { static DXGI_FORMAT VertexFormatType(dawn::VertexFormat format) { switch (format) { @@ -101,4 +101,4 @@ namespace backend { namespace d3d12 { return mInputLayoutDescriptor; } -}} // namespace backend::d3d12 +}} // namespace dawn_native::d3d12 diff --git a/src/dawn_native/d3d12/InputStateD3D12.h b/src/dawn_native/d3d12/InputStateD3D12.h index 35a3e0cae7..a97746f30a 100644 --- a/src/dawn_native/d3d12/InputStateD3D12.h +++ b/src/dawn_native/d3d12/InputStateD3D12.h @@ -19,7 +19,7 @@ #include "dawn_native/d3d12/d3d12_platform.h" -namespace backend { namespace d3d12 { +namespace dawn_native { namespace d3d12 { class Device; @@ -35,6 +35,6 @@ namespace backend { namespace d3d12 { D3D12_INPUT_ELEMENT_DESC mInputElementDescriptors[kMaxVertexAttributes]; }; -}} // namespace backend::d3d12 +}} // namespace dawn_native::d3d12 #endif // DAWNNATIVE_D3D12_INPUTSTATED3D12_H_ diff --git a/src/dawn_native/d3d12/NativeSwapChainImplD3D12.cpp b/src/dawn_native/d3d12/NativeSwapChainImplD3D12.cpp index eb793b34fd..99ac8f8091 100644 --- a/src/dawn_native/d3d12/NativeSwapChainImplD3D12.cpp +++ b/src/dawn_native/d3d12/NativeSwapChainImplD3D12.cpp @@ -18,7 +18,7 @@ #include "dawn_native/d3d12/DeviceD3D12.h" #include "dawn_native/d3d12/TextureD3D12.h" -namespace backend { namespace d3d12 { +namespace dawn_native { namespace d3d12 { namespace { DXGI_USAGE D3D12SwapChainBufferUsage(dawnTextureUsageBit allowedUsages) { @@ -115,4 +115,4 @@ namespace backend { namespace d3d12 { return dawn::TextureFormat::R8G8B8A8Unorm; } -}} // namespace backend::d3d12 +}} // namespace dawn_native::d3d12 diff --git a/src/dawn_native/d3d12/NativeSwapChainImplD3D12.h b/src/dawn_native/d3d12/NativeSwapChainImplD3D12.h index 80d3778f6e..62d0afa10a 100644 --- a/src/dawn_native/d3d12/NativeSwapChainImplD3D12.h +++ b/src/dawn_native/d3d12/NativeSwapChainImplD3D12.h @@ -22,7 +22,7 @@ #include -namespace backend { namespace d3d12 { +namespace dawn_native { namespace d3d12 { class Device; @@ -53,6 +53,6 @@ namespace backend { namespace d3d12 { uint32_t mCurrentBuffer; }; -}} // namespace backend::d3d12 +}} // namespace dawn_native::d3d12 #endif // DAWNNATIVE_D3D12_NATIVESWAPCHAINIMPLD3D12_H_ diff --git a/src/dawn_native/d3d12/PipelineLayoutD3D12.cpp b/src/dawn_native/d3d12/PipelineLayoutD3D12.cpp index 9d72689a29..b5c62a21fa 100644 --- a/src/dawn_native/d3d12/PipelineLayoutD3D12.cpp +++ b/src/dawn_native/d3d12/PipelineLayoutD3D12.cpp @@ -21,7 +21,7 @@ using Microsoft::WRL::ComPtr; -namespace backend { namespace d3d12 { +namespace dawn_native { namespace d3d12 { PipelineLayout::PipelineLayout(Device* device, const dawn::PipelineLayoutDescriptor* descriptor) : PipelineLayoutBase(device, descriptor) { @@ -112,4 +112,4 @@ namespace backend { namespace d3d12 { ComPtr PipelineLayout::GetRootSignature() { return mRootSignature; } -}} // namespace backend::d3d12 +}} // namespace dawn_native::d3d12 diff --git a/src/dawn_native/d3d12/PipelineLayoutD3D12.h b/src/dawn_native/d3d12/PipelineLayoutD3D12.h index 8fb0913cbf..b0f5f45787 100644 --- a/src/dawn_native/d3d12/PipelineLayoutD3D12.h +++ b/src/dawn_native/d3d12/PipelineLayoutD3D12.h @@ -19,7 +19,7 @@ #include "dawn_native/d3d12/d3d12_platform.h" -namespace backend { namespace d3d12 { +namespace dawn_native { namespace d3d12 { class Device; @@ -39,6 +39,6 @@ namespace backend { namespace d3d12 { ComPtr mRootSignature; }; -}} // namespace backend::d3d12 +}} // namespace dawn_native::d3d12 #endif // DAWNNATIVE_D3D12_PIPELINELAYOUTD3D12_H_ diff --git a/src/dawn_native/d3d12/QueueD3D12.cpp b/src/dawn_native/d3d12/QueueD3D12.cpp index 2e3d27833e..7fdf8ba93f 100644 --- a/src/dawn_native/d3d12/QueueD3D12.cpp +++ b/src/dawn_native/d3d12/QueueD3D12.cpp @@ -17,7 +17,7 @@ #include "dawn_native/d3d12/CommandBufferD3D12.h" #include "dawn_native/d3d12/DeviceD3D12.h" -namespace backend { namespace d3d12 { +namespace dawn_native { namespace d3d12 { Queue::Queue(Device* device) : QueueBase(device) { } @@ -38,4 +38,4 @@ namespace backend { namespace d3d12 { device->NextSerial(); } -}} // namespace backend::d3d12 +}} // namespace dawn_native::d3d12 diff --git a/src/dawn_native/d3d12/QueueD3D12.h b/src/dawn_native/d3d12/QueueD3D12.h index dfe6ddbdca..c0dd2cb56d 100644 --- a/src/dawn_native/d3d12/QueueD3D12.h +++ b/src/dawn_native/d3d12/QueueD3D12.h @@ -19,7 +19,7 @@ #include "dawn_native/d3d12/d3d12_platform.h" -namespace backend { namespace d3d12 { +namespace dawn_native { namespace d3d12 { class Device; class CommandBuffer; @@ -35,6 +35,6 @@ namespace backend { namespace d3d12 { ComPtr mCommandList; }; -}} // namespace backend::d3d12 +}} // namespace dawn_native::d3d12 #endif // DAWNNATIVE_D3D12_QUEUED3D12_H_ diff --git a/src/dawn_native/d3d12/RenderPassDescriptorD3D12.cpp b/src/dawn_native/d3d12/RenderPassDescriptorD3D12.cpp index 98575b551f..4438a9f873 100644 --- a/src/dawn_native/d3d12/RenderPassDescriptorD3D12.cpp +++ b/src/dawn_native/d3d12/RenderPassDescriptorD3D12.cpp @@ -18,7 +18,7 @@ #include "dawn_native/d3d12/DeviceD3D12.h" #include "dawn_native/d3d12/TextureD3D12.h" -namespace backend { namespace d3d12 { +namespace dawn_native { namespace d3d12 { RenderPassDescriptor::RenderPassDescriptor(Device* device, RenderPassDescriptorBuilder* builder) : RenderPassDescriptorBase(builder), mDevice(device) { @@ -79,4 +79,4 @@ namespace backend { namespace d3d12 { return mDsvHeap.GetCPUHandle(0); } -}} // namespace backend::d3d12 +}} // namespace dawn_native::d3d12 diff --git a/src/dawn_native/d3d12/RenderPassDescriptorD3D12.h b/src/dawn_native/d3d12/RenderPassDescriptorD3D12.h index 5e96c8ec5c..bfafd243fe 100644 --- a/src/dawn_native/d3d12/RenderPassDescriptorD3D12.h +++ b/src/dawn_native/d3d12/RenderPassDescriptorD3D12.h @@ -24,7 +24,7 @@ #include #include -namespace backend { namespace d3d12 { +namespace dawn_native { namespace d3d12 { class Device; @@ -47,6 +47,6 @@ namespace backend { namespace d3d12 { DescriptorHeapHandle mDsvHeap = {}; }; -}} // namespace backend::d3d12 +}} // namespace dawn_native::d3d12 #endif // DAWNNATIVE_D3D12_RENDERPASSDESCRIPTORD3D12_H_ diff --git a/src/dawn_native/d3d12/RenderPipelineD3D12.cpp b/src/dawn_native/d3d12/RenderPipelineD3D12.cpp index a534c6cf45..20904da96e 100644 --- a/src/dawn_native/d3d12/RenderPipelineD3D12.cpp +++ b/src/dawn_native/d3d12/RenderPipelineD3D12.cpp @@ -25,7 +25,7 @@ #include -namespace backend { namespace d3d12 { +namespace dawn_native { namespace d3d12 { namespace { D3D12_PRIMITIVE_TOPOLOGY D3D12PrimitiveTopology(dawn::PrimitiveTopology primitiveTopology) { @@ -174,4 +174,4 @@ namespace backend { namespace d3d12 { return mPipelineState; } -}} // namespace backend::d3d12 +}} // namespace dawn_native::d3d12 diff --git a/src/dawn_native/d3d12/RenderPipelineD3D12.h b/src/dawn_native/d3d12/RenderPipelineD3D12.h index 14cb46e1e9..81596a1e55 100644 --- a/src/dawn_native/d3d12/RenderPipelineD3D12.h +++ b/src/dawn_native/d3d12/RenderPipelineD3D12.h @@ -19,7 +19,7 @@ #include "dawn_native/d3d12/d3d12_platform.h" -namespace backend { namespace d3d12 { +namespace dawn_native { namespace d3d12 { class Device; @@ -38,6 +38,6 @@ namespace backend { namespace d3d12 { Device* mDevice = nullptr; }; -}} // namespace backend::d3d12 +}} // namespace dawn_native::d3d12 #endif // DAWNNATIVE_D3D12_RENDERPIPELINED3D12_H_ diff --git a/src/dawn_native/d3d12/ResourceAllocator.cpp b/src/dawn_native/d3d12/ResourceAllocator.cpp index d4396edd55..c50de5b5c4 100644 --- a/src/dawn_native/d3d12/ResourceAllocator.cpp +++ b/src/dawn_native/d3d12/ResourceAllocator.cpp @@ -16,7 +16,7 @@ #include "dawn_native/d3d12/DeviceD3D12.h" -namespace backend { namespace d3d12 { +namespace dawn_native { namespace d3d12 { namespace { static constexpr D3D12_HEAP_PROPERTIES kDefaultHeapProperties = { @@ -74,4 +74,4 @@ namespace backend { namespace d3d12 { mReleasedResources.ClearUpTo(lastCompletedSerial); } -}} // namespace backend::d3d12 +}} // namespace dawn_native::d3d12 diff --git a/src/dawn_native/d3d12/ResourceAllocator.h b/src/dawn_native/d3d12/ResourceAllocator.h index 93f083af0d..9311db6df0 100644 --- a/src/dawn_native/d3d12/ResourceAllocator.h +++ b/src/dawn_native/d3d12/ResourceAllocator.h @@ -19,7 +19,7 @@ #include "common/SerialQueue.h" -namespace backend { namespace d3d12 { +namespace dawn_native { namespace d3d12 { class Device; @@ -39,6 +39,6 @@ namespace backend { namespace d3d12 { SerialQueue> mReleasedResources; }; -}} // namespace backend::d3d12 +}} // namespace dawn_native::d3d12 #endif // DAWNNATIVE_D3D12_RESOURCEALLOCATIONMANAGER_H_ diff --git a/src/dawn_native/d3d12/ResourceUploader.cpp b/src/dawn_native/d3d12/ResourceUploader.cpp index 8e656bef0c..6aa9a6b950 100644 --- a/src/dawn_native/d3d12/ResourceUploader.cpp +++ b/src/dawn_native/d3d12/ResourceUploader.cpp @@ -17,7 +17,7 @@ #include "dawn_native/d3d12/DeviceD3D12.h" #include "dawn_native/d3d12/ResourceAllocator.h" -namespace backend { namespace d3d12 { +namespace dawn_native { namespace d3d12 { ResourceUploader::ResourceUploader(Device* device) : mDevice(device) { } @@ -70,4 +70,4 @@ namespace backend { namespace d3d12 { mDevice->GetResourceAllocator()->Release(uploadHandle.resource); } -}} // namespace backend::d3d12 +}} // namespace dawn_native::d3d12 diff --git a/src/dawn_native/d3d12/ResourceUploader.h b/src/dawn_native/d3d12/ResourceUploader.h index 0b1a4b662d..c3307e54cc 100644 --- a/src/dawn_native/d3d12/ResourceUploader.h +++ b/src/dawn_native/d3d12/ResourceUploader.h @@ -19,7 +19,7 @@ #include "dawn_native/Forward.h" -namespace backend { namespace d3d12 { +namespace dawn_native { namespace d3d12 { class Device; @@ -43,6 +43,6 @@ namespace backend { namespace d3d12 { Device* mDevice; }; -}} // namespace backend::d3d12 +}} // namespace dawn_native::d3d12 #endif // DAWNNATIVE_D3D12_RESOURCEUPLOADER_H_ diff --git a/src/dawn_native/d3d12/SamplerD3D12.cpp b/src/dawn_native/d3d12/SamplerD3D12.cpp index 63e4e9699c..28cc13233d 100644 --- a/src/dawn_native/d3d12/SamplerD3D12.cpp +++ b/src/dawn_native/d3d12/SamplerD3D12.cpp @@ -16,7 +16,7 @@ #include "dawn_native/d3d12/DeviceD3D12.h" -namespace backend { namespace d3d12 { +namespace dawn_native { namespace d3d12 { namespace { D3D12_TEXTURE_ADDRESS_MODE AddressMode(dawn::AddressMode mode) { @@ -93,4 +93,4 @@ namespace backend { namespace d3d12 { return mSamplerDesc; } -}} // namespace backend::d3d12 +}} // namespace dawn_native::d3d12 diff --git a/src/dawn_native/d3d12/SamplerD3D12.h b/src/dawn_native/d3d12/SamplerD3D12.h index 03d3b4f93b..eebe12f828 100644 --- a/src/dawn_native/d3d12/SamplerD3D12.h +++ b/src/dawn_native/d3d12/SamplerD3D12.h @@ -19,7 +19,7 @@ #include "dawn_native/d3d12/d3d12_platform.h" -namespace backend { namespace d3d12 { +namespace dawn_native { namespace d3d12 { class Device; @@ -33,6 +33,6 @@ namespace backend { namespace d3d12 { D3D12_SAMPLER_DESC mSamplerDesc; }; -}} // namespace backend::d3d12 +}} // namespace dawn_native::d3d12 #endif // DAWNNATIVE_D3D12_SAMPLERD3D12_H_ diff --git a/src/dawn_native/d3d12/ShaderModuleD3D12.cpp b/src/dawn_native/d3d12/ShaderModuleD3D12.cpp index e3fb855eb7..f2fcf8a352 100644 --- a/src/dawn_native/d3d12/ShaderModuleD3D12.cpp +++ b/src/dawn_native/d3d12/ShaderModuleD3D12.cpp @@ -18,7 +18,7 @@ #include -namespace backend { namespace d3d12 { +namespace dawn_native { namespace d3d12 { // TODO(kainino@chromium.org): Consider replacing this with a generic enum_map. template @@ -83,4 +83,4 @@ namespace backend { namespace d3d12 { return mHlslSource; } -}} // namespace backend::d3d12 +}} // namespace dawn_native::d3d12 diff --git a/src/dawn_native/d3d12/ShaderModuleD3D12.h b/src/dawn_native/d3d12/ShaderModuleD3D12.h index 4a44170310..c26994f2f6 100644 --- a/src/dawn_native/d3d12/ShaderModuleD3D12.h +++ b/src/dawn_native/d3d12/ShaderModuleD3D12.h @@ -17,7 +17,7 @@ #include "dawn_native/ShaderModule.h" -namespace backend { namespace d3d12 { +namespace dawn_native { namespace d3d12 { class Device; @@ -33,6 +33,6 @@ namespace backend { namespace d3d12 { std::string mHlslSource; }; -}} // namespace backend::d3d12 +}} // namespace dawn_native::d3d12 #endif // DAWNNATIVE_D3D12_SHADERMODULED3D12_H_ diff --git a/src/dawn_native/d3d12/SwapChainD3D12.cpp b/src/dawn_native/d3d12/SwapChainD3D12.cpp index 835d717dbb..3e1cb2f240 100644 --- a/src/dawn_native/d3d12/SwapChainD3D12.cpp +++ b/src/dawn_native/d3d12/SwapChainD3D12.cpp @@ -19,7 +19,7 @@ #include -namespace backend { namespace d3d12 { +namespace dawn_native { namespace d3d12 { SwapChain::SwapChain(SwapChainBuilder* builder) : SwapChainBase(builder) { const auto& im = GetImplementation(); @@ -56,4 +56,4 @@ namespace backend { namespace d3d12 { device->ExecuteCommandLists({}); } -}} // namespace backend::d3d12 +}} // namespace dawn_native::d3d12 diff --git a/src/dawn_native/d3d12/SwapChainD3D12.h b/src/dawn_native/d3d12/SwapChainD3D12.h index b244d25309..12c1a854b0 100644 --- a/src/dawn_native/d3d12/SwapChainD3D12.h +++ b/src/dawn_native/d3d12/SwapChainD3D12.h @@ -17,7 +17,7 @@ #include "dawn_native/SwapChain.h" -namespace backend { namespace d3d12 { +namespace dawn_native { namespace d3d12 { class SwapChain : public SwapChainBase { public: @@ -31,6 +31,6 @@ namespace backend { namespace d3d12 { dawn::TextureUsageBit mTextureUsage; }; -}} // namespace backend::d3d12 +}} // namespace dawn_native::d3d12 #endif // DAWNNATIVE_D3D12_SWAPCHAIN_D3D12_H_ diff --git a/src/dawn_native/d3d12/TextureCopySplitter.cpp b/src/dawn_native/d3d12/TextureCopySplitter.cpp index 55de577a8b..7b35597706 100644 --- a/src/dawn_native/d3d12/TextureCopySplitter.cpp +++ b/src/dawn_native/d3d12/TextureCopySplitter.cpp @@ -17,7 +17,7 @@ #include "common/Assert.h" #include "dawn_native/d3d12/d3d12_platform.h" -namespace backend { namespace d3d12 { +namespace dawn_native { namespace d3d12 { namespace { void ComputeTexelOffsets(uint32_t offset, @@ -206,4 +206,4 @@ namespace backend { namespace d3d12 { return copy; } -}} // namespace backend::d3d12 +}} // namespace dawn_native::d3d12 diff --git a/src/dawn_native/d3d12/TextureCopySplitter.h b/src/dawn_native/d3d12/TextureCopySplitter.h index 0ee07f8e7c..58e91225da 100644 --- a/src/dawn_native/d3d12/TextureCopySplitter.h +++ b/src/dawn_native/d3d12/TextureCopySplitter.h @@ -19,7 +19,7 @@ #include -namespace backend { namespace d3d12 { +namespace dawn_native { namespace d3d12 { struct TextureCopySplit { static constexpr unsigned int kMaxTextureCopyRegions = 2; @@ -59,6 +59,6 @@ namespace backend { namespace d3d12 { uint32_t offset, uint32_t rowPitch); -}} // namespace backend::d3d12 +}} // namespace dawn_native::d3d12 #endif // DAWNNATIVE_D3D12_TEXTURECOPYSPLITTER_H_ diff --git a/src/dawn_native/d3d12/TextureD3D12.cpp b/src/dawn_native/d3d12/TextureD3D12.cpp index 69793f0598..1f3f3ff196 100644 --- a/src/dawn_native/d3d12/TextureD3D12.cpp +++ b/src/dawn_native/d3d12/TextureD3D12.cpp @@ -17,7 +17,7 @@ #include "dawn_native/d3d12/DeviceD3D12.h" #include "dawn_native/d3d12/ResourceAllocator.h" -namespace backend { namespace d3d12 { +namespace dawn_native { namespace d3d12 { namespace { D3D12_RESOURCE_STATES D3D12TextureUsage(dawn::TextureUsageBit usage, @@ -209,4 +209,4 @@ namespace backend { namespace d3d12 { return dsvDesc; } -}} // namespace backend::d3d12 +}} // namespace dawn_native::d3d12 diff --git a/src/dawn_native/d3d12/TextureD3D12.h b/src/dawn_native/d3d12/TextureD3D12.h index 8c3046086b..2c1a7911b1 100644 --- a/src/dawn_native/d3d12/TextureD3D12.h +++ b/src/dawn_native/d3d12/TextureD3D12.h @@ -19,7 +19,7 @@ #include "dawn_native/d3d12/d3d12_platform.h" -namespace backend { namespace d3d12 { +namespace dawn_native { namespace d3d12 { class Device; @@ -55,6 +55,6 @@ namespace backend { namespace d3d12 { private: D3D12_SHADER_RESOURCE_VIEW_DESC mSrvDesc; }; -}} // namespace backend::d3d12 +}} // namespace dawn_native::d3d12 #endif // DAWNNATIVE_D3D12_TEXTURED3D12_H_ diff --git a/src/dawn_native/metal/BlendStateMTL.h b/src/dawn_native/metal/BlendStateMTL.h index 5d7538db1b..484bf519f3 100644 --- a/src/dawn_native/metal/BlendStateMTL.h +++ b/src/dawn_native/metal/BlendStateMTL.h @@ -18,7 +18,7 @@ #include "dawn_native/BlendState.h" #import -namespace backend { namespace metal { +namespace dawn_native { namespace metal { class BlendState : public BlendStateBase { public: @@ -27,6 +27,6 @@ namespace backend { namespace metal { void ApplyBlendState(MTLRenderPipelineColorAttachmentDescriptor* descriptor) const; }; -}} // namespace backend::metal +}} // namespace dawn_native::metal #endif // DAWNNATIVE_METAL_BLENDSTATEMTL_H_ diff --git a/src/dawn_native/metal/BlendStateMTL.mm b/src/dawn_native/metal/BlendStateMTL.mm index 27a673714c..06227555e3 100644 --- a/src/dawn_native/metal/BlendStateMTL.mm +++ b/src/dawn_native/metal/BlendStateMTL.mm @@ -14,7 +14,7 @@ #include "dawn_native/metal/BlendStateMTL.h" -namespace backend { namespace metal { +namespace dawn_native { namespace metal { namespace { @@ -96,4 +96,4 @@ namespace backend { namespace metal { descriptor.writeMask = MetalColorWriteMask(info.colorWriteMask); } -}} // namespace backend::metal +}} // namespace dawn_native::metal diff --git a/src/dawn_native/metal/BufferMTL.h b/src/dawn_native/metal/BufferMTL.h index d9c0b0a129..7d0b59bef6 100644 --- a/src/dawn_native/metal/BufferMTL.h +++ b/src/dawn_native/metal/BufferMTL.h @@ -20,7 +20,7 @@ #import -namespace backend { namespace metal { +namespace dawn_native { namespace metal { class Device; @@ -67,6 +67,6 @@ namespace backend { namespace metal { SerialQueue mInflightRequests; }; -}} // namespace backend::metal +}} // namespace dawn_native::metal #endif // DAWNNATIVE_METAL_BUFFERMTL_H_ diff --git a/src/dawn_native/metal/BufferMTL.mm b/src/dawn_native/metal/BufferMTL.mm index df68f93e19..caf31e27b7 100644 --- a/src/dawn_native/metal/BufferMTL.mm +++ b/src/dawn_native/metal/BufferMTL.mm @@ -17,7 +17,7 @@ #include "dawn_native/metal/DeviceMTL.h" #include "dawn_native/metal/ResourceUploader.h" -namespace backend { namespace metal { +namespace dawn_native { namespace metal { Buffer::Buffer(BufferBuilder* builder) : BufferBase(builder) { MTLResourceOptions storageMode; @@ -99,4 +99,4 @@ namespace backend { namespace metal { mInflightRequests.ClearUpTo(finishedSerial); } -}} // namespace backend::metal +}} // namespace dawn_native::metal diff --git a/src/dawn_native/metal/CommandBufferMTL.h b/src/dawn_native/metal/CommandBufferMTL.h index f897206f1f..ab1b13f71b 100644 --- a/src/dawn_native/metal/CommandBufferMTL.h +++ b/src/dawn_native/metal/CommandBufferMTL.h @@ -19,11 +19,11 @@ #import -namespace backend { +namespace dawn_native { class RenderPassDescriptorBase; } -namespace backend { namespace metal { +namespace dawn_native { namespace metal { class Device; @@ -43,6 +43,6 @@ namespace backend { namespace metal { CommandIterator mCommands; }; -}} // namespace backend::metal +}} // namespace dawn_native::metal #endif // DAWNNATIVE_METAL_COMMANDBUFFERMTL_H_ diff --git a/src/dawn_native/metal/CommandBufferMTL.mm b/src/dawn_native/metal/CommandBufferMTL.mm index 8ef478b157..4fd66a3299 100644 --- a/src/dawn_native/metal/CommandBufferMTL.mm +++ b/src/dawn_native/metal/CommandBufferMTL.mm @@ -26,7 +26,7 @@ #include "dawn_native/metal/SamplerMTL.h" #include "dawn_native/metal/TextureMTL.h" -namespace backend { namespace metal { +namespace dawn_native { namespace metal { namespace { @@ -524,4 +524,4 @@ namespace backend { namespace metal { UNREACHABLE(); } -}} // namespace backend::metal +}} // namespace dawn_native::metal diff --git a/src/dawn_native/metal/ComputePipelineMTL.h b/src/dawn_native/metal/ComputePipelineMTL.h index d088851edc..5f216a8908 100644 --- a/src/dawn_native/metal/ComputePipelineMTL.h +++ b/src/dawn_native/metal/ComputePipelineMTL.h @@ -19,7 +19,7 @@ #import -namespace backend { namespace metal { +namespace dawn_native { namespace metal { class ComputePipeline : public ComputePipelineBase { public: @@ -34,6 +34,6 @@ namespace backend { namespace metal { MTLSize mLocalWorkgroupSize; }; -}} // namespace backend::metal +}} // namespace dawn_native::metal #endif // DAWNNATIVE_METAL_COMPUTEPIPELINEMTL_H_ diff --git a/src/dawn_native/metal/ComputePipelineMTL.mm b/src/dawn_native/metal/ComputePipelineMTL.mm index c6f0f3a28b..3ac7ba1dce 100644 --- a/src/dawn_native/metal/ComputePipelineMTL.mm +++ b/src/dawn_native/metal/ComputePipelineMTL.mm @@ -17,7 +17,7 @@ #include "dawn_native/metal/DeviceMTL.h" #include "dawn_native/metal/ShaderModuleMTL.h" -namespace backend { namespace metal { +namespace dawn_native { namespace metal { ComputePipeline::ComputePipeline(ComputePipelineBuilder* builder) : ComputePipelineBase(builder) { @@ -53,4 +53,4 @@ namespace backend { namespace metal { return mLocalWorkgroupSize; } -}} // namespace backend::metal +}} // namespace dawn_native::metal diff --git a/src/dawn_native/metal/DepthStencilStateMTL.h b/src/dawn_native/metal/DepthStencilStateMTL.h index 5490e912ca..c33fadfbd2 100644 --- a/src/dawn_native/metal/DepthStencilStateMTL.h +++ b/src/dawn_native/metal/DepthStencilStateMTL.h @@ -19,7 +19,7 @@ #import -namespace backend { namespace metal { +namespace dawn_native { namespace metal { class Device; @@ -34,6 +34,6 @@ namespace backend { namespace metal { id mMtlDepthStencilState = nil; }; -}} // namespace backend::metal +}} // namespace dawn_native::metal #endif // DAWNNATIVE_METAL_DEPTHSTENCILSTATEMTL_H_ diff --git a/src/dawn_native/metal/DepthStencilStateMTL.mm b/src/dawn_native/metal/DepthStencilStateMTL.mm index 7efd68dabd..fc81133992 100644 --- a/src/dawn_native/metal/DepthStencilStateMTL.mm +++ b/src/dawn_native/metal/DepthStencilStateMTL.mm @@ -16,7 +16,7 @@ #include "dawn_native/metal/DeviceMTL.h" -namespace backend { namespace metal { +namespace dawn_native { namespace metal { namespace { MTLCompareFunction MetalDepthStencilCompareFunction(dawn::CompareFunction compareFunction) { @@ -117,4 +117,4 @@ namespace backend { namespace metal { return mMtlDepthStencilState; } -}} // namespace backend::metal +}} // namespace dawn_native::metal diff --git a/src/dawn_native/metal/DeviceMTL.h b/src/dawn_native/metal/DeviceMTL.h index 974f7d7d27..2f4e34474c 100644 --- a/src/dawn_native/metal/DeviceMTL.h +++ b/src/dawn_native/metal/DeviceMTL.h @@ -25,7 +25,7 @@ #import #include -namespace backend { namespace metal { +namespace dawn_native { namespace metal { class MapRequestTracker; class ResourceUploader; @@ -83,6 +83,6 @@ namespace backend { namespace metal { id mPendingCommands = nil; }; -}} // namespace backend::metal +}} // namespace dawn_native::metal #endif // DAWNNATIVE_METAL_DEVICEMTL_H_ diff --git a/src/dawn_native/metal/DeviceMTL.mm b/src/dawn_native/metal/DeviceMTL.mm index fef1ccc064..b3dcc97f1a 100644 --- a/src/dawn_native/metal/DeviceMTL.mm +++ b/src/dawn_native/metal/DeviceMTL.mm @@ -34,7 +34,7 @@ #include -namespace backend { namespace metal { +namespace dawn_native { namespace metal { dawnProcTable GetNonValidatingProcs(); dawnProcTable GetValidatingProcs(); @@ -199,4 +199,4 @@ namespace backend { namespace metal { return mResourceUploader; } -}} // namespace backend::metal +}} // namespace dawn_native::metal diff --git a/src/dawn_native/metal/Forward.h b/src/dawn_native/metal/Forward.h index ed26617adf..d11f5a95b3 100644 --- a/src/dawn_native/metal/Forward.h +++ b/src/dawn_native/metal/Forward.h @@ -23,7 +23,7 @@ namespace { class RenderPassDescriptor; } // namespace -namespace backend { namespace metal { +namespace dawn_native { namespace metal { using BindGroup = BindGroupBase; using BindGroupLayout = BindGroupLayoutBase; @@ -73,6 +73,6 @@ namespace backend { namespace metal { return ToBackendBase(common); } -}} // namespace backend::metal +}} // namespace dawn_native::metal #endif // DAWNNATIVE_METAL_FORWARD_H_ diff --git a/src/dawn_native/metal/InputStateMTL.h b/src/dawn_native/metal/InputStateMTL.h index ca0852a55f..496e6eae27 100644 --- a/src/dawn_native/metal/InputStateMTL.h +++ b/src/dawn_native/metal/InputStateMTL.h @@ -19,7 +19,7 @@ #import -namespace backend { namespace metal { +namespace dawn_native { namespace metal { class InputState : public InputStateBase { public: @@ -32,6 +32,6 @@ namespace backend { namespace metal { MTLVertexDescriptor* mMtlVertexDescriptor = nil; }; -}} // namespace backend::metal +}} // namespace dawn_native::metal #endif // DAWNNATIVE_METAL_COMMANDINPUTSTATEMTL_H_ diff --git a/src/dawn_native/metal/InputStateMTL.mm b/src/dawn_native/metal/InputStateMTL.mm index c204b09b4c..1dd94d2f7e 100644 --- a/src/dawn_native/metal/InputStateMTL.mm +++ b/src/dawn_native/metal/InputStateMTL.mm @@ -16,7 +16,7 @@ #include "common/BitSetIterator.h" -namespace backend { namespace metal { +namespace dawn_native { namespace metal { namespace { MTLVertexFormat VertexFormatType(dawn::VertexFormat format) { @@ -108,4 +108,4 @@ namespace backend { namespace metal { return mMtlVertexDescriptor; } -}} // namespace backend::metal +}} // namespace dawn_native::metal diff --git a/src/dawn_native/metal/PipelineLayoutMTL.h b/src/dawn_native/metal/PipelineLayoutMTL.h index ecddcd3523..d7c5f27bcb 100644 --- a/src/dawn_native/metal/PipelineLayoutMTL.h +++ b/src/dawn_native/metal/PipelineLayoutMTL.h @@ -25,7 +25,7 @@ namespace spirv_cross { class CompilerMSL; } -namespace backend { namespace metal { +namespace dawn_native { namespace metal { class Device; @@ -41,6 +41,6 @@ namespace backend { namespace metal { PerStage mIndexInfo; }; -}} // namespace backend::metal +}} // namespace dawn_native::metal #endif // DAWNNATIVE_METAL_PIPELINELAYOUTMTL_H_ diff --git a/src/dawn_native/metal/PipelineLayoutMTL.mm b/src/dawn_native/metal/PipelineLayoutMTL.mm index 1f156170ab..0e039c859e 100644 --- a/src/dawn_native/metal/PipelineLayoutMTL.mm +++ b/src/dawn_native/metal/PipelineLayoutMTL.mm @@ -18,7 +18,7 @@ #include "dawn_native/BindGroupLayout.h" #include "dawn_native/metal/DeviceMTL.h" -namespace backend { namespace metal { +namespace dawn_native { namespace metal { PipelineLayout::PipelineLayout(Device* device, const dawn::PipelineLayoutDescriptor* descriptor) : PipelineLayoutBase(device, descriptor) { @@ -64,4 +64,4 @@ namespace backend { namespace metal { return mIndexInfo[stage]; } -}} // namespace backend::metal +}} // namespace dawn_native::metal diff --git a/src/dawn_native/metal/QueueMTL.h b/src/dawn_native/metal/QueueMTL.h index 558f2dca22..0e4e5cb81d 100644 --- a/src/dawn_native/metal/QueueMTL.h +++ b/src/dawn_native/metal/QueueMTL.h @@ -17,7 +17,7 @@ #include "dawn_native/Queue.h" -namespace backend { namespace metal { +namespace dawn_native { namespace metal { class CommandBuffer; class Device; @@ -30,6 +30,6 @@ namespace backend { namespace metal { void Submit(uint32_t numCommands, CommandBuffer* const* commands); }; -}} // namespace backend::metal +}} // namespace dawn_native::metal #endif // DAWNNATIVE_METAL_QUEUEMTL_H_ diff --git a/src/dawn_native/metal/QueueMTL.mm b/src/dawn_native/metal/QueueMTL.mm index 4f737771f2..54a10bd41b 100644 --- a/src/dawn_native/metal/QueueMTL.mm +++ b/src/dawn_native/metal/QueueMTL.mm @@ -17,7 +17,7 @@ #include "dawn_native/metal/CommandBufferMTL.h" #include "dawn_native/metal/DeviceMTL.h" -namespace backend { namespace metal { +namespace dawn_native { namespace metal { Queue::Queue(Device* device) : QueueBase(device) { } @@ -34,4 +34,4 @@ namespace backend { namespace metal { device->SubmitPendingCommandBuffer(); } -}} // namespace backend::metal +}} // namespace dawn_native::metal diff --git a/src/dawn_native/metal/RenderPipelineMTL.h b/src/dawn_native/metal/RenderPipelineMTL.h index a6ca27b0bb..beace61cc1 100644 --- a/src/dawn_native/metal/RenderPipelineMTL.h +++ b/src/dawn_native/metal/RenderPipelineMTL.h @@ -19,7 +19,7 @@ #import -namespace backend { namespace metal { +namespace dawn_native { namespace metal { class RenderPipeline : public RenderPipelineBase { public: @@ -37,6 +37,6 @@ namespace backend { namespace metal { id mMtlRenderPipelineState = nil; }; -}} // namespace backend::metal +}} // namespace dawn_native::metal #endif // DAWNNATIVE_METAL_RENDERPIPELINEMTL_H_ diff --git a/src/dawn_native/metal/RenderPipelineMTL.mm b/src/dawn_native/metal/RenderPipelineMTL.mm index 104559b3a2..4fc08b9235 100644 --- a/src/dawn_native/metal/RenderPipelineMTL.mm +++ b/src/dawn_native/metal/RenderPipelineMTL.mm @@ -22,7 +22,7 @@ #include "dawn_native/metal/ShaderModuleMTL.h" #include "dawn_native/metal/TextureMTL.h" -namespace backend { namespace metal { +namespace dawn_native { namespace metal { namespace { MTLPrimitiveType MTLPrimitiveTopology(dawn::PrimitiveTopology primitiveTopology) { @@ -141,4 +141,4 @@ namespace backend { namespace metal { [encoder setRenderPipelineState:mMtlRenderPipelineState]; } -}} // namespace backend::metal +}} // namespace dawn_native::metal diff --git a/src/dawn_native/metal/ResourceUploader.h b/src/dawn_native/metal/ResourceUploader.h index 255e89d17d..d6e057b8ad 100644 --- a/src/dawn_native/metal/ResourceUploader.h +++ b/src/dawn_native/metal/ResourceUploader.h @@ -20,7 +20,7 @@ #import -namespace backend { namespace metal { +namespace dawn_native { namespace metal { class Device; @@ -37,6 +37,6 @@ namespace backend { namespace metal { SerialQueue> mInflightUploadBuffers; }; -}} // namespace backend::metal +}} // namespace dawn_native::metal #endif // DAWNNATIVE_METAL_RESOURCEUPLOADER_H_ diff --git a/src/dawn_native/metal/ResourceUploader.mm b/src/dawn_native/metal/ResourceUploader.mm index d7a14f5b2d..fd990374a5 100644 --- a/src/dawn_native/metal/ResourceUploader.mm +++ b/src/dawn_native/metal/ResourceUploader.mm @@ -16,7 +16,7 @@ #include "dawn_native/metal/DeviceMTL.h" -namespace backend { namespace metal { +namespace dawn_native { namespace metal { ResourceUploader::ResourceUploader(Device* device) : mDevice(device) { } @@ -54,4 +54,4 @@ namespace backend { namespace metal { mInflightUploadBuffers.ClearUpTo(finishedSerial); } -}} // namespace backend::metal +}} // namespace dawn_native::metal diff --git a/src/dawn_native/metal/SamplerMTL.h b/src/dawn_native/metal/SamplerMTL.h index 03283ebfdf..56786895a3 100644 --- a/src/dawn_native/metal/SamplerMTL.h +++ b/src/dawn_native/metal/SamplerMTL.h @@ -19,7 +19,7 @@ #import -namespace backend { namespace metal { +namespace dawn_native { namespace metal { class Device; @@ -34,6 +34,6 @@ namespace backend { namespace metal { id mMtlSamplerState = nil; }; -}} // namespace backend::metal +}} // namespace dawn_native::metal #endif // DAWNNATIVE_METAL_SAMPLERMTL_H_ diff --git a/src/dawn_native/metal/SamplerMTL.mm b/src/dawn_native/metal/SamplerMTL.mm index aa9e0e1d02..0961358d38 100644 --- a/src/dawn_native/metal/SamplerMTL.mm +++ b/src/dawn_native/metal/SamplerMTL.mm @@ -16,7 +16,7 @@ #include "dawn_native/metal/DeviceMTL.h" -namespace backend { namespace metal { +namespace dawn_native { namespace metal { namespace { MTLSamplerMinMagFilter FilterModeToMinMagFilter(dawn::FilterMode mode) { @@ -72,4 +72,4 @@ namespace backend { namespace metal { return mMtlSamplerState; } -}} // namespace backend::metal +}} // namespace dawn_native::metal diff --git a/src/dawn_native/metal/ShaderModuleMTL.h b/src/dawn_native/metal/ShaderModuleMTL.h index cc668e47a7..60ed58f72f 100644 --- a/src/dawn_native/metal/ShaderModuleMTL.h +++ b/src/dawn_native/metal/ShaderModuleMTL.h @@ -23,7 +23,7 @@ namespace spirv_cross { class CompilerMSL; } -namespace backend { namespace metal { +namespace dawn_native { namespace metal { class PipelineLayout; @@ -47,6 +47,6 @@ namespace backend { namespace metal { std::vector mSpirv; }; -}} // namespace backend::metal +}} // namespace dawn_native::metal #endif // DAWNNATIVE_METAL_SHADERMODULEMTL_H_ diff --git a/src/dawn_native/metal/ShaderModuleMTL.mm b/src/dawn_native/metal/ShaderModuleMTL.mm index 32aba7a0f2..8de07d5dc1 100644 --- a/src/dawn_native/metal/ShaderModuleMTL.mm +++ b/src/dawn_native/metal/ShaderModuleMTL.mm @@ -22,7 +22,7 @@ #include -namespace backend { namespace metal { +namespace dawn_native { namespace metal { namespace { @@ -125,4 +125,4 @@ namespace backend { namespace metal { return result; } -}} // namespace backend::metal +}} // namespace dawn_native::metal diff --git a/src/dawn_native/metal/SwapChainMTL.h b/src/dawn_native/metal/SwapChainMTL.h index 41746bf5d3..02f4dcafd9 100644 --- a/src/dawn_native/metal/SwapChainMTL.h +++ b/src/dawn_native/metal/SwapChainMTL.h @@ -17,7 +17,7 @@ #include "dawn_native/SwapChain.h" -namespace backend { namespace metal { +namespace dawn_native { namespace metal { class Device; @@ -31,6 +31,6 @@ namespace backend { namespace metal { void OnBeforePresent(TextureBase* texture) override; }; -}} // namespace backend::metal +}} // namespace dawn_native::metal #endif // DAWNNATIVE_METAL_SWAPCHAINMTL_H_ diff --git a/src/dawn_native/metal/SwapChainMTL.mm b/src/dawn_native/metal/SwapChainMTL.mm index 4411b2d334..c53299ee3a 100644 --- a/src/dawn_native/metal/SwapChainMTL.mm +++ b/src/dawn_native/metal/SwapChainMTL.mm @@ -19,7 +19,7 @@ #include -namespace backend { namespace metal { +namespace dawn_native { namespace metal { SwapChain::SwapChain(SwapChainBuilder* builder) : SwapChainBase(builder) { const auto& im = GetImplementation(); @@ -47,4 +47,4 @@ namespace backend { namespace metal { void SwapChain::OnBeforePresent(TextureBase*) { } -}} // namespace backend::metal +}} // namespace dawn_native::metal diff --git a/src/dawn_native/metal/TextureMTL.h b/src/dawn_native/metal/TextureMTL.h index 696fd4854f..9bb3de671a 100644 --- a/src/dawn_native/metal/TextureMTL.h +++ b/src/dawn_native/metal/TextureMTL.h @@ -19,7 +19,7 @@ #import -namespace backend { namespace metal { +namespace dawn_native { namespace metal { MTLPixelFormat MetalPixelFormat(dawn::TextureFormat format); @@ -40,6 +40,6 @@ namespace backend { namespace metal { TextureView(TextureViewBuilder* builder); }; -}} // namespace backend::metal +}} // namespace dawn_native::metal #endif // DAWNNATIVE_METAL_TEXTUREMTL_H_ diff --git a/src/dawn_native/metal/TextureMTL.mm b/src/dawn_native/metal/TextureMTL.mm index 02991e3f50..18c9563f7f 100644 --- a/src/dawn_native/metal/TextureMTL.mm +++ b/src/dawn_native/metal/TextureMTL.mm @@ -16,7 +16,7 @@ #include "dawn_native/metal/DeviceMTL.h" -namespace backend { namespace metal { +namespace dawn_native { namespace metal { MTLPixelFormat MetalPixelFormat(dawn::TextureFormat format) { switch (format) { @@ -99,4 +99,4 @@ namespace backend { namespace metal { TextureView::TextureView(TextureViewBuilder* builder) : TextureViewBase(builder) { } -}} // namespace backend::metal +}} // namespace dawn_native::metal diff --git a/src/dawn_native/null/NullBackend.cpp b/src/dawn_native/null/NullBackend.cpp index de7cb648fc..5de42ecf8c 100644 --- a/src/dawn_native/null/NullBackend.cpp +++ b/src/dawn_native/null/NullBackend.cpp @@ -18,7 +18,7 @@ #include -namespace backend { namespace null { +namespace dawn_native { namespace null { dawnProcTable GetNonValidatingProcs(); dawnProcTable GetValidatingProcs(); @@ -216,4 +216,4 @@ namespace backend { namespace null { void SwapChain::OnBeforePresent(TextureBase*) { } -}} // namespace backend::null +}} // namespace dawn_native::null diff --git a/src/dawn_native/null/NullBackend.h b/src/dawn_native/null/NullBackend.h index 97568f33ce..da5ef23de0 100644 --- a/src/dawn_native/null/NullBackend.h +++ b/src/dawn_native/null/NullBackend.h @@ -36,7 +36,7 @@ #include "dawn_native/Texture.h" #include "dawn_native/ToBackend.h" -namespace backend { namespace null { +namespace dawn_native { namespace null { using BindGroup = BindGroupBase; using BindGroupLayout = BindGroupLayoutBase; @@ -174,6 +174,6 @@ namespace backend { namespace null { void OnBeforePresent(TextureBase*) override; }; -}} // namespace backend::null +}} // namespace dawn_native::null #endif // DAWNNATIVE_NULL_NULLBACKEND_H_ diff --git a/src/dawn_native/opengl/BlendStateGL.cpp b/src/dawn_native/opengl/BlendStateGL.cpp index 8a57686e66..6460cec282 100644 --- a/src/dawn_native/opengl/BlendStateGL.cpp +++ b/src/dawn_native/opengl/BlendStateGL.cpp @@ -16,7 +16,7 @@ #include "common/Assert.h" -namespace backend { namespace opengl { +namespace dawn_native { namespace opengl { namespace { GLenum GLBlendFactor(dawn::BlendFactor factor, bool alpha) { @@ -93,4 +93,4 @@ namespace backend { namespace opengl { info.colorWriteMask & dawn::ColorWriteMask::Alpha); } -}} // namespace backend::opengl +}} // namespace dawn_native::opengl diff --git a/src/dawn_native/opengl/BlendStateGL.h b/src/dawn_native/opengl/BlendStateGL.h index 7c7907ad7e..afc2bdecf2 100644 --- a/src/dawn_native/opengl/BlendStateGL.h +++ b/src/dawn_native/opengl/BlendStateGL.h @@ -19,7 +19,7 @@ #include "glad/glad.h" -namespace backend { namespace opengl { +namespace dawn_native { namespace opengl { class BlendState : public BlendStateBase { public: @@ -28,6 +28,6 @@ namespace backend { namespace opengl { void ApplyNow(uint32_t attachment); }; -}} // namespace backend::opengl +}} // namespace dawn_native::opengl #endif // DAWNNATIVE_OPENGL_BLENDSTATEGL_H_ diff --git a/src/dawn_native/opengl/BufferGL.cpp b/src/dawn_native/opengl/BufferGL.cpp index e501f147bd..4182b4ad79 100644 --- a/src/dawn_native/opengl/BufferGL.cpp +++ b/src/dawn_native/opengl/BufferGL.cpp @@ -14,7 +14,7 @@ #include "dawn_native/opengl/BufferGL.h" -namespace backend { namespace opengl { +namespace dawn_native { namespace opengl { // Buffer @@ -59,4 +59,4 @@ namespace backend { namespace opengl { BufferView::BufferView(BufferViewBuilder* builder) : BufferViewBase(builder) { } -}} // namespace backend::opengl +}} // namespace dawn_native::opengl diff --git a/src/dawn_native/opengl/BufferGL.h b/src/dawn_native/opengl/BufferGL.h index d5d2f7ccad..c6c85f6676 100644 --- a/src/dawn_native/opengl/BufferGL.h +++ b/src/dawn_native/opengl/BufferGL.h @@ -19,7 +19,7 @@ #include "glad/glad.h" -namespace backend { namespace opengl { +namespace dawn_native { namespace opengl { class Device; @@ -43,6 +43,6 @@ namespace backend { namespace opengl { BufferView(BufferViewBuilder* builder); }; -}} // namespace backend::opengl +}} // namespace dawn_native::opengl #endif // DAWNNATIVE_OPENGL_BUFFERGL_H_ diff --git a/src/dawn_native/opengl/CommandBufferGL.cpp b/src/dawn_native/opengl/CommandBufferGL.cpp index 68fcc51e12..054a8992b4 100644 --- a/src/dawn_native/opengl/CommandBufferGL.cpp +++ b/src/dawn_native/opengl/CommandBufferGL.cpp @@ -28,7 +28,7 @@ #include -namespace backend { namespace opengl { +namespace dawn_native { namespace opengl { namespace { @@ -653,4 +653,4 @@ namespace backend { namespace opengl { UNREACHABLE(); } -}} // namespace backend::opengl +}} // namespace dawn_native::opengl diff --git a/src/dawn_native/opengl/CommandBufferGL.h b/src/dawn_native/opengl/CommandBufferGL.h index 99a91f84b5..dc9218bb98 100644 --- a/src/dawn_native/opengl/CommandBufferGL.h +++ b/src/dawn_native/opengl/CommandBufferGL.h @@ -18,11 +18,11 @@ #include "dawn_native/CommandAllocator.h" #include "dawn_native/CommandBuffer.h" -namespace backend { +namespace dawn_native { class RenderPassDescriptorBase; -} // namespace backend +} // namespace dawn_native -namespace backend { namespace opengl { +namespace dawn_native { namespace opengl { class Device; @@ -40,6 +40,6 @@ namespace backend { namespace opengl { CommandIterator mCommands; }; -}} // namespace backend::opengl +}} // namespace dawn_native::opengl #endif // DAWNNATIVE_OPENGL_COMMANDBUFFERGL_H_ diff --git a/src/dawn_native/opengl/ComputePipelineGL.cpp b/src/dawn_native/opengl/ComputePipelineGL.cpp index 9bcf43e564..f80b2bb70f 100644 --- a/src/dawn_native/opengl/ComputePipelineGL.cpp +++ b/src/dawn_native/opengl/ComputePipelineGL.cpp @@ -14,7 +14,7 @@ #include "dawn_native/opengl/ComputePipelineGL.h" -namespace backend { namespace opengl { +namespace dawn_native { namespace opengl { ComputePipeline::ComputePipeline(ComputePipelineBuilder* builder) : ComputePipelineBase(builder), PipelineGL(this, builder) { @@ -24,4 +24,4 @@ namespace backend { namespace opengl { PipelineGL::ApplyNow(); } -}} // namespace backend::opengl +}} // namespace dawn_native::opengl diff --git a/src/dawn_native/opengl/ComputePipelineGL.h b/src/dawn_native/opengl/ComputePipelineGL.h index dd505d2eff..654353c09e 100644 --- a/src/dawn_native/opengl/ComputePipelineGL.h +++ b/src/dawn_native/opengl/ComputePipelineGL.h @@ -21,7 +21,7 @@ #include "glad/glad.h" -namespace backend { namespace opengl { +namespace dawn_native { namespace opengl { class ComputePipeline : public ComputePipelineBase, public PipelineGL { public: @@ -30,6 +30,6 @@ namespace backend { namespace opengl { void ApplyNow(); }; -}} // namespace backend::opengl +}} // namespace dawn_native::opengl #endif // DAWNNATIVE_OPENGL_COMPUTEPIPELINEGL_H_ diff --git a/src/dawn_native/opengl/DepthStencilStateGL.cpp b/src/dawn_native/opengl/DepthStencilStateGL.cpp index dd9fdf0c77..03cf76319c 100644 --- a/src/dawn_native/opengl/DepthStencilStateGL.cpp +++ b/src/dawn_native/opengl/DepthStencilStateGL.cpp @@ -17,7 +17,7 @@ #include "common/Assert.h" #include "dawn_native/opengl/PersistentPipelineStateGL.h" -namespace backend { namespace opengl { +namespace dawn_native { namespace opengl { namespace { GLuint OpenGLCompareFunction(dawn::CompareFunction compareFunction) { @@ -113,4 +113,4 @@ namespace backend { namespace opengl { glStencilMask(stencilInfo.writeMask); } -}} // namespace backend::opengl +}} // namespace dawn_native::opengl diff --git a/src/dawn_native/opengl/DepthStencilStateGL.h b/src/dawn_native/opengl/DepthStencilStateGL.h index 0be291487e..da06830db7 100644 --- a/src/dawn_native/opengl/DepthStencilStateGL.h +++ b/src/dawn_native/opengl/DepthStencilStateGL.h @@ -17,7 +17,7 @@ #include "dawn_native/DepthStencilState.h" -namespace backend { namespace opengl { +namespace dawn_native { namespace opengl { class Device; class PersistentPipelineState; @@ -29,6 +29,6 @@ namespace backend { namespace opengl { void ApplyNow(PersistentPipelineState& persistentPipelineState) const; }; -}} // namespace backend::opengl +}} // namespace dawn_native::opengl #endif // DAWNNATIVE_OPENGL_DEPTHSTENCILSTATEGL_H_ diff --git a/src/dawn_native/opengl/DeviceGL.cpp b/src/dawn_native/opengl/DeviceGL.cpp index f414b0581a..137525a439 100644 --- a/src/dawn_native/opengl/DeviceGL.cpp +++ b/src/dawn_native/opengl/DeviceGL.cpp @@ -31,7 +31,7 @@ #include "dawn_native/opengl/SwapChainGL.h" #include "dawn_native/opengl/TextureGL.h" -namespace backend { namespace opengl { +namespace dawn_native { namespace opengl { dawnProcTable GetNonValidatingProcs(); dawnProcTable GetValidatingProcs(); @@ -112,4 +112,4 @@ namespace backend { namespace opengl { void Device::TickImpl() { } -}} // namespace backend::opengl +}} // namespace dawn_native::opengl diff --git a/src/dawn_native/opengl/DeviceGL.h b/src/dawn_native/opengl/DeviceGL.h index eb7aff091e..862b22ef95 100644 --- a/src/dawn_native/opengl/DeviceGL.h +++ b/src/dawn_native/opengl/DeviceGL.h @@ -28,7 +28,7 @@ # include "common/windows_with_undefs.h" #endif -namespace backend { namespace opengl { +namespace dawn_native { namespace opengl { class Device : public DeviceBase { public: @@ -60,6 +60,6 @@ namespace backend { namespace opengl { const dawn::SamplerDescriptor* descriptor) override; }; -}} // namespace backend::opengl +}} // namespace dawn_native::opengl #endif // DAWNNATIVE_OPENGL_DEVICEGL_H_ diff --git a/src/dawn_native/opengl/Forward.h b/src/dawn_native/opengl/Forward.h index d4567224ba..154919fa85 100644 --- a/src/dawn_native/opengl/Forward.h +++ b/src/dawn_native/opengl/Forward.h @@ -23,7 +23,7 @@ namespace { class RenderPassDescriptor; } // namespace -namespace backend { namespace opengl { +namespace dawn_native { namespace opengl { using BindGroup = BindGroupBase; using BindGroupLayout = BindGroupLayoutBase; @@ -73,6 +73,6 @@ namespace backend { namespace opengl { return ToBackendBase(common); } -}} // namespace backend::opengl +}} // namespace dawn_native::opengl #endif // DAWNNATIVE_OPENGL_FORWARD_H_ diff --git a/src/dawn_native/opengl/InputStateGL.cpp b/src/dawn_native/opengl/InputStateGL.cpp index b986dee97c..6ecaf8f450 100644 --- a/src/dawn_native/opengl/InputStateGL.cpp +++ b/src/dawn_native/opengl/InputStateGL.cpp @@ -16,7 +16,7 @@ #include "common/Assert.h" -namespace backend { namespace opengl { +namespace dawn_native { namespace opengl { InputState::InputState(InputStateBuilder* builder) : InputStateBase(builder) { glGenVertexArrays(1, &mVertexArrayObject); @@ -58,4 +58,4 @@ namespace backend { namespace opengl { return mVertexArrayObject; } -}} // namespace backend::opengl +}} // namespace dawn_native::opengl diff --git a/src/dawn_native/opengl/InputStateGL.h b/src/dawn_native/opengl/InputStateGL.h index e15717a3b8..dbdd84b07b 100644 --- a/src/dawn_native/opengl/InputStateGL.h +++ b/src/dawn_native/opengl/InputStateGL.h @@ -19,7 +19,7 @@ #include "glad/glad.h" -namespace backend { namespace opengl { +namespace dawn_native { namespace opengl { class Device; @@ -35,6 +35,6 @@ namespace backend { namespace opengl { std::array, kMaxVertexInputs> attributesUsingInput; }; -}} // namespace backend::opengl +}} // namespace dawn_native::opengl #endif // DAWNNATIVE_OPENGL_INPUTSTATEGL_H_ diff --git a/src/dawn_native/opengl/PersistentPipelineStateGL.cpp b/src/dawn_native/opengl/PersistentPipelineStateGL.cpp index 0b28a25a0e..5d2b8328fa 100644 --- a/src/dawn_native/opengl/PersistentPipelineStateGL.cpp +++ b/src/dawn_native/opengl/PersistentPipelineStateGL.cpp @@ -14,7 +14,7 @@ #include "dawn_native/opengl/PersistentPipelineStateGL.h" -namespace backend { namespace opengl { +namespace dawn_native { namespace opengl { void PersistentPipelineState::SetDefaultState() { CallGLStencilFunc(); @@ -51,4 +51,4 @@ namespace backend { namespace opengl { mStencilReadMask); } -}} // namespace backend::opengl +}} // namespace dawn_native::opengl diff --git a/src/dawn_native/opengl/PersistentPipelineStateGL.h b/src/dawn_native/opengl/PersistentPipelineStateGL.h index 87698e0385..c67f2a54ac 100644 --- a/src/dawn_native/opengl/PersistentPipelineStateGL.h +++ b/src/dawn_native/opengl/PersistentPipelineStateGL.h @@ -19,7 +19,7 @@ #include "glad/glad.h" -namespace backend { namespace opengl { +namespace dawn_native { namespace opengl { class PersistentPipelineState { public: @@ -38,6 +38,6 @@ namespace backend { namespace opengl { GLuint mStencilReference = 0; }; -}} // namespace backend::opengl +}} // namespace dawn_native::opengl #endif // DAWNNATIVE_OPENGL_PERSISTENTPIPELINESTATEGL_H_ diff --git a/src/dawn_native/opengl/PipelineGL.cpp b/src/dawn_native/opengl/PipelineGL.cpp index b2e7e65a80..3148d068cd 100644 --- a/src/dawn_native/opengl/PipelineGL.cpp +++ b/src/dawn_native/opengl/PipelineGL.cpp @@ -24,7 +24,7 @@ #include #include -namespace backend { namespace opengl { +namespace dawn_native { namespace opengl { namespace { @@ -212,4 +212,4 @@ namespace backend { namespace opengl { glUseProgram(mProgram); } -}} // namespace backend::opengl +}} // namespace dawn_native::opengl diff --git a/src/dawn_native/opengl/PipelineGL.h b/src/dawn_native/opengl/PipelineGL.h index 14dc7d2bba..d216c57f1c 100644 --- a/src/dawn_native/opengl/PipelineGL.h +++ b/src/dawn_native/opengl/PipelineGL.h @@ -21,7 +21,7 @@ #include -namespace backend { namespace opengl { +namespace dawn_native { namespace opengl { class Device; class PersistentPipelineState; @@ -49,6 +49,6 @@ namespace backend { namespace opengl { std::vector> mUnitsForTextures; }; -}} // namespace backend::opengl +}} // namespace dawn_native::opengl #endif // DAWNNATIVE_OPENGL_PIPELINEGL_H_ diff --git a/src/dawn_native/opengl/PipelineLayoutGL.cpp b/src/dawn_native/opengl/PipelineLayoutGL.cpp index 9bc0c5a93a..4f5c5a410d 100644 --- a/src/dawn_native/opengl/PipelineLayoutGL.cpp +++ b/src/dawn_native/opengl/PipelineLayoutGL.cpp @@ -18,7 +18,7 @@ #include "dawn_native/BindGroupLayout.h" #include "dawn_native/opengl/DeviceGL.h" -namespace backend { namespace opengl { +namespace dawn_native { namespace opengl { PipelineLayout::PipelineLayout(Device* device, const dawn::PipelineLayoutDescriptor* descriptor) : PipelineLayoutBase(device, descriptor) { @@ -77,4 +77,4 @@ namespace backend { namespace opengl { return mNumSampledTextures; } -}} // namespace backend::opengl +}} // namespace dawn_native::opengl diff --git a/src/dawn_native/opengl/PipelineLayoutGL.h b/src/dawn_native/opengl/PipelineLayoutGL.h index b1b730bd43..e824e3f202 100644 --- a/src/dawn_native/opengl/PipelineLayoutGL.h +++ b/src/dawn_native/opengl/PipelineLayoutGL.h @@ -19,7 +19,7 @@ #include "glad/glad.h" -namespace backend { namespace opengl { +namespace dawn_native { namespace opengl { class Device; @@ -41,6 +41,6 @@ namespace backend { namespace opengl { size_t mNumSampledTextures; }; -}} // namespace backend::opengl +}} // namespace dawn_native::opengl #endif // DAWNNATIVE_OPENGL_PIPELINELAYOUTGL_H_ diff --git a/src/dawn_native/opengl/QueueGL.cpp b/src/dawn_native/opengl/QueueGL.cpp index 1243d6b0c6..5c6d10d62a 100644 --- a/src/dawn_native/opengl/QueueGL.cpp +++ b/src/dawn_native/opengl/QueueGL.cpp @@ -17,7 +17,7 @@ #include "dawn_native/opengl/CommandBufferGL.h" #include "dawn_native/opengl/DeviceGL.h" -namespace backend { namespace opengl { +namespace dawn_native { namespace opengl { Queue::Queue(Device* device) : QueueBase(device) { } @@ -28,4 +28,4 @@ namespace backend { namespace opengl { } } -}} // namespace backend::opengl +}} // namespace dawn_native::opengl diff --git a/src/dawn_native/opengl/QueueGL.h b/src/dawn_native/opengl/QueueGL.h index 35dbd9a051..d8bbfa7c42 100644 --- a/src/dawn_native/opengl/QueueGL.h +++ b/src/dawn_native/opengl/QueueGL.h @@ -17,7 +17,7 @@ #include "dawn_native/Queue.h" -namespace backend { namespace opengl { +namespace dawn_native { namespace opengl { class CommandBuffer; class Device; @@ -30,6 +30,6 @@ namespace backend { namespace opengl { void Submit(uint32_t numCommands, CommandBuffer* const* commands); }; -}} // namespace backend::opengl +}} // namespace dawn_native::opengl #endif // DAWNNATIVE_OPENGL_QUEUEGL_H_ diff --git a/src/dawn_native/opengl/RenderPipelineGL.cpp b/src/dawn_native/opengl/RenderPipelineGL.cpp index a6522fd44f..d9911be11c 100644 --- a/src/dawn_native/opengl/RenderPipelineGL.cpp +++ b/src/dawn_native/opengl/RenderPipelineGL.cpp @@ -20,7 +20,7 @@ #include "dawn_native/opengl/InputStateGL.h" #include "dawn_native/opengl/PersistentPipelineStateGL.h" -namespace backend { namespace opengl { +namespace dawn_native { namespace opengl { namespace { GLenum GLPrimitiveTopology(dawn::PrimitiveTopology primitiveTopology) { @@ -65,4 +65,4 @@ namespace backend { namespace opengl { } } -}} // namespace backend::opengl +}} // namespace dawn_native::opengl diff --git a/src/dawn_native/opengl/RenderPipelineGL.h b/src/dawn_native/opengl/RenderPipelineGL.h index 9fdff35540..042000c558 100644 --- a/src/dawn_native/opengl/RenderPipelineGL.h +++ b/src/dawn_native/opengl/RenderPipelineGL.h @@ -23,7 +23,7 @@ #include -namespace backend { namespace opengl { +namespace dawn_native { namespace opengl { class PersistentPipelineState; @@ -39,6 +39,6 @@ namespace backend { namespace opengl { GLenum mGlPrimitiveTopology; }; -}} // namespace backend::opengl +}} // namespace dawn_native::opengl #endif // DAWNNATIVE_OPENGL_RENDERPIPELINEGL_H_ diff --git a/src/dawn_native/opengl/SamplerGL.cpp b/src/dawn_native/opengl/SamplerGL.cpp index ec60d39b34..d8ee7a4fd2 100644 --- a/src/dawn_native/opengl/SamplerGL.cpp +++ b/src/dawn_native/opengl/SamplerGL.cpp @@ -17,7 +17,7 @@ #include "common/Assert.h" #include "dawn_native/opengl/DeviceGL.h" -namespace backend { namespace opengl { +namespace dawn_native { namespace opengl { namespace { GLenum MagFilterMode(dawn::FilterMode filter) { @@ -86,4 +86,4 @@ namespace backend { namespace opengl { return mHandle; } -}} // namespace backend::opengl +}} // namespace dawn_native::opengl diff --git a/src/dawn_native/opengl/SamplerGL.h b/src/dawn_native/opengl/SamplerGL.h index ccad9c2ad2..a94f239071 100644 --- a/src/dawn_native/opengl/SamplerGL.h +++ b/src/dawn_native/opengl/SamplerGL.h @@ -19,7 +19,7 @@ #include "glad/glad.h" -namespace backend { namespace opengl { +namespace dawn_native { namespace opengl { class Device; @@ -33,6 +33,6 @@ namespace backend { namespace opengl { GLuint mHandle; }; -}} // namespace backend::opengl +}} // namespace dawn_native::opengl #endif // DAWNNATIVE_OPENGL_SAMPLERGL_H_ diff --git a/src/dawn_native/opengl/ShaderModuleGL.cpp b/src/dawn_native/opengl/ShaderModuleGL.cpp index b0651a6f3c..c8f1f4e875 100644 --- a/src/dawn_native/opengl/ShaderModuleGL.cpp +++ b/src/dawn_native/opengl/ShaderModuleGL.cpp @@ -21,7 +21,7 @@ #include -namespace backend { namespace opengl { +namespace dawn_native { namespace opengl { std::string GetBindingName(uint32_t group, uint32_t binding) { std::ostringstream o; @@ -129,4 +129,4 @@ namespace backend { namespace opengl { return mCombinedInfo; } -}} // namespace backend::opengl +}} // namespace dawn_native::opengl diff --git a/src/dawn_native/opengl/ShaderModuleGL.h b/src/dawn_native/opengl/ShaderModuleGL.h index c2c8a1925b..9bd77276c0 100644 --- a/src/dawn_native/opengl/ShaderModuleGL.h +++ b/src/dawn_native/opengl/ShaderModuleGL.h @@ -19,7 +19,7 @@ #include "glad/glad.h" -namespace backend { namespace opengl { +namespace dawn_native { namespace opengl { class Device; @@ -52,6 +52,6 @@ namespace backend { namespace opengl { std::string mGlslSource; }; -}} // namespace backend::opengl +}} // namespace dawn_native::opengl #endif // DAWNNATIVE_OPENGL_SHADERMODULEGL_H_ diff --git a/src/dawn_native/opengl/SwapChainGL.cpp b/src/dawn_native/opengl/SwapChainGL.cpp index 6fad7b55bd..2cbeee001b 100644 --- a/src/dawn_native/opengl/SwapChainGL.cpp +++ b/src/dawn_native/opengl/SwapChainGL.cpp @@ -19,7 +19,7 @@ #include -namespace backend { namespace opengl { +namespace dawn_native { namespace opengl { SwapChain::SwapChain(SwapChainBuilder* builder) : SwapChainBase(builder) { const auto& im = GetImplementation(); @@ -44,4 +44,4 @@ namespace backend { namespace opengl { void SwapChain::OnBeforePresent(TextureBase*) { } -}} // namespace backend::opengl +}} // namespace dawn_native::opengl diff --git a/src/dawn_native/opengl/SwapChainGL.h b/src/dawn_native/opengl/SwapChainGL.h index 8ae6066918..23b818857f 100644 --- a/src/dawn_native/opengl/SwapChainGL.h +++ b/src/dawn_native/opengl/SwapChainGL.h @@ -19,7 +19,7 @@ #include "glad/glad.h" -namespace backend { namespace opengl { +namespace dawn_native { namespace opengl { class Device; @@ -33,6 +33,6 @@ namespace backend { namespace opengl { void OnBeforePresent(TextureBase* texture) override; }; -}} // namespace backend::opengl +}} // namespace dawn_native::opengl #endif // DAWNNATIVE_OPENGL_SWAPCHAINGL_H_ diff --git a/src/dawn_native/opengl/TextureGL.cpp b/src/dawn_native/opengl/TextureGL.cpp index 06b612f054..fe528742f9 100644 --- a/src/dawn_native/opengl/TextureGL.cpp +++ b/src/dawn_native/opengl/TextureGL.cpp @@ -19,7 +19,7 @@ #include #include -namespace backend { namespace opengl { +namespace dawn_native { namespace opengl { namespace { @@ -116,4 +116,4 @@ namespace backend { namespace opengl { TextureView::TextureView(TextureViewBuilder* builder) : TextureViewBase(builder) { } -}} // namespace backend::opengl +}} // namespace dawn_native::opengl diff --git a/src/dawn_native/opengl/TextureGL.h b/src/dawn_native/opengl/TextureGL.h index 0964a2ab3a..3c29a5b3eb 100644 --- a/src/dawn_native/opengl/TextureGL.h +++ b/src/dawn_native/opengl/TextureGL.h @@ -19,7 +19,7 @@ #include "glad/glad.h" -namespace backend { namespace opengl { +namespace dawn_native { namespace opengl { struct TextureFormatInfo { GLenum internalFormat; @@ -47,6 +47,6 @@ namespace backend { namespace opengl { TextureView(TextureViewBuilder* builder); }; -}} // namespace backend::opengl +}} // namespace dawn_native::opengl #endif // DAWNNATIVE_OPENGL_TEXTUREGL_H_ diff --git a/src/dawn_native/vulkan/BindGroupLayoutVk.cpp b/src/dawn_native/vulkan/BindGroupLayoutVk.cpp index 3470dd8dc1..3361898a66 100644 --- a/src/dawn_native/vulkan/BindGroupLayoutVk.cpp +++ b/src/dawn_native/vulkan/BindGroupLayoutVk.cpp @@ -17,7 +17,7 @@ #include "common/BitSetIterator.h" #include "dawn_native/vulkan/DeviceVk.h" -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { namespace { @@ -151,4 +151,4 @@ namespace backend { namespace vulkan { *numPoolSizes = numSizes; return result; } -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan diff --git a/src/dawn_native/vulkan/BindGroupLayoutVk.h b/src/dawn_native/vulkan/BindGroupLayoutVk.h index 82e7393ca4..15444482fc 100644 --- a/src/dawn_native/vulkan/BindGroupLayoutVk.h +++ b/src/dawn_native/vulkan/BindGroupLayoutVk.h @@ -19,7 +19,7 @@ #include "common/vulkan_platform.h" -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { class Device; @@ -40,6 +40,6 @@ namespace backend { namespace vulkan { VkDescriptorSetLayout mHandle = VK_NULL_HANDLE; }; -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan #endif // DAWNNATIVE_VULKAN_BINDGROUPLAYOUTVK_H_ diff --git a/src/dawn_native/vulkan/BindGroupVk.cpp b/src/dawn_native/vulkan/BindGroupVk.cpp index c496c0b6f0..49a972c2e0 100644 --- a/src/dawn_native/vulkan/BindGroupVk.cpp +++ b/src/dawn_native/vulkan/BindGroupVk.cpp @@ -23,7 +23,7 @@ #include "common/BitSetIterator.h" -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { BindGroup::BindGroup(BindGroupBuilder* builder) : BindGroupBase(builder) { // Create a pool to hold our descriptor set. @@ -135,4 +135,4 @@ namespace backend { namespace vulkan { return mHandle; } -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan diff --git a/src/dawn_native/vulkan/BindGroupVk.h b/src/dawn_native/vulkan/BindGroupVk.h index 5d05dfb79c..9dee3a3bcf 100644 --- a/src/dawn_native/vulkan/BindGroupVk.h +++ b/src/dawn_native/vulkan/BindGroupVk.h @@ -19,7 +19,7 @@ #include "common/vulkan_platform.h" -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { class Device; @@ -35,6 +35,6 @@ namespace backend { namespace vulkan { VkDescriptorSet mHandle = VK_NULL_HANDLE; }; -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan #endif // DAWNNATIVE_VULKAN_BINDGROUPVK_H_ diff --git a/src/dawn_native/vulkan/BlendStateVk.cpp b/src/dawn_native/vulkan/BlendStateVk.cpp index 58417ae7a5..cc4911b609 100644 --- a/src/dawn_native/vulkan/BlendStateVk.cpp +++ b/src/dawn_native/vulkan/BlendStateVk.cpp @@ -16,7 +16,7 @@ #include "common/Assert.h" -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { namespace { VkBlendFactor VulkanBlendFactor(dawn::BlendFactor factor) { @@ -107,4 +107,4 @@ namespace backend { namespace vulkan { return mState; } -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan diff --git a/src/dawn_native/vulkan/BlendStateVk.h b/src/dawn_native/vulkan/BlendStateVk.h index 348bea6df3..fd025707c5 100644 --- a/src/dawn_native/vulkan/BlendStateVk.h +++ b/src/dawn_native/vulkan/BlendStateVk.h @@ -19,7 +19,7 @@ #include "common/vulkan_platform.h" -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { class Device; @@ -34,6 +34,6 @@ namespace backend { namespace vulkan { VkPipelineColorBlendAttachmentState mState; }; -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan #endif // DAWNNATIVE_VULKAN_BLENDSTATEVK_H_ diff --git a/src/dawn_native/vulkan/BufferUploader.cpp b/src/dawn_native/vulkan/BufferUploader.cpp index bdcc2af18a..e74143f05d 100644 --- a/src/dawn_native/vulkan/BufferUploader.cpp +++ b/src/dawn_native/vulkan/BufferUploader.cpp @@ -20,7 +20,7 @@ #include -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { BufferUploader::BufferUploader(Device* device) : mDevice(device) { } @@ -99,4 +99,4 @@ namespace backend { namespace vulkan { void BufferUploader::Tick(Serial) { } -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan diff --git a/src/dawn_native/vulkan/BufferUploader.h b/src/dawn_native/vulkan/BufferUploader.h index 0ab85f85e5..37ff0d7d6e 100644 --- a/src/dawn_native/vulkan/BufferUploader.h +++ b/src/dawn_native/vulkan/BufferUploader.h @@ -18,7 +18,7 @@ #include "common/SerialQueue.h" #include "common/vulkan_platform.h" -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { class Device; @@ -38,6 +38,6 @@ namespace backend { namespace vulkan { Device* mDevice = nullptr; }; -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan #endif // DAWNNATIVE_VULKAN_BUFFERUPLOADER_H_ diff --git a/src/dawn_native/vulkan/BufferVk.cpp b/src/dawn_native/vulkan/BufferVk.cpp index d20c7ff02a..e8d2c7d0e6 100644 --- a/src/dawn_native/vulkan/BufferVk.cpp +++ b/src/dawn_native/vulkan/BufferVk.cpp @@ -20,7 +20,7 @@ #include -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { namespace { @@ -267,4 +267,4 @@ namespace backend { namespace vulkan { mInflightRequests.ClearUpTo(finishedSerial); } -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan diff --git a/src/dawn_native/vulkan/BufferVk.h b/src/dawn_native/vulkan/BufferVk.h index a6042f3749..0c466a7251 100644 --- a/src/dawn_native/vulkan/BufferVk.h +++ b/src/dawn_native/vulkan/BufferVk.h @@ -21,7 +21,7 @@ #include "common/vulkan_platform.h" #include "dawn_native/vulkan/MemoryAllocator.h" -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { class Device; @@ -74,6 +74,6 @@ namespace backend { namespace vulkan { SerialQueue mInflightRequests; }; -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan #endif // DAWNNATIVE_VULKAN_BUFFERVK_H_ diff --git a/src/dawn_native/vulkan/CommandBufferVk.cpp b/src/dawn_native/vulkan/CommandBufferVk.cpp index 1b42e96952..324d57bb3a 100644 --- a/src/dawn_native/vulkan/CommandBufferVk.cpp +++ b/src/dawn_native/vulkan/CommandBufferVk.cpp @@ -24,7 +24,7 @@ #include "dawn_native/vulkan/RenderPipelineVk.h" #include "dawn_native/vulkan/TextureVk.h" -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { namespace { @@ -421,4 +421,4 @@ namespace backend { namespace vulkan { UNREACHABLE(); } -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan diff --git a/src/dawn_native/vulkan/CommandBufferVk.h b/src/dawn_native/vulkan/CommandBufferVk.h index 26bf3d4ee2..b6499df417 100644 --- a/src/dawn_native/vulkan/CommandBufferVk.h +++ b/src/dawn_native/vulkan/CommandBufferVk.h @@ -19,7 +19,7 @@ #include "common/vulkan_platform.h" -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { class RenderPassDescriptor; @@ -38,6 +38,6 @@ namespace backend { namespace vulkan { std::vector mPassResourceUsages; }; -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan #endif // DAWNNATIVE_VULKAN_COMMANDBUFFERVK_H_ diff --git a/src/dawn_native/vulkan/ComputePipelineVk.cpp b/src/dawn_native/vulkan/ComputePipelineVk.cpp index 9d0000a678..7e67f62c3b 100644 --- a/src/dawn_native/vulkan/ComputePipelineVk.cpp +++ b/src/dawn_native/vulkan/ComputePipelineVk.cpp @@ -19,7 +19,7 @@ #include "dawn_native/vulkan/PipelineLayoutVk.h" #include "dawn_native/vulkan/ShaderModuleVk.h" -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { ComputePipeline::ComputePipeline(ComputePipelineBuilder* builder) : ComputePipelineBase(builder), mDevice(ToBackend(builder->GetDevice())) { @@ -57,4 +57,4 @@ namespace backend { namespace vulkan { return mHandle; } -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan diff --git a/src/dawn_native/vulkan/ComputePipelineVk.h b/src/dawn_native/vulkan/ComputePipelineVk.h index bd4b5ec082..340d9fe369 100644 --- a/src/dawn_native/vulkan/ComputePipelineVk.h +++ b/src/dawn_native/vulkan/ComputePipelineVk.h @@ -19,7 +19,7 @@ #include "common/vulkan_platform.h" -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { class Device; @@ -35,6 +35,6 @@ namespace backend { namespace vulkan { Device* mDevice = nullptr; }; -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan #endif // DAWNNATIVE_VULKAN_COMPUTEPIPELINEVK_H_ diff --git a/src/dawn_native/vulkan/DepthStencilStateVk.cpp b/src/dawn_native/vulkan/DepthStencilStateVk.cpp index d5c42b0e11..a50bb0d774 100644 --- a/src/dawn_native/vulkan/DepthStencilStateVk.cpp +++ b/src/dawn_native/vulkan/DepthStencilStateVk.cpp @@ -16,7 +16,7 @@ #include "common/Assert.h" -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { namespace { VkCompareOp VulkanCompareOp(dawn::CompareFunction op) { @@ -109,4 +109,4 @@ namespace backend { namespace vulkan { return &mCreateInfo; } -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan diff --git a/src/dawn_native/vulkan/DepthStencilStateVk.h b/src/dawn_native/vulkan/DepthStencilStateVk.h index fc3333098f..1f9a2a5221 100644 --- a/src/dawn_native/vulkan/DepthStencilStateVk.h +++ b/src/dawn_native/vulkan/DepthStencilStateVk.h @@ -19,7 +19,7 @@ #include "common/vulkan_platform.h" -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { class Device; @@ -34,6 +34,6 @@ namespace backend { namespace vulkan { VkPipelineDepthStencilStateCreateInfo mCreateInfo; }; -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan #endif // DAWNNATIVE_VULKAN_DEPTHSTENCILSTATEVK_H_ diff --git a/src/dawn_native/vulkan/DeviceVk.cpp b/src/dawn_native/vulkan/DeviceVk.cpp index 19f518b0c3..75eb4a38e4 100644 --- a/src/dawn_native/vulkan/DeviceVk.cpp +++ b/src/dawn_native/vulkan/DeviceVk.cpp @@ -50,7 +50,7 @@ const char kVulkanLibName[] = "vulkan-1.dll"; # error "Unimplemented Vulkan backend platform" #endif -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { dawnProcTable GetNonValidatingProcs(); dawnProcTable GetValidatingProcs(); @@ -684,4 +684,4 @@ namespace backend { namespace vulkan { commands->commandBuffer = VK_NULL_HANDLE; } -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan diff --git a/src/dawn_native/vulkan/DeviceVk.h b/src/dawn_native/vulkan/DeviceVk.h index 11178ac4ba..7a9b5db888 100644 --- a/src/dawn_native/vulkan/DeviceVk.h +++ b/src/dawn_native/vulkan/DeviceVk.h @@ -27,7 +27,7 @@ #include -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { class BufferUploader; class FencedDeleter; @@ -155,6 +155,6 @@ namespace backend { namespace vulkan { std::vector mWaitSemaphores; }; -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan #endif // DAWNNATIVE_VULKAN_DEVICEVK_H_ diff --git a/src/dawn_native/vulkan/FencedDeleter.cpp b/src/dawn_native/vulkan/FencedDeleter.cpp index ad2234c153..6503f7334d 100644 --- a/src/dawn_native/vulkan/FencedDeleter.cpp +++ b/src/dawn_native/vulkan/FencedDeleter.cpp @@ -16,7 +16,7 @@ #include "dawn_native/vulkan/DeviceVk.h" -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { FencedDeleter::FencedDeleter(Device* device) : mDevice(device) { } @@ -170,4 +170,4 @@ namespace backend { namespace vulkan { mSamplersToDelete.ClearUpTo(completedSerial); } -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan diff --git a/src/dawn_native/vulkan/FencedDeleter.h b/src/dawn_native/vulkan/FencedDeleter.h index a8e0a96cd0..7200eda94d 100644 --- a/src/dawn_native/vulkan/FencedDeleter.h +++ b/src/dawn_native/vulkan/FencedDeleter.h @@ -18,7 +18,7 @@ #include "common/SerialQueue.h" #include "common/vulkan_platform.h" -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { class Device; @@ -62,6 +62,6 @@ namespace backend { namespace vulkan { SerialQueue mSwapChainsToDelete; }; -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan #endif // DAWNNATIVE_VULKAN_FENCEDDELETER_H_ diff --git a/src/dawn_native/vulkan/Forward.h b/src/dawn_native/vulkan/Forward.h index fa29a18fd5..b89261ccfc 100644 --- a/src/dawn_native/vulkan/Forward.h +++ b/src/dawn_native/vulkan/Forward.h @@ -17,11 +17,11 @@ #include "dawn_native/ToBackend.h" -namespace backend { +namespace dawn_native { class BufferViewBase; } -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { class BindGroup; class BindGroupLayout; @@ -70,6 +70,6 @@ namespace backend { namespace vulkan { return ToBackendBase(common); } -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan #endif // DAWNNATIVE_VULKAN_FORWARD_H_ diff --git a/src/dawn_native/vulkan/InputStateVk.cpp b/src/dawn_native/vulkan/InputStateVk.cpp index df51c5979e..185270229c 100644 --- a/src/dawn_native/vulkan/InputStateVk.cpp +++ b/src/dawn_native/vulkan/InputStateVk.cpp @@ -16,7 +16,7 @@ #include "common/BitSetIterator.h" -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { namespace { @@ -106,4 +106,4 @@ namespace backend { namespace vulkan { return &mCreateInfo; } -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan diff --git a/src/dawn_native/vulkan/InputStateVk.h b/src/dawn_native/vulkan/InputStateVk.h index 7204f8b0c7..b44c08ad1c 100644 --- a/src/dawn_native/vulkan/InputStateVk.h +++ b/src/dawn_native/vulkan/InputStateVk.h @@ -19,7 +19,7 @@ #include "common/vulkan_platform.h" -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { class Device; @@ -36,6 +36,6 @@ namespace backend { namespace vulkan { std::array mAttributes; }; -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan #endif // DAWNNATIVE_VULKAN_INPUTSTATEVK_H_ diff --git a/src/dawn_native/vulkan/MemoryAllocator.cpp b/src/dawn_native/vulkan/MemoryAllocator.cpp index fa0f01924d..3ab6c26d47 100644 --- a/src/dawn_native/vulkan/MemoryAllocator.cpp +++ b/src/dawn_native/vulkan/MemoryAllocator.cpp @@ -17,7 +17,7 @@ #include "dawn_native/vulkan/DeviceVk.h" #include "dawn_native/vulkan/FencedDeleter.h" -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { DeviceMemoryAllocation::~DeviceMemoryAllocation() { ASSERT(mMemory == VK_NULL_HANDLE); @@ -130,4 +130,4 @@ namespace backend { namespace vulkan { void MemoryAllocator::Tick(Serial) { } -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan diff --git a/src/dawn_native/vulkan/MemoryAllocator.h b/src/dawn_native/vulkan/MemoryAllocator.h index d7042dada6..afea7afc93 100644 --- a/src/dawn_native/vulkan/MemoryAllocator.h +++ b/src/dawn_native/vulkan/MemoryAllocator.h @@ -18,7 +18,7 @@ #include "common/SerialQueue.h" #include "common/vulkan_platform.h" -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { class Device; class MemoryAllocator; @@ -53,6 +53,6 @@ namespace backend { namespace vulkan { Device* mDevice = nullptr; }; -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan #endif // DAWNNATIVE_VULKAN_MEMORYALLOCATOR_H_ diff --git a/src/dawn_native/vulkan/NativeSwapChainImplVk.cpp b/src/dawn_native/vulkan/NativeSwapChainImplVk.cpp index 415c182804..f5271348c1 100644 --- a/src/dawn_native/vulkan/NativeSwapChainImplVk.cpp +++ b/src/dawn_native/vulkan/NativeSwapChainImplVk.cpp @@ -20,7 +20,7 @@ #include -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { namespace { @@ -206,4 +206,4 @@ namespace backend { namespace vulkan { return mConfig.format; } -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan diff --git a/src/dawn_native/vulkan/NativeSwapChainImplVk.h b/src/dawn_native/vulkan/NativeSwapChainImplVk.h index 85fb4be1f7..8a95647596 100644 --- a/src/dawn_native/vulkan/NativeSwapChainImplVk.h +++ b/src/dawn_native/vulkan/NativeSwapChainImplVk.h @@ -20,7 +20,7 @@ #include "dawn/dawn_wsi.h" #include "dawn/dawncpp.h" -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { class Device; @@ -64,6 +64,6 @@ namespace backend { namespace vulkan { Device* mDevice = nullptr; }; -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan #endif // DAWNNATIVE_VULKAN_NATIVESWAPCHAINIMPLVK_H_ diff --git a/src/dawn_native/vulkan/PipelineLayoutVk.cpp b/src/dawn_native/vulkan/PipelineLayoutVk.cpp index 89ebe2a81c..11b059cd10 100644 --- a/src/dawn_native/vulkan/PipelineLayoutVk.cpp +++ b/src/dawn_native/vulkan/PipelineLayoutVk.cpp @@ -20,7 +20,7 @@ #include "common/BitSetIterator.h" -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { PipelineLayout::PipelineLayout(Device* device, const dawn::PipelineLayoutDescriptor* descriptor) : PipelineLayoutBase(device, descriptor) { @@ -67,4 +67,4 @@ namespace backend { namespace vulkan { return mHandle; } -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan diff --git a/src/dawn_native/vulkan/PipelineLayoutVk.h b/src/dawn_native/vulkan/PipelineLayoutVk.h index fad98716dc..77b6bca490 100644 --- a/src/dawn_native/vulkan/PipelineLayoutVk.h +++ b/src/dawn_native/vulkan/PipelineLayoutVk.h @@ -19,7 +19,7 @@ #include "common/vulkan_platform.h" -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { class Device; @@ -34,6 +34,6 @@ namespace backend { namespace vulkan { VkPipelineLayout mHandle = VK_NULL_HANDLE; }; -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan #endif // DAWNNATIVE_VULKAN_PIPELINELAYOUTVK_H_ diff --git a/src/dawn_native/vulkan/QueueVk.cpp b/src/dawn_native/vulkan/QueueVk.cpp index 0672f83fd0..c7379402da 100644 --- a/src/dawn_native/vulkan/QueueVk.cpp +++ b/src/dawn_native/vulkan/QueueVk.cpp @@ -17,7 +17,7 @@ #include "dawn_native/vulkan/CommandBufferVk.h" #include "dawn_native/vulkan/DeviceVk.h" -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { Queue::Queue(Device* device) : QueueBase(device) { } @@ -36,4 +36,4 @@ namespace backend { namespace vulkan { device->SubmitPendingCommands(); } -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan diff --git a/src/dawn_native/vulkan/QueueVk.h b/src/dawn_native/vulkan/QueueVk.h index 713ca30fd7..6745c40c58 100644 --- a/src/dawn_native/vulkan/QueueVk.h +++ b/src/dawn_native/vulkan/QueueVk.h @@ -17,7 +17,7 @@ #include "dawn_native/Queue.h" -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { class CommandBuffer; class Device; @@ -31,6 +31,6 @@ namespace backend { namespace vulkan { void Submit(uint32_t numCommands, CommandBuffer* const* commands); }; -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan #endif // DAWNNATIVE_VULKAN_QUEUEVK_H_ diff --git a/src/dawn_native/vulkan/RenderPassCache.cpp b/src/dawn_native/vulkan/RenderPassCache.cpp index 273c4f044c..76e35f5d09 100644 --- a/src/dawn_native/vulkan/RenderPassCache.cpp +++ b/src/dawn_native/vulkan/RenderPassCache.cpp @@ -19,7 +19,7 @@ #include "dawn_native/vulkan/DeviceVk.h" #include "dawn_native/vulkan/TextureVk.h" -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { namespace { VkAttachmentLoadOp VulkanAttachmentLoadOp(dawn::LoadOp op) { @@ -206,4 +206,4 @@ namespace backend { namespace vulkan { return true; } -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan diff --git a/src/dawn_native/vulkan/RenderPassCache.h b/src/dawn_native/vulkan/RenderPassCache.h index 4ecd1aba8e..a93d46fd14 100644 --- a/src/dawn_native/vulkan/RenderPassCache.h +++ b/src/dawn_native/vulkan/RenderPassCache.h @@ -24,7 +24,7 @@ #include #include -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { class Device; @@ -76,6 +76,6 @@ namespace backend { namespace vulkan { Cache mCache; }; -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan #endif // DAWNNATIVE_VULKAN_RENDERPASSCACHE_H_ diff --git a/src/dawn_native/vulkan/RenderPassDescriptorVk.cpp b/src/dawn_native/vulkan/RenderPassDescriptorVk.cpp index 194610552a..a0f6d3540a 100644 --- a/src/dawn_native/vulkan/RenderPassDescriptorVk.cpp +++ b/src/dawn_native/vulkan/RenderPassDescriptorVk.cpp @@ -20,7 +20,7 @@ #include "dawn_native/vulkan/RenderPassCache.h" #include "dawn_native/vulkan/TextureVk.h" -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { RenderPassDescriptor::RenderPassDescriptor(RenderPassDescriptorBuilder* builder) : RenderPassDescriptorBase(builder), mDevice(ToBackend(builder->GetDevice())) { @@ -119,4 +119,4 @@ namespace backend { namespace vulkan { mDevice->fn.CmdBeginRenderPass(commands, &beginInfo, VK_SUBPASS_CONTENTS_INLINE); } -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan diff --git a/src/dawn_native/vulkan/RenderPassDescriptorVk.h b/src/dawn_native/vulkan/RenderPassDescriptorVk.h index 5add4fb20e..07b65b63a4 100644 --- a/src/dawn_native/vulkan/RenderPassDescriptorVk.h +++ b/src/dawn_native/vulkan/RenderPassDescriptorVk.h @@ -19,7 +19,7 @@ #include "common/vulkan_platform.h" -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { class Device; @@ -34,6 +34,6 @@ namespace backend { namespace vulkan { Device* mDevice = nullptr; }; -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan #endif // DAWNNATIVE_VULKAN_RENDERPASSDESCRIPTORVK_H_ diff --git a/src/dawn_native/vulkan/RenderPipelineVk.cpp b/src/dawn_native/vulkan/RenderPipelineVk.cpp index 8ebafa0927..6c8f65331c 100644 --- a/src/dawn_native/vulkan/RenderPipelineVk.cpp +++ b/src/dawn_native/vulkan/RenderPipelineVk.cpp @@ -24,7 +24,7 @@ #include "dawn_native/vulkan/RenderPassDescriptorVk.h" #include "dawn_native/vulkan/ShaderModuleVk.h" -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { namespace { @@ -226,4 +226,4 @@ namespace backend { namespace vulkan { return mHandle; } -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan diff --git a/src/dawn_native/vulkan/RenderPipelineVk.h b/src/dawn_native/vulkan/RenderPipelineVk.h index 2587131d18..e43676e757 100644 --- a/src/dawn_native/vulkan/RenderPipelineVk.h +++ b/src/dawn_native/vulkan/RenderPipelineVk.h @@ -19,7 +19,7 @@ #include "common/vulkan_platform.h" -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { class Device; @@ -35,6 +35,6 @@ namespace backend { namespace vulkan { Device* mDevice = nullptr; }; -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan #endif // DAWNNATIVE_VULKAN_RENDERPIPELINEVK_H_ diff --git a/src/dawn_native/vulkan/SamplerVk.cpp b/src/dawn_native/vulkan/SamplerVk.cpp index b40af26321..113ac40403 100644 --- a/src/dawn_native/vulkan/SamplerVk.cpp +++ b/src/dawn_native/vulkan/SamplerVk.cpp @@ -17,7 +17,7 @@ #include "dawn_native/vulkan/DeviceVk.h" #include "dawn_native/vulkan/FencedDeleter.h" -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { namespace { VkSamplerAddressMode VulkanSamplerAddressMode(dawn::AddressMode mode) { @@ -95,4 +95,4 @@ namespace backend { namespace vulkan { return mHandle; } -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan diff --git a/src/dawn_native/vulkan/SamplerVk.h b/src/dawn_native/vulkan/SamplerVk.h index 872fdc6403..076c9afeb4 100644 --- a/src/dawn_native/vulkan/SamplerVk.h +++ b/src/dawn_native/vulkan/SamplerVk.h @@ -20,7 +20,7 @@ #include "common/vulkan_platform.h" #include "dawn_native/vulkan/MemoryAllocator.h" -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { class Sampler : public SamplerBase { public: @@ -34,6 +34,6 @@ namespace backend { namespace vulkan { Device* mDevice = nullptr; }; -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan #endif // DAWNNATIVE_VULKAN_SAMPLERVK_H_ diff --git a/src/dawn_native/vulkan/ShaderModuleVk.cpp b/src/dawn_native/vulkan/ShaderModuleVk.cpp index 6db4cc1bb7..1c4644ea19 100644 --- a/src/dawn_native/vulkan/ShaderModuleVk.cpp +++ b/src/dawn_native/vulkan/ShaderModuleVk.cpp @@ -19,7 +19,7 @@ #include -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { ShaderModule::ShaderModule(ShaderModuleBuilder* builder) : ShaderModuleBase(builder) { std::vector spirv = builder->AcquireSpirv(); @@ -57,4 +57,4 @@ namespace backend { namespace vulkan { return mHandle; } -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan diff --git a/src/dawn_native/vulkan/ShaderModuleVk.h b/src/dawn_native/vulkan/ShaderModuleVk.h index 55d04f9af9..4e46787438 100644 --- a/src/dawn_native/vulkan/ShaderModuleVk.h +++ b/src/dawn_native/vulkan/ShaderModuleVk.h @@ -19,7 +19,7 @@ #include "common/vulkan_platform.h" -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { class ShaderModule : public ShaderModuleBase { public: @@ -32,6 +32,6 @@ namespace backend { namespace vulkan { VkShaderModule mHandle = VK_NULL_HANDLE; }; -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan #endif // DAWNNATIVE_VULKAN_SHADERMODULEVK_H_ diff --git a/src/dawn_native/vulkan/SwapChainVk.cpp b/src/dawn_native/vulkan/SwapChainVk.cpp index 16ca36e67c..9e4293ee3f 100644 --- a/src/dawn_native/vulkan/SwapChainVk.cpp +++ b/src/dawn_native/vulkan/SwapChainVk.cpp @@ -17,7 +17,7 @@ #include "dawn_native/vulkan/DeviceVk.h" #include "dawn_native/vulkan/TextureVk.h" -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { SwapChain::SwapChain(SwapChainBuilder* builder) : SwapChainBase(builder) { const auto& im = GetImplementation(); @@ -56,4 +56,4 @@ namespace backend { namespace vulkan { device->SubmitPendingCommands(); } -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan diff --git a/src/dawn_native/vulkan/SwapChainVk.h b/src/dawn_native/vulkan/SwapChainVk.h index 3d200a4af1..00715e500a 100644 --- a/src/dawn_native/vulkan/SwapChainVk.h +++ b/src/dawn_native/vulkan/SwapChainVk.h @@ -19,7 +19,7 @@ #include "common/vulkan_platform.h" -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { class SwapChain : public SwapChainBase { public: @@ -34,6 +34,6 @@ namespace backend { namespace vulkan { dawn::TextureUsageBit mTextureUsage; }; -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan #endif // DAWNNATIVE_VULKAN_SWAPCHAINVK_H_ diff --git a/src/dawn_native/vulkan/TextureVk.cpp b/src/dawn_native/vulkan/TextureVk.cpp index fa18435cb3..095cd20f09 100644 --- a/src/dawn_native/vulkan/TextureVk.cpp +++ b/src/dawn_native/vulkan/TextureVk.cpp @@ -17,7 +17,7 @@ #include "dawn_native/vulkan/DeviceVk.h" #include "dawn_native/vulkan/FencedDeleter.h" -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { namespace { // Converts an Dawn texture dimension to a Vulkan image type. @@ -380,4 +380,4 @@ namespace backend { namespace vulkan { return mHandle; } -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan diff --git a/src/dawn_native/vulkan/TextureVk.h b/src/dawn_native/vulkan/TextureVk.h index 1069e4f9f4..e5bbe3c5a7 100644 --- a/src/dawn_native/vulkan/TextureVk.h +++ b/src/dawn_native/vulkan/TextureVk.h @@ -20,7 +20,7 @@ #include "common/vulkan_platform.h" #include "dawn_native/vulkan/MemoryAllocator.h" -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { VkFormat VulkanImageFormat(dawn::TextureFormat format); VkImageUsageFlags VulkanImageUsage(dawn::TextureUsageBit usage, dawn::TextureFormat format); @@ -59,6 +59,6 @@ namespace backend { namespace vulkan { VkImageView mHandle = VK_NULL_HANDLE; }; -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan #endif // DAWNNATIVE_VULKAN_TEXTUREVK_H_ diff --git a/src/dawn_native/vulkan/VulkanFunctions.cpp b/src/dawn_native/vulkan/VulkanFunctions.cpp index 976d958658..09f6e512f4 100644 --- a/src/dawn_native/vulkan/VulkanFunctions.cpp +++ b/src/dawn_native/vulkan/VulkanFunctions.cpp @@ -17,7 +17,7 @@ #include "common/DynamicLib.h" #include "dawn_native/vulkan/VulkanInfo.h" -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { #define GET_GLOBAL_PROC(name) \ name = reinterpret_cast(GetInstanceProcAddr(nullptr, "vk" #name)); \ @@ -218,4 +218,4 @@ namespace backend { namespace vulkan { return true; } -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan diff --git a/src/dawn_native/vulkan/VulkanFunctions.h b/src/dawn_native/vulkan/VulkanFunctions.h index 6fa1e458e6..a9a6a54654 100644 --- a/src/dawn_native/vulkan/VulkanFunctions.h +++ b/src/dawn_native/vulkan/VulkanFunctions.h @@ -19,7 +19,7 @@ class DynamicLib; -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { struct VulkanGlobalKnobs; struct VulkanDeviceKnobs; @@ -210,6 +210,6 @@ namespace backend { namespace vulkan { PFN_vkQueuePresentKHR QueuePresentKHR = nullptr; }; -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan #endif // DAWNNATIVE_VULKAN_VULKANFUNCTIONS_H_ diff --git a/src/dawn_native/vulkan/VulkanInfo.cpp b/src/dawn_native/vulkan/VulkanInfo.cpp index 123a6a29cb..d7b4a846a4 100644 --- a/src/dawn_native/vulkan/VulkanInfo.cpp +++ b/src/dawn_native/vulkan/VulkanInfo.cpp @@ -28,7 +28,7 @@ namespace { } } // namespace -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { const char kLayerNameLunargStandardValidation[] = "VK_LAYER_LUNARG_standard_validation"; const char kLayerNameLunargVKTrace[] = "VK_LAYER_LUNARG_vktrace"; @@ -258,4 +258,4 @@ namespace backend { namespace vulkan { return true; } -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan diff --git a/src/dawn_native/vulkan/VulkanInfo.h b/src/dawn_native/vulkan/VulkanInfo.h index bc62fa6ef5..b87b666fef 100644 --- a/src/dawn_native/vulkan/VulkanInfo.h +++ b/src/dawn_native/vulkan/VulkanInfo.h @@ -19,7 +19,7 @@ #include -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { class Device; @@ -83,6 +83,6 @@ namespace backend { namespace vulkan { VulkanDeviceInfo* info); bool GatherSurfaceInfo(const Device& device, VkSurfaceKHR surface, VulkanSurfaceInfo* info); -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan #endif // DAWNNATIVE_VULKAN_VULKANINFO_H_ diff --git a/src/tests/unittests/CommandAllocatorTests.cpp b/src/tests/unittests/CommandAllocatorTests.cpp index d0a491ac17..d870694bae 100644 --- a/src/tests/unittests/CommandAllocatorTests.cpp +++ b/src/tests/unittests/CommandAllocatorTests.cpp @@ -16,7 +16,7 @@ #include "dawn_native/CommandAllocator.h" -using namespace backend; +using namespace dawn_native; // Definition of the command types used in the tests enum class CommandType { diff --git a/src/tests/unittests/ErrorTests.cpp b/src/tests/unittests/ErrorTests.cpp index fdd2c1fb3e..e95bbcf18e 100644 --- a/src/tests/unittests/ErrorTests.cpp +++ b/src/tests/unittests/ErrorTests.cpp @@ -17,7 +17,7 @@ #include "dawn_native/Error.h" #include "dawn_native/ErrorData.h" -using namespace backend; +using namespace dawn_native; namespace { diff --git a/src/tests/unittests/PerStageTests.cpp b/src/tests/unittests/PerStageTests.cpp index d05714a879..df1b2c47e0 100644 --- a/src/tests/unittests/PerStageTests.cpp +++ b/src/tests/unittests/PerStageTests.cpp @@ -16,7 +16,7 @@ #include "dawn_native/PerStage.h" -using namespace backend; +using namespace dawn_native; // Tests for StageBit TEST(PerStage, StageBit) { diff --git a/src/tests/unittests/RefCountedTests.cpp b/src/tests/unittests/RefCountedTests.cpp index ff6959600b..38dfef93ea 100644 --- a/src/tests/unittests/RefCountedTests.cpp +++ b/src/tests/unittests/RefCountedTests.cpp @@ -16,7 +16,7 @@ #include "dawn_native/RefCounted.h" -using namespace backend; +using namespace dawn_native; struct RCTest : public RefCounted { RCTest() { diff --git a/src/tests/unittests/ToBackendTests.cpp b/src/tests/unittests/ToBackendTests.cpp index 3a0764e73d..d16a4f7096 100644 --- a/src/tests/unittests/ToBackendTests.cpp +++ b/src/tests/unittests/ToBackendTests.cpp @@ -20,12 +20,12 @@ #include // Make our own Base - Backend object pair, reusing the CommandBuffer name -namespace backend { +namespace dawn_native { class CommandBufferBase : public RefCounted { }; } -using namespace backend; +using namespace dawn_native; class MyCommandBuffer : public CommandBufferBase { }; diff --git a/src/tests/unittests/d3d12/CopySplitTests.cpp b/src/tests/unittests/d3d12/CopySplitTests.cpp index d0f16b1dd1..d784628d21 100644 --- a/src/tests/unittests/d3d12/CopySplitTests.cpp +++ b/src/tests/unittests/d3d12/CopySplitTests.cpp @@ -20,7 +20,7 @@ #include "common/Constants.h" #include "common/Math.h" -using namespace backend::d3d12; +using namespace dawn_native::d3d12; namespace { diff --git a/src/tests/unittests/validation/ValidationTest.cpp b/src/tests/unittests/validation/ValidationTest.cpp index 44bcf92aa1..f3f7db2752 100644 --- a/src/tests/unittests/validation/ValidationTest.cpp +++ b/src/tests/unittests/validation/ValidationTest.cpp @@ -16,7 +16,7 @@ #include "dawn/dawn.h" -namespace backend { +namespace dawn_native { namespace null { void Init(dawnProcTable* procs, dawnDevice* device); } @@ -25,7 +25,7 @@ namespace backend { ValidationTest::ValidationTest() { dawnProcTable procs; dawnDevice cDevice; - backend::null::Init(&procs, &cDevice); + dawn_native::null::Init(&procs, &cDevice); dawnSetProcs(&procs); device = dawn::Device::Acquire(cDevice); diff --git a/src/utils/D3D12Binding.cpp b/src/utils/D3D12Binding.cpp index 60466212e1..cfea7ab3b0 100644 --- a/src/utils/D3D12Binding.cpp +++ b/src/utils/D3D12Binding.cpp @@ -21,13 +21,13 @@ #define GLFW_EXPOSE_NATIVE_WIN32 #include "GLFW/glfw3native.h" -namespace backend { namespace d3d12 { +namespace dawn_native { namespace d3d12 { void Init(dawnProcTable* procs, dawnDevice* device); dawnSwapChainImplementation CreateNativeSwapChainImpl(dawnDevice device, HWND window); dawnTextureFormat GetNativeSwapChainPreferredFormat( const dawnSwapChainImplementation* swapChain); -}} // namespace backend::d3d12 +}} // namespace dawn_native::d3d12 namespace utils { @@ -38,7 +38,7 @@ namespace utils { } void GetProcAndDevice(dawnProcTable* procs, dawnDevice* device) override { - backend::d3d12::Init(procs, device); + dawn_native::d3d12::Init(procs, device); mBackendDevice = *device; } @@ -46,14 +46,14 @@ namespace utils { if (mSwapchainImpl.userData == nullptr) { HWND win32Window = glfwGetWin32Window(mWindow); mSwapchainImpl = - backend::d3d12::CreateNativeSwapChainImpl(mBackendDevice, win32Window); + dawn_native::d3d12::CreateNativeSwapChainImpl(mBackendDevice, win32Window); } return reinterpret_cast(&mSwapchainImpl); } dawnTextureFormat GetPreferredSwapChainTextureFormat() override { ASSERT(mSwapchainImpl.userData != nullptr); - return backend::d3d12::GetNativeSwapChainPreferredFormat(&mSwapchainImpl); + return dawn_native::d3d12::GetNativeSwapChainPreferredFormat(&mSwapchainImpl); } private: diff --git a/src/utils/MetalBinding.mm b/src/utils/MetalBinding.mm index da1f07f91d..a27c9c7e44 100644 --- a/src/utils/MetalBinding.mm +++ b/src/utils/MetalBinding.mm @@ -25,7 +25,7 @@ #import #import -namespace backend { namespace metal { +namespace dawn_native { namespace metal { void Init(id metalDevice, dawnProcTable* procs, dawnDevice* device); void SetNextDrawable(dawnDevice device, id drawable); void Present(dawnDevice device); @@ -117,7 +117,7 @@ namespace utils { void GetProcAndDevice(dawnProcTable* procs, dawnDevice* device) override { mMetalDevice = MTLCreateSystemDefaultDevice(); - backend::metal::Init(mMetalDevice, procs, device); + dawn_native::metal::Init(mMetalDevice, procs, device); mBackendDevice = *device; } diff --git a/src/utils/NullBinding.cpp b/src/utils/NullBinding.cpp index c6681bc64f..1b428f1dc2 100644 --- a/src/utils/NullBinding.cpp +++ b/src/utils/NullBinding.cpp @@ -14,9 +14,9 @@ #include "utils/BackendBinding.h" -namespace backend { namespace null { +namespace dawn_native { namespace null { void Init(dawnProcTable* procs, dawnDevice* device); -}} // namespace backend::null +}} // namespace dawn_native::null namespace utils { @@ -25,7 +25,7 @@ namespace utils { void SetupGLFWWindowHints() override { } void GetProcAndDevice(dawnProcTable* procs, dawnDevice* device) override { - backend::null::Init(procs, device); + dawn_native::null::Init(procs, device); } uint64_t GetSwapChainImplementation() override { return 0; diff --git a/src/utils/OpenGLBinding.cpp b/src/utils/OpenGLBinding.cpp index 0f58f7f54b..8cc1cbc436 100644 --- a/src/utils/OpenGLBinding.cpp +++ b/src/utils/OpenGLBinding.cpp @@ -25,9 +25,9 @@ #include #include "GLFW/glfw3.h" -namespace backend { namespace opengl { +namespace dawn_native { namespace opengl { void Init(void* (*getProc)(const char*), dawnProcTable* procs, dawnDevice* device); -}} // namespace backend::opengl +}} // namespace dawn_native::opengl namespace utils { class SwapChainImplGL { @@ -113,8 +113,8 @@ namespace utils { } void GetProcAndDevice(dawnProcTable* procs, dawnDevice* device) override { glfwMakeContextCurrent(mWindow); - backend::opengl::Init(reinterpret_cast(glfwGetProcAddress), - procs, device); + dawn_native::opengl::Init(reinterpret_cast(glfwGetProcAddress), + procs, device); mBackendDevice = *device; } diff --git a/src/utils/VulkanBinding.cpp b/src/utils/VulkanBinding.cpp index f714fbcbda..58f25c7ab9 100644 --- a/src/utils/VulkanBinding.cpp +++ b/src/utils/VulkanBinding.cpp @@ -22,7 +22,7 @@ #include -namespace backend { namespace vulkan { +namespace dawn_native { namespace vulkan { void Init(dawnProcTable* procs, dawnDevice* device, const std::vector& requiredInstanceExtensions); @@ -32,7 +32,7 @@ namespace backend { namespace vulkan { dawnSwapChainImplementation CreateNativeSwapChainImpl(dawnDevice device, VkSurfaceKHR surface); dawnTextureFormat GetNativeSwapChainPreferredFormat( const dawnSwapChainImplementation* swapChain); -}} // namespace backend::vulkan +}} // namespace dawn_native::vulkan namespace utils { @@ -74,24 +74,24 @@ namespace utils { std::vector requiredExtensions(glfwInstanceExtensions, glfwInstanceExtensions + extensionCount); - backend::vulkan::Init(procs, device, requiredExtensions); + dawn_native::vulkan::Init(procs, device, requiredExtensions); mDevice = *device; } uint64_t GetSwapChainImplementation() override { if (mSwapchainImpl.userData == nullptr) { VkSurfaceKHR surface = VK_NULL_HANDLE; - if (glfwCreateWindowSurface(backend::vulkan::GetInstance(mDevice), mWindow, nullptr, - &surface) != VK_SUCCESS) { + if (glfwCreateWindowSurface(dawn_native::vulkan::GetInstance(mDevice), mWindow, + nullptr, &surface) != VK_SUCCESS) { ASSERT(false); } - mSwapchainImpl = backend::vulkan::CreateNativeSwapChainImpl(mDevice, surface); + mSwapchainImpl = dawn_native::vulkan::CreateNativeSwapChainImpl(mDevice, surface); } return reinterpret_cast(&mSwapchainImpl); } dawnTextureFormat GetPreferredSwapChainTextureFormat() override { ASSERT(mSwapchainImpl.userData != nullptr); - return backend::vulkan::GetNativeSwapChainPreferredFormat(&mSwapchainImpl); + return dawn_native::vulkan::GetNativeSwapChainPreferredFormat(&mSwapchainImpl); } private: