From 6328356129a3f5201d628fbd324826cda60f1f54 Mon Sep 17 00:00:00 2001 From: Kai Ninomiya Date: Fri, 10 Jul 2020 18:19:38 +0000 Subject: [PATCH] Autoformat everything except tests/examples Done by: - Appending an extra newline at the end of src/**/*.{cpp,h,mm,gn} except src/tests/* - Running git cl format --full to format the full contents of every changed file Bug: none Change-Id: Id88fc5ed0c5efbbc93b2c6a305c2f98465fe646d Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/24641 Reviewed-by: Corentin Wallez Reviewed-by: Austin Eng Commit-Queue: Kai Ninomiya --- src/common/LinkedList.h | 2 +- src/common/Math.cpp | 2 +- src/common/SerialStorage.h | 4 ++-- src/dawn/BUILD.gn | 24 +++++-------------- src/dawn_native/BindGroupLayout.cpp | 2 +- src/dawn_native/DynamicUploader.cpp | 2 +- src/dawn_native/Instance.cpp | 2 +- src/dawn_native/MapRequestTracker.cpp | 2 +- src/dawn_native/Pipeline.cpp | 2 +- src/dawn_native/PipelineLayout.cpp | 2 +- src/dawn_native/ResourceHeap.h | 2 +- src/dawn_native/ResourceMemoryAllocation.cpp | 2 +- src/dawn_native/RingBufferAllocator.h | 2 +- src/dawn_native/StagingBuffer.cpp | 2 +- src/dawn_native/StagingBuffer.h | 2 +- src/dawn_native/d3d12/BackendD3D12.h | 2 +- .../CPUDescriptorHeapAllocationD3D12.cpp | 2 +- .../d3d12/CPUDescriptorHeapAllocationD3D12.h | 2 +- src/dawn_native/d3d12/D3D12Error.h | 2 +- src/dawn_native/d3d12/D3D12Info.h | 2 +- .../GPUDescriptorHeapAllocationD3D12.cpp | 2 +- .../d3d12/GPUDescriptorHeapAllocationD3D12.h | 2 +- src/dawn_native/d3d12/HeapD3D12.cpp | 2 +- src/dawn_native/d3d12/HeapD3D12.h | 2 +- src/dawn_native/d3d12/PageableD3D12.cpp | 2 +- .../d3d12/RenderPassBuilderD3D12.cpp | 2 +- .../d3d12/RenderPassBuilderD3D12.h | 2 +- src/dawn_native/d3d12/RenderPipelineD3D12.cpp | 1 - .../d3d12/ResidencyManagerD3D12.cpp | 2 +- src/dawn_native/d3d12/ResidencyManagerD3D12.h | 2 +- .../d3d12/SamplerHeapCacheD3D12.cpp | 2 +- src/dawn_native/d3d12/SamplerHeapCacheD3D12.h | 2 +- .../ShaderVisibleDescriptorAllocatorD3D12.cpp | 2 +- .../ShaderVisibleDescriptorAllocatorD3D12.h | 2 +- .../d3d12/StagingDescriptorAllocatorD3D12.cpp | 2 +- .../d3d12/StagingDescriptorAllocatorD3D12.h | 2 +- src/dawn_native/metal/DeviceMTL.mm | 4 +--- src/dawn_platform/BUILD.gn | 4 +--- src/dawn_wire/client/Client.cpp | 4 +--- src/include/dawn_native/VulkanBackend.h | 2 ++ src/include/dawn_wire/WireClient.h | 2 +- src/include/dawn_wire/WireServer.h | 2 +- src/utils/BUILD.gn | 16 ++++--------- src/utils/SystemUtils.h | 2 +- 44 files changed, 53 insertions(+), 78 deletions(-) diff --git a/src/common/LinkedList.h b/src/common/LinkedList.h index 69fcf78ab2..47ca1eb104 100644 --- a/src/common/LinkedList.h +++ b/src/common/LinkedList.h @@ -197,4 +197,4 @@ class LinkedList { private: LinkNode root_; }; -#endif // COMMON_LINKED_LIST_H \ No newline at end of file +#endif // COMMON_LINKED_LIST_H diff --git a/src/common/Math.cpp b/src/common/Math.cpp index 62807556f5..8e5985f7e7 100644 --- a/src/common/Math.cpp +++ b/src/common/Math.cpp @@ -159,4 +159,4 @@ uint64_t RoundUp(uint64_t n, uint64_t m) { ASSERT(n > 0); ASSERT(m <= std::numeric_limits::max() - n); return ((n + m - 1) / m) * m; -} \ No newline at end of file +} diff --git a/src/common/SerialStorage.h b/src/common/SerialStorage.h index 6f382134a7..d71c7dd07d 100644 --- a/src/common/SerialStorage.h +++ b/src/common/SerialStorage.h @@ -280,8 +280,8 @@ SerialStorage::ConstIterator::ConstIterator( } template -typename SerialStorage::ConstIterator& SerialStorage::ConstIterator:: -operator++() { +typename SerialStorage::ConstIterator& +SerialStorage::ConstIterator::operator++() { const Value* vectorData = mStorageIterator->second.data(); if (mSerialIterator == nullptr) { diff --git a/src/dawn/BUILD.gn b/src/dawn/BUILD.gn index d095e9aab5..9034be436f 100644 --- a/src/dawn/BUILD.gn +++ b/src/dawn/BUILD.gn @@ -39,9 +39,7 @@ dawn_json_generator("emscripten_bits_gen") { source_set("dawn_headers") { all_dependent_configs = [ "${dawn_root}/src/common:dawn_public_include_dirs" ] - public_deps = [ - ":dawn_headers_gen", - ] + public_deps = [ ":dawn_headers_gen" ] sources = get_target_outputs(":dawn_headers_gen") sources += [ "${dawn_root}/src/include/dawn/dawn_wsi.h" ] @@ -53,9 +51,7 @@ source_set("dawn_headers") { dawn_json_generator("dawncpp_headers_gen") { target = "dawncpp_headers" - outputs = [ - "src/include/dawn/webgpu_cpp.h", - ] + outputs = [ "src/include/dawn/webgpu_cpp.h" ] } source_set("dawncpp_headers") { @@ -74,9 +70,7 @@ source_set("dawncpp_headers") { dawn_json_generator("dawncpp_gen") { target = "dawncpp" - outputs = [ - "src/dawn/webgpu_cpp.cpp", - ] + outputs = [ "src/dawn/webgpu_cpp.cpp" ] } source_set("dawncpp") { @@ -93,20 +87,14 @@ source_set("dawncpp") { dawn_json_generator("dawn_proc_gen") { target = "dawn_proc" - outputs = [ - "src/dawn/dawn_proc.c", - ] + outputs = [ "src/dawn/dawn_proc.c" ] } dawn_component("dawn_proc") { DEFINE_PREFIX = "WGPU" - public_deps = [ - ":dawn_headers", - ] - deps = [ - ":dawn_proc_gen", - ] + public_deps = [ ":dawn_headers" ] + deps = [ ":dawn_proc_gen" ] sources = get_target_outputs(":dawn_proc_gen") sources += [ "${dawn_root}/src/include/dawn/dawn_proc.h" ] } diff --git a/src/dawn_native/BindGroupLayout.cpp b/src/dawn_native/BindGroupLayout.cpp index fce8b90329..54a8804149 100644 --- a/src/dawn_native/BindGroupLayout.cpp +++ b/src/dawn_native/BindGroupLayout.cpp @@ -415,7 +415,7 @@ namespace dawn_native { } if (binding.viewDimension == wgpu::TextureViewDimension::Undefined) { - mBindingInfo[i].viewDimension = wgpu::TextureViewDimension::e2D; + mBindingInfo[i].viewDimension = wgpu::TextureViewDimension::e2D; } else { mBindingInfo[i].viewDimension = binding.viewDimension; } diff --git a/src/dawn_native/DynamicUploader.cpp b/src/dawn_native/DynamicUploader.cpp index be92ea0959..a732f495ce 100644 --- a/src/dawn_native/DynamicUploader.cpp +++ b/src/dawn_native/DynamicUploader.cpp @@ -108,4 +108,4 @@ namespace dawn_native { } mReleasedStagingBuffers.ClearUpTo(lastCompletedSerial); } -} // namespace dawn_native \ No newline at end of file +} // namespace dawn_native diff --git a/src/dawn_native/Instance.cpp b/src/dawn_native/Instance.cpp index c7a1e310f3..58e6cffd24 100644 --- a/src/dawn_native/Instance.cpp +++ b/src/dawn_native/Instance.cpp @@ -145,7 +145,7 @@ namespace dawn_native { # if defined(DAWN_ENABLE_SWIFTSHADER) Register(vulkan::Connect(this, true), wgpu::BackendType::Vulkan); # endif // defined(DAWN_ENABLE_SWIFTSHADER) -#endif // defined(DAWN_ENABLE_BACKEND_VULKAN) +#endif // defined(DAWN_ENABLE_BACKEND_VULKAN) #if defined(DAWN_ENABLE_BACKEND_OPENGL) Register(opengl::Connect(this), wgpu::BackendType::OpenGL); #endif // defined(DAWN_ENABLE_BACKEND_OPENGL) diff --git a/src/dawn_native/MapRequestTracker.cpp b/src/dawn_native/MapRequestTracker.cpp index 8f33e02311..956dfa0a10 100644 --- a/src/dawn_native/MapRequestTracker.cpp +++ b/src/dawn_native/MapRequestTracker.cpp @@ -43,4 +43,4 @@ namespace dawn_native { } mInflightRequests.ClearUpTo(finishedSerial); } -} // namespace dawn_native \ No newline at end of file +} // namespace dawn_native diff --git a/src/dawn_native/Pipeline.cpp b/src/dawn_native/Pipeline.cpp index 074f647382..ae05c02f4b 100644 --- a/src/dawn_native/Pipeline.cpp +++ b/src/dawn_native/Pipeline.cpp @@ -102,4 +102,4 @@ namespace dawn_native { return bgl; } -} // namespace dawn_native \ No newline at end of file +} // namespace dawn_native diff --git a/src/dawn_native/PipelineLayout.cpp b/src/dawn_native/PipelineLayout.cpp index 995a3ee806..0cccabf380 100644 --- a/src/dawn_native/PipelineLayout.cpp +++ b/src/dawn_native/PipelineLayout.cpp @@ -316,4 +316,4 @@ namespace dawn_native { return true; } -} // namespace dawn_native \ No newline at end of file +} // namespace dawn_native diff --git a/src/dawn_native/ResourceHeap.h b/src/dawn_native/ResourceHeap.h index 6e6af79512..e9a4a67226 100644 --- a/src/dawn_native/ResourceHeap.h +++ b/src/dawn_native/ResourceHeap.h @@ -28,4 +28,4 @@ namespace dawn_native { } // namespace dawn_native -#endif // DAWNNATIVE_RESOURCEHEAP_H_ \ No newline at end of file +#endif // DAWNNATIVE_RESOURCEHEAP_H_ diff --git a/src/dawn_native/ResourceMemoryAllocation.cpp b/src/dawn_native/ResourceMemoryAllocation.cpp index 0d726c9d66..b1c35d4172 100644 --- a/src/dawn_native/ResourceMemoryAllocation.cpp +++ b/src/dawn_native/ResourceMemoryAllocation.cpp @@ -50,4 +50,4 @@ namespace dawn_native { mResourceHeap = nullptr; mInfo = {}; } -} // namespace dawn_native \ No newline at end of file +} // namespace dawn_native diff --git a/src/dawn_native/RingBufferAllocator.h b/src/dawn_native/RingBufferAllocator.h index e437632d7c..50b0f15d00 100644 --- a/src/dawn_native/RingBufferAllocator.h +++ b/src/dawn_native/RingBufferAllocator.h @@ -56,4 +56,4 @@ namespace dawn_native { }; } // namespace dawn_native -#endif // DAWNNATIVE_RINGBUFFERALLOCATOR_H_ \ No newline at end of file +#endif // DAWNNATIVE_RINGBUFFERALLOCATOR_H_ diff --git a/src/dawn_native/StagingBuffer.cpp b/src/dawn_native/StagingBuffer.cpp index 51f5fa8c5e..63dd65e9bf 100644 --- a/src/dawn_native/StagingBuffer.cpp +++ b/src/dawn_native/StagingBuffer.cpp @@ -26,4 +26,4 @@ namespace dawn_native { void* StagingBufferBase::GetMappedPointer() const { return mMappedPointer; } -} // namespace dawn_native \ No newline at end of file +} // namespace dawn_native diff --git a/src/dawn_native/StagingBuffer.h b/src/dawn_native/StagingBuffer.h index 1da8900a12..4d195488bc 100644 --- a/src/dawn_native/StagingBuffer.h +++ b/src/dawn_native/StagingBuffer.h @@ -38,4 +38,4 @@ namespace dawn_native { } // namespace dawn_native -#endif // DAWNNATIVE_STAGINGBUFFER_H_ \ No newline at end of file +#endif // DAWNNATIVE_STAGINGBUFFER_H_ diff --git a/src/dawn_native/d3d12/BackendD3D12.h b/src/dawn_native/d3d12/BackendD3D12.h index 27ef1d16a3..403943a9fb 100644 --- a/src/dawn_native/d3d12/BackendD3D12.h +++ b/src/dawn_native/d3d12/BackendD3D12.h @@ -47,4 +47,4 @@ namespace dawn_native { namespace d3d12 { }} // namespace dawn_native::d3d12 -#endif // DAWNNATIVE_D3D12_BACKENDD3D12_H_ \ No newline at end of file +#endif // DAWNNATIVE_D3D12_BACKENDD3D12_H_ diff --git a/src/dawn_native/d3d12/CPUDescriptorHeapAllocationD3D12.cpp b/src/dawn_native/d3d12/CPUDescriptorHeapAllocationD3D12.cpp index 021c47ab87..d92398584d 100644 --- a/src/dawn_native/d3d12/CPUDescriptorHeapAllocationD3D12.cpp +++ b/src/dawn_native/d3d12/CPUDescriptorHeapAllocationD3D12.cpp @@ -50,4 +50,4 @@ namespace dawn_native { namespace d3d12 { mBaseDescriptor = {0}; } -}} // namespace dawn_native::d3d12 \ No newline at end of file +}} // namespace dawn_native::d3d12 diff --git a/src/dawn_native/d3d12/CPUDescriptorHeapAllocationD3D12.h b/src/dawn_native/d3d12/CPUDescriptorHeapAllocationD3D12.h index 05aaf5185b..51ae2fdb61 100644 --- a/src/dawn_native/d3d12/CPUDescriptorHeapAllocationD3D12.h +++ b/src/dawn_native/d3d12/CPUDescriptorHeapAllocationD3D12.h @@ -44,4 +44,4 @@ namespace dawn_native { namespace d3d12 { }} // namespace dawn_native::d3d12 -#endif // DAWNNATIVE_D3D12_CPUDESCRIPTORHEAPALLOCATION_H_ \ No newline at end of file +#endif // DAWNNATIVE_D3D12_CPUDESCRIPTORHEAPALLOCATION_H_ diff --git a/src/dawn_native/d3d12/D3D12Error.h b/src/dawn_native/d3d12/D3D12Error.h index 16ea4c4e83..ade06fe62e 100644 --- a/src/dawn_native/d3d12/D3D12Error.h +++ b/src/dawn_native/d3d12/D3D12Error.h @@ -42,4 +42,4 @@ namespace dawn_native { namespace d3d12 { }} // namespace dawn_native::d3d12 -#endif // DAWNNATIVE_D3D12_D3D12ERROR_H_ \ No newline at end of file +#endif // DAWNNATIVE_D3D12_D3D12ERROR_H_ diff --git a/src/dawn_native/d3d12/D3D12Info.h b/src/dawn_native/d3d12/D3D12Info.h index cce74b17c5..51134df380 100644 --- a/src/dawn_native/d3d12/D3D12Info.h +++ b/src/dawn_native/d3d12/D3D12Info.h @@ -37,4 +37,4 @@ namespace dawn_native { namespace d3d12 { ResultOrError GatherDeviceInfo(const Adapter& adapter); }} // namespace dawn_native::d3d12 -#endif // DAWNNATIVE_D3D12_D3D12INFO_H_ \ No newline at end of file +#endif // DAWNNATIVE_D3D12_D3D12INFO_H_ diff --git a/src/dawn_native/d3d12/GPUDescriptorHeapAllocationD3D12.cpp b/src/dawn_native/d3d12/GPUDescriptorHeapAllocationD3D12.cpp index c72605a58b..3d3ba20fad 100644 --- a/src/dawn_native/d3d12/GPUDescriptorHeapAllocationD3D12.cpp +++ b/src/dawn_native/d3d12/GPUDescriptorHeapAllocationD3D12.cpp @@ -36,4 +36,4 @@ namespace dawn_native { namespace d3d12 { Serial GPUDescriptorHeapAllocation::GetHeapSerial() const { return mHeapSerial; } -}} // namespace dawn_native::d3d12 \ No newline at end of file +}} // namespace dawn_native::d3d12 diff --git a/src/dawn_native/d3d12/GPUDescriptorHeapAllocationD3D12.h b/src/dawn_native/d3d12/GPUDescriptorHeapAllocationD3D12.h index c18d2662c3..08930d79fc 100644 --- a/src/dawn_native/d3d12/GPUDescriptorHeapAllocationD3D12.h +++ b/src/dawn_native/d3d12/GPUDescriptorHeapAllocationD3D12.h @@ -40,4 +40,4 @@ namespace dawn_native { namespace d3d12 { }} // namespace dawn_native::d3d12 -#endif // DAWNNATIVE_D3D12_CPUDESCRIPTORHEAPALLOCATION_H_ \ No newline at end of file +#endif // DAWNNATIVE_D3D12_CPUDESCRIPTORHEAPALLOCATION_H_ diff --git a/src/dawn_native/d3d12/HeapD3D12.cpp b/src/dawn_native/d3d12/HeapD3D12.cpp index ade5d4a5c1..7bb4e323a6 100644 --- a/src/dawn_native/d3d12/HeapD3D12.cpp +++ b/src/dawn_native/d3d12/HeapD3D12.cpp @@ -28,4 +28,4 @@ namespace dawn_native { namespace d3d12 { return mD3d12Heap.Get(); } -}} // namespace dawn_native::d3d12 \ No newline at end of file +}} // namespace dawn_native::d3d12 diff --git a/src/dawn_native/d3d12/HeapD3D12.h b/src/dawn_native/d3d12/HeapD3D12.h index 715ffcdaf1..b59c6449de 100644 --- a/src/dawn_native/d3d12/HeapD3D12.h +++ b/src/dawn_native/d3d12/HeapD3D12.h @@ -37,4 +37,4 @@ namespace dawn_native { namespace d3d12 { }; }} // namespace dawn_native::d3d12 -#endif // DAWNNATIVE_D3D12_HEAPD3D12_H_ \ No newline at end of file +#endif // DAWNNATIVE_D3D12_HEAPD3D12_H_ diff --git a/src/dawn_native/d3d12/PageableD3D12.cpp b/src/dawn_native/d3d12/PageableD3D12.cpp index 5884780864..5c5ef9c0f0 100644 --- a/src/dawn_native/d3d12/PageableD3D12.cpp +++ b/src/dawn_native/d3d12/PageableD3D12.cpp @@ -73,4 +73,4 @@ namespace dawn_native { namespace d3d12 { bool Pageable::IsResidencyLocked() const { return mResidencyLockRefCount != 0; } -}} // namespace dawn_native::d3d12 \ No newline at end of file +}} // namespace dawn_native::d3d12 diff --git a/src/dawn_native/d3d12/RenderPassBuilderD3D12.cpp b/src/dawn_native/d3d12/RenderPassBuilderD3D12.cpp index 19657849a1..66558cb7ef 100644 --- a/src/dawn_native/d3d12/RenderPassBuilderD3D12.cpp +++ b/src/dawn_native/d3d12/RenderPassBuilderD3D12.cpp @@ -234,4 +234,4 @@ namespace dawn_native { namespace d3d12 { D3D12_RENDER_PASS_ENDING_ACCESS_TYPE_NO_ACCESS; } -}} // namespace dawn_native::d3d12 \ No newline at end of file +}} // namespace dawn_native::d3d12 diff --git a/src/dawn_native/d3d12/RenderPassBuilderD3D12.h b/src/dawn_native/d3d12/RenderPassBuilderD3D12.h index aadb2e8226..cf61a182a0 100644 --- a/src/dawn_native/d3d12/RenderPassBuilderD3D12.h +++ b/src/dawn_native/d3d12/RenderPassBuilderD3D12.h @@ -88,4 +88,4 @@ namespace dawn_native { namespace d3d12 { }; }} // namespace dawn_native::d3d12 -#endif // DAWNNATIVE_D3D12_RENDERPASSBUILDERD3D12_H_ \ No newline at end of file +#endif // DAWNNATIVE_D3D12_RENDERPASSBUILDERD3D12_H_ diff --git a/src/dawn_native/d3d12/RenderPipelineD3D12.cpp b/src/dawn_native/d3d12/RenderPipelineD3D12.cpp index f629e76f26..fc0331eac6 100644 --- a/src/dawn_native/d3d12/RenderPipelineD3D12.cpp +++ b/src/dawn_native/d3d12/RenderPipelineD3D12.cpp @@ -327,7 +327,6 @@ namespace dawn_native { namespace d3d12 { wgpu::ShaderStage renderStages = wgpu::ShaderStage::Vertex | wgpu::ShaderStage::Fragment; for (auto stage : IterateStages(renderStages)) { - std::string hlslSource; DAWN_TRY_ASSIGN(hlslSource, modules[stage]->GetHLSLSource(ToBackend(GetLayout()))); diff --git a/src/dawn_native/d3d12/ResidencyManagerD3D12.cpp b/src/dawn_native/d3d12/ResidencyManagerD3D12.cpp index 053a1690fd..e66296e4e2 100644 --- a/src/dawn_native/d3d12/ResidencyManagerD3D12.cpp +++ b/src/dawn_native/d3d12/ResidencyManagerD3D12.cpp @@ -367,4 +367,4 @@ namespace dawn_native { namespace d3d12 { } } -}} // namespace dawn_native::d3d12 \ No newline at end of file +}} // namespace dawn_native::d3d12 diff --git a/src/dawn_native/d3d12/ResidencyManagerD3D12.h b/src/dawn_native/d3d12/ResidencyManagerD3D12.h index 304a211b08..a79a4fca6a 100644 --- a/src/dawn_native/d3d12/ResidencyManagerD3D12.h +++ b/src/dawn_native/d3d12/ResidencyManagerD3D12.h @@ -80,4 +80,4 @@ namespace dawn_native { namespace d3d12 { }} // namespace dawn_native::d3d12 -#endif // DAWNNATIVE_D3D12_RESIDENCYMANAGERD3D12_H_ \ No newline at end of file +#endif // DAWNNATIVE_D3D12_RESIDENCYMANAGERD3D12_H_ diff --git a/src/dawn_native/d3d12/SamplerHeapCacheD3D12.cpp b/src/dawn_native/d3d12/SamplerHeapCacheD3D12.cpp index 224051a1c4..8ba3aab319 100644 --- a/src/dawn_native/d3d12/SamplerHeapCacheD3D12.cpp +++ b/src/dawn_native/d3d12/SamplerHeapCacheD3D12.cpp @@ -164,4 +164,4 @@ namespace dawn_native { namespace d3d12 { const SamplerHeapCacheEntry* b) const { return a->mSamplers == b->mSamplers; } -}} // namespace dawn_native::d3d12 \ No newline at end of file +}} // namespace dawn_native::d3d12 diff --git a/src/dawn_native/d3d12/SamplerHeapCacheD3D12.h b/src/dawn_native/d3d12/SamplerHeapCacheD3D12.h index 2f41086c8b..2e5a2d4237 100644 --- a/src/dawn_native/d3d12/SamplerHeapCacheD3D12.h +++ b/src/dawn_native/d3d12/SamplerHeapCacheD3D12.h @@ -105,4 +105,4 @@ namespace dawn_native { namespace d3d12 { }} // namespace dawn_native::d3d12 -#endif // DAWNNATIVE_D3D12_SAMPLERHEAPCACHE_H_ \ No newline at end of file +#endif // DAWNNATIVE_D3D12_SAMPLERHEAPCACHE_H_ diff --git a/src/dawn_native/d3d12/ShaderVisibleDescriptorAllocatorD3D12.cpp b/src/dawn_native/d3d12/ShaderVisibleDescriptorAllocatorD3D12.cpp index 9039d8ab9d..ca30889e2a 100644 --- a/src/dawn_native/d3d12/ShaderVisibleDescriptorAllocatorD3D12.cpp +++ b/src/dawn_native/d3d12/ShaderVisibleDescriptorAllocatorD3D12.cpp @@ -209,4 +209,4 @@ namespace dawn_native { namespace d3d12 { ID3D12DescriptorHeap* ShaderVisibleDescriptorHeap::GetD3D12DescriptorHeap() const { return mD3d12DescriptorHeap.Get(); } -}} // namespace dawn_native::d3d12 \ No newline at end of file +}} // namespace dawn_native::d3d12 diff --git a/src/dawn_native/d3d12/ShaderVisibleDescriptorAllocatorD3D12.h b/src/dawn_native/d3d12/ShaderVisibleDescriptorAllocatorD3D12.h index aec20a3b44..564eb95e79 100644 --- a/src/dawn_native/d3d12/ShaderVisibleDescriptorAllocatorD3D12.h +++ b/src/dawn_native/d3d12/ShaderVisibleDescriptorAllocatorD3D12.h @@ -94,4 +94,4 @@ namespace dawn_native { namespace d3d12 { }; }} // namespace dawn_native::d3d12 -#endif // DAWNNATIVE_D3D12_SHADERVISIBLEDESCRIPTORALLOCATOR_H_ \ No newline at end of file +#endif // DAWNNATIVE_D3D12_SHADERVISIBLEDESCRIPTORALLOCATOR_H_ diff --git a/src/dawn_native/d3d12/StagingDescriptorAllocatorD3D12.cpp b/src/dawn_native/d3d12/StagingDescriptorAllocatorD3D12.cpp index 84fd7880ca..92a47412e9 100644 --- a/src/dawn_native/d3d12/StagingDescriptorAllocatorD3D12.cpp +++ b/src/dawn_native/d3d12/StagingDescriptorAllocatorD3D12.cpp @@ -149,4 +149,4 @@ namespace dawn_native { namespace d3d12 { mAllocationsToDelete.ClearUpTo(completedSerial); } -}} // namespace dawn_native::d3d12 \ No newline at end of file +}} // namespace dawn_native::d3d12 diff --git a/src/dawn_native/d3d12/StagingDescriptorAllocatorD3D12.h b/src/dawn_native/d3d12/StagingDescriptorAllocatorD3D12.h index eebbe2a164..519920b465 100644 --- a/src/dawn_native/d3d12/StagingDescriptorAllocatorD3D12.h +++ b/src/dawn_native/d3d12/StagingDescriptorAllocatorD3D12.h @@ -82,4 +82,4 @@ namespace dawn_native { namespace d3d12 { }} // namespace dawn_native::d3d12 -#endif // DAWNNATIVE_D3D12_STAGINGDESCRIPTORALLOCATOR_H_ \ No newline at end of file +#endif // DAWNNATIVE_D3D12_STAGINGDESCRIPTORALLOCATOR_H_ diff --git a/src/dawn_native/metal/DeviceMTL.mm b/src/dawn_native/metal/DeviceMTL.mm index 07f11cd27a..31ae40b046 100644 --- a/src/dawn_native/metal/DeviceMTL.mm +++ b/src/dawn_native/metal/DeviceMTL.mm @@ -49,9 +49,7 @@ namespace dawn_native { namespace metal { Device::Device(AdapterBase* adapter, id mtlDevice, const DeviceDescriptor* descriptor) - : DeviceBase(adapter, descriptor), - mMtlDevice([mtlDevice retain]), - mCompletedSerial(0) { + : DeviceBase(adapter, descriptor), mMtlDevice([mtlDevice retain]), mCompletedSerial(0) { [mMtlDevice retain]; } diff --git a/src/dawn_platform/BUILD.gn b/src/dawn_platform/BUILD.gn index a152b9ecde..c2b10933a3 100644 --- a/src/dawn_platform/BUILD.gn +++ b/src/dawn_platform/BUILD.gn @@ -24,7 +24,5 @@ source_set("dawn_platform") { "tracing/TraceEvent.h", ] - deps = [ - "${dawn_root}/src/common", - ] + deps = [ "${dawn_root}/src/common" ] } diff --git a/src/dawn_wire/client/Client.cpp b/src/dawn_wire/client/Client.cpp index ab96743a6f..6b5b7be7ea 100644 --- a/src/dawn_wire/client/Client.cpp +++ b/src/dawn_wire/client/Client.cpp @@ -20,9 +20,7 @@ namespace dawn_wire { namespace client { Client::Client(CommandSerializer* serializer, MemoryTransferService* memoryTransferService) - : ClientBase(), - mSerializer(serializer), - mMemoryTransferService(memoryTransferService) { + : ClientBase(), mSerializer(serializer), mMemoryTransferService(memoryTransferService) { if (mMemoryTransferService == nullptr) { // If a MemoryTransferService is not provided, fall back to inline memory. mOwnedMemoryTransferService = CreateInlineMemoryTransferService(); diff --git a/src/include/dawn_native/VulkanBackend.h b/src/include/dawn_native/VulkanBackend.h index 0965871941..4e5aee995e 100644 --- a/src/include/dawn_native/VulkanBackend.h +++ b/src/include/dawn_native/VulkanBackend.h @@ -23,6 +23,7 @@ #include namespace dawn_native { namespace vulkan { + DAWN_NATIVE_EXPORT VkInstance GetInstance(WGPUDevice device); DAWN_NATIVE_EXPORT PFN_vkVoidFunction GetInstanceProcAddr(WGPUDevice device, const char* pName); @@ -75,6 +76,7 @@ namespace dawn_native { namespace vulkan { DAWN_NATIVE_EXPORT WGPUTexture WrapVulkanImage(WGPUDevice cDevice, const ExternalImageDescriptor* descriptor); #endif // __linux__ + }} // namespace dawn_native::vulkan #endif // DAWNNATIVE_VULKANBACKEND_H_ diff --git a/src/include/dawn_wire/WireClient.h b/src/include/dawn_wire/WireClient.h index 5b5f33c2ac..815b66b877 100644 --- a/src/include/dawn_wire/WireClient.h +++ b/src/include/dawn_wire/WireClient.h @@ -26,7 +26,7 @@ namespace dawn_wire { namespace client { class Client; class MemoryTransferService; - } + } // namespace client struct ReservedTexture { WGPUTexture texture; diff --git a/src/include/dawn_wire/WireServer.h b/src/include/dawn_wire/WireServer.h index b59572180a..b3d1e62a1f 100644 --- a/src/include/dawn_wire/WireServer.h +++ b/src/include/dawn_wire/WireServer.h @@ -26,7 +26,7 @@ namespace dawn_wire { namespace server { class Server; class MemoryTransferService; - } + } // namespace server struct DAWN_WIRE_EXPORT WireServerDescriptor { WGPUDevice device; diff --git a/src/utils/BUILD.gn b/src/utils/BUILD.gn index 9d5d69c754..be827d6630 100644 --- a/src/utils/BUILD.gn +++ b/src/utils/BUILD.gn @@ -25,9 +25,7 @@ import("${dawn_root}/scripts/dawn_features.gni") # use the real library from third_party/. if (dawn_supports_glfw_for_windowing) { group("dawn_glfw") { - public_deps = [ - "${dawn_root}/third_party/gn/glfw", - ] + public_deps = [ "${dawn_root}/third_party/gn/glfw" ] } } else if (is_fuchsia) { # The mock implementation of GLFW on Fuchsia @@ -52,9 +50,7 @@ if (dawn_supports_glfw_for_windowing) { "Glfw3Fuchsia.cpp", ] public_configs = [ ":dawn_glfw_public_config" ] - deps = [ - "${dawn_root}/src/common", - ] + deps = [ "${dawn_root}/src/common" ] } } else { # Just skip GLFW on other systems @@ -118,9 +114,7 @@ static_library("dawn_utils") { } } - public_deps = [ - "${dawn_root}/src/dawn:dawncpp_headers", - ] + public_deps = [ "${dawn_root}/src/dawn:dawncpp_headers" ] } ############################################################################### @@ -137,9 +131,7 @@ if (dawn_standalone) { "BackendBinding.h", ] - public_deps = [ - "${dawn_root}/src/dawn:dawn_headers", - ] + public_deps = [ "${dawn_root}/src/dawn:dawn_headers" ] deps = [ ":dawn_glfw", diff --git a/src/utils/SystemUtils.h b/src/utils/SystemUtils.h index 828eb58aab..1f42cc539a 100644 --- a/src/utils/SystemUtils.h +++ b/src/utils/SystemUtils.h @@ -20,4 +20,4 @@ namespace utils { void USleep(unsigned int usecs); } -#endif // UTILS_SYSTEMUTILS_H_ \ No newline at end of file +#endif // UTILS_SYSTEMUTILS_H_