From 7a687904c76165d978aa5e2d5080d7c7f393dac4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=91=D1=80=D0=B0=D0=BD=D0=B8=D0=BC=D0=B8=D1=80=20=D0=9A?=
 =?UTF-8?q?=D0=B0=D1=80=D0=B0=D1=9F=D0=B8=D1=9B?=
 <branimirkaradzic@gmail.com>
Date: Fri, 8 May 2020 09:15:24 -0700
Subject: [PATCH] Cleanup.

---
 src/amalgamated.cpp     |  1 +
 src/renderer_webgpu.cpp | 31 +++++++++++++++++--------------
 src/renderer_webgpu.h   | 29 +++++++++++++++--------------
 3 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/src/amalgamated.cpp b/src/amalgamated.cpp
index 3c307311f..25f1b12bf 100644
--- a/src/amalgamated.cpp
+++ b/src/amalgamated.cpp
@@ -19,6 +19,7 @@
 #include "renderer_noop.cpp"
 #include "renderer_nvn.cpp"
 #include "renderer_vk.cpp"
+#include "renderer_webgpu.cpp"
 #include "shader_dx9bc.cpp"
 #include "shader_dxbc.cpp"
 #include "shader_spirv.cpp"
diff --git a/src/renderer_webgpu.cpp b/src/renderer_webgpu.cpp
index 88c816565..fd1600884 100644
--- a/src/renderer_webgpu.cpp
+++ b/src/renderer_webgpu.cpp
@@ -13,24 +13,27 @@
 #	include "renderer.h"
 #	include "debug_renderdoc.h"
 
-#ifdef DAWN_ENABLE_BACKEND_VULKAN
-#	include "renderer_vk.h"
-#endif
-
-#if !BX_PLATFORM_EMSCRIPTEN
-#	ifdef DAWN_ENABLE_BACKEND_D3D12
-#		include <dawn_native/D3D12Backend.h>
-#	endif
 #	ifdef DAWN_ENABLE_BACKEND_VULKAN
-#		include <dawn_native/VulkanBackend.h>
-#	endif
-#	include <dawn_native/DawnNative.h>
-#	include <dawn/dawn_wsi.h>
-#	include <dawn/dawn_proc.h>
+#		include "renderer_vk.h"
+#	endif // DAWN_ENABLE_BACKEND_VULKAN
+
+#	if !BX_PLATFORM_EMSCRIPTEN
+#		ifdef DAWN_ENABLE_BACKEND_D3D12
+#			include <dawn_native/D3D12Backend.h>
+#		endif // !BX_PLATFORM_EMSCRIPTEN
+
+#		ifdef DAWN_ENABLE_BACKEND_VULKAN
+#			include <dawn_native/VulkanBackend.h>
+#		endif // DAWN_ENABLE_BACKEND_VULKAN
+
+#		include <dawn_native/DawnNative.h>
+#		include <dawn/dawn_wsi.h>
+#		include <dawn/dawn_proc.h>
+#	endif // !BX_PLATFORM_EMSCRIPTEN
 #else
 #	include <emscripten/emscripten.h>
 #	include <emscripten/html5.h>
-#endif
+#endif // BGFX_CONFIG_RENDERER_WEBGPU
 
 namespace bgfx { namespace webgpu
 {
diff --git a/src/renderer_webgpu.h b/src/renderer_webgpu.h
index 7b54bf66c..cce983752 100644
--- a/src/renderer_webgpu.h
+++ b/src/renderer_webgpu.h
@@ -11,34 +11,34 @@
 #if BGFX_CONFIG_RENDERER_WEBGPU
 
 #if !BX_PLATFORM_EMSCRIPTEN
-#include <dawn/webgpu_cpp.h>
-#include <dawn/dawn_wsi.h>
+#	include <dawn/webgpu_cpp.h>
+#	include <dawn/dawn_wsi.h>
 #else
-#include <webgpu/webgpu_cpp.h>
-#endif
+#	include <webgpu/webgpu_cpp.h>
+#endif // !BX_PLATFORM_EMSCRIPTEN
 
-#define BGFX_WEBGPU_PROFILER_BEGIN(_view, _abgr)         \
+#define BGFX_WEBGPU_PROFILER_BEGIN(_view, _abgr)      \
 	BX_MACRO_BLOCK_BEGIN                              \
 		BGFX_PROFILER_BEGIN(s_viewName[view], _abgr); \
 	BX_MACRO_BLOCK_END
 
-#define BGFX_WEBGPU_PROFILER_BEGIN_LITERAL(_name, _abgr)   \
-	BX_MACRO_BLOCK_BEGIN                                \
-		BGFX_PROFILER_BEGIN_LITERAL("" # _name, _abgr); \
+#define BGFX_WEBGPU_PROFILER_BEGIN_LITERAL(_name, _abgr) \
+	BX_MACRO_BLOCK_BEGIN                                 \
+		BGFX_PROFILER_BEGIN_LITERAL("" # _name, _abgr);  \
 	BX_MACRO_BLOCK_END
 
 #define BGFX_WEBGPU_PROFILER_END() \
-	BX_MACRO_BLOCK_BEGIN        \
-		BGFX_PROFILER_END();    \
+	BX_MACRO_BLOCK_BEGIN           \
+		BGFX_PROFILER_END();       \
 	BX_MACRO_BLOCK_END
 
 #define WEBGPU_MAX_FRAMES_IN_FLIGHT 3
-#define WEBGPU_NUM_UNIFORM_BUFFERS 8
+#define WEBGPU_NUM_UNIFORM_BUFFERS  8
 
-namespace bgfx {
+namespace bgfx
+{
 	namespace webgpu
 	{
-
 		template <typename Ty>
 		class StateCacheT
 		{
@@ -560,7 +560,8 @@ namespace bgfx {
 			bx::RingBufferControl m_control;
 		};
 
-	} /* namespace metal */
+	} // namespace webgpu
+
 } // namespace bgfx
 
 #endif // BGFX_CONFIG_RENDERER_WEBGPU