[WebGPU, Dawn]: Fixed build for MacOS

Author: MikhailGorobets

CMakeLists.txt

@@ -201,6 +201,7 @@ elseif(PLATFORM_LINUX)
 elseif(PLATFORM_MACOS)
     set(GL_SUPPORTED       TRUE CACHE INTERNAL "OpenGL is supported on MacOS platform")
     set(VULKAN_SUPPORTED   TRUE CACHE INTERNAL "Vulkan is enabled through MoltenVK on MacOS platform")
+    set(WEBGPU_SUPPORTED   TRUE CACHE INTERNAL "WebGPU is supported on MacOS platform via Dawn")
     set(ARCHIVER_SUPPORTED TRUE CACHE INTERNAL "Archiver is supported on MacOS platform")
     target_compile_definitions(Diligent-PublicBuildSettings INTERFACE PLATFORM_MACOS=1 PLATFORM_APPLE=1)
 elseif(PLATFORM_IOS)

Graphics/GraphicsEngineWebGPU/src/SwapChainWebGPUImpl.cpp

@@ -164,10 +164,10 @@ void SwapChainWebGPUImpl::CreateSurface()
     wgpuSurfaceNativeDesc.chain      = {nullptr, WGPUSType_SurfaceSourceXCBWindow};
     wgpuSurfaceNativeDesc.connection = m_NativeWindow.pXCBConnection;
     wgpuSurfaceNativeDesc.window     = m_NativeWindow.WindowId;
-#elif PLATFROM_MACOS
+#elif PLATFORM_MACOS
     WGPUSurfaceSourceMetalLayer wgpuSurfaceNativeDesc{};
-    wgpuSurfaceNativeDesc.chain  = {nullptr, WGPUSType_SurfaceSourceMetalLayer};
-    wgpuSurfaceNativeDesc.window = m_NativeWindow.MetalLayer;
+    wgpuSurfaceNativeDesc.chain = {nullptr, WGPUSType_SurfaceSourceMetalLayer};
+    wgpuSurfaceNativeDesc.layer = m_NativeWindow.GetLayer();
 #elif PLATFORM_WEB
     WGPUSurfaceSourceCanvasHTMLSelector_Emscripten wgpuSurfaceNativeDesc{};
     wgpuSurfaceNativeDesc.chain    = {nullptr, WGPUSType_SurfaceSourceCanvasHTMLSelector_Emscripten};

ThirdParty/dawn/CMakeLists.txt

@@ -29,11 +29,6 @@ set(TINT_BUILD_SPV_READER  ON CACHE BOOL "" FORCE)
 set(TINT_BUILD_WGSL_WRITER ON CACHE BOOL "" FORCE)
 set(TINT_BUILD_WGSL_READER ON CACHE BOOL "" FORCE)
 set(TINT_BUILD_IR_BINARY   ON CACHE BOOL "" FORCE)
-if (PLATFORM_WEB)
-    set(TINT_BUILD_HLSL_WRITER OFF CACHE BOOL "" FORCE)
-else()
-    set(TINT_BUILD_HLSL_WRITER ON CACHE BOOL "" FORCE)
-endif()
 
 set(TINT_BUILD_GLSL_WRITER     OFF CACHE BOOL "" FORCE)
 set(TINT_BUILD_MSL_WRITER      OFF CACHE BOOL "" FORCE)
@@ -58,10 +53,15 @@ set(DAWN_ENABLE_OPENGLES   OFF CACHE BOOL "" FORCE)
 # Dawn's CMake defines DAWN_EMSCRIPTEN_TOOLCHAIN through the option command, which
 # sets its default value to OFF instead of ""
 set(DAWN_EMSCRIPTEN_TOOLCHAIN "" CACHE STRING "" FORCE)
+
 if (PLATFORM_WEB)
-    set(DAWN_ENABLE_D3D12 OFF  CACHE BOOL "" FORCE)
-else()
-    set(DAWN_ENABLE_D3D12 ON CACHE BOOL "" FORCE)
+    set(TINT_BUILD_HLSL_WRITER OFF CACHE BOOL "" FORCE)
+elseif(PLATFORM_MACOS)
+    set(DAWN_ENABLE_METAL ON  CACHE BOOL "" FORCE)
+    set(TINT_BUILD_MSL_WRITER ON CACHE BOOL "" FORCE)
+elseif(PLATFORM_WIN32)
+    set(DAWN_ENABLE_D3D12 ON  CACHE BOOL "" FORCE)
+    set(TINT_BUILD_HLSL_WRITER ON CACHE BOOL "" FORCE)
 endif()
 
 set(DAWN_USE_GLFW                 OFF CACHE BOOL "" FORCE)