wgpu wip

floooh · Jul 29, 2023 · 25c5718 · 25c5718
1 parent 578d71d
commit 25c5718
Show file tree

Hide file tree

Showing 12 changed files with 209 additions and 497 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,11 +8,7 @@ if (FIPS_IOS)
 else()
     set(CMAKE_OSX_DEPLOYMENT_TARGET "10.13" CACHE STRING "")
 endif()
-if (CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-    set(CMAKE_CXX_STANDARD 17)
-else()
-    set(CMAKE_CXX_STANDARD 14)
-endif()
+set(CMAKE_CXX_STANDARD 20)
 project(sokol-samples)
 
 if (SOKOL_USE_WGPU_DAWN)
@@ -98,7 +94,6 @@ else()
     elseif (SOKOL_USE_METAL)
         add_subdirectory(metal)
     elseif (SOKOL_USE_WGPU_DAWN)
-        add_subdirectory(libs/dawnutil)
         add_subdirectory(wgpu)
     else()
         add_subdirectory(glfw)

diff --git a/fips-files/configs/wgpu-osx-vscode-debug.yml b/fips-files/configs/wgpu-osx-vscode-debug.yml
@@ -1,8 +1,7 @@
 ---
 platform: osx
-generator: Xcode
-build_tool: xcodebuild
+generator: Ninja
+build_tool: vscode
 build_type: Debug
 defines:
     SOKOL_USE_WGPU_DAWN: ON
-
diff --git a/fips-files/configs/wgpu-osx-vscode-release.yml b/fips-files/configs/wgpu-osx-vscode-release.yml
@@ -1,9 +1,7 @@
 ---
 platform: osx
-generator: Xcode
-build_tool: xcodebuild
+generator: Ninja
+build_tool: vscode
 build_type: Release
 defines:
     SOKOL_USE_WGPU_DAWN: ON
-
-
diff --git a/libs/dawnutil/CMakeLists.txt b/libs/dawnutil/CMakeLists.txt
diff --git a/libs/dawnutil/README.md b/libs/dawnutil/README.md
diff --git a/libs/dawnutil/SampleUtils.cpp b/libs/dawnutil/SampleUtils.cpp
diff --git a/libs/dawnutil/SampleUtils.h b/libs/dawnutil/SampleUtils.h