replace opengl with webgpu/dawn

Author: malytomas

.github/workflows/codeql.yml

@@ -22,8 +22,6 @@ jobs:
 
     - name: Checkout repository
       uses: actions/checkout@v4
-      with:
-        submodules: recursive
 
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2

.github/workflows/tests.yml

@@ -31,8 +31,6 @@ jobs:
         git --version
 
     - uses: actions/checkout@v4
-      with:
-        submodules: recursive
 
     - name: Configure
       shell: bash
@@ -59,17 +57,6 @@ jobs:
         cd build/result/${{ matrix.build-config }}
         ./cage-asset-database
 
-    - name: Install
-      shell: bash
-      run: |
-        cd build
-        cmake --install . --config ${{ matrix.build-config }} --prefix "C:/cage"
-        cd ../sources/test-install
-        mkdir build
-        cd build
-        cmake -A${{ matrix.build-arch }} ${{ matrix.build-tool }} -DCMAKE_BUILD_TYPE=${{ matrix.build-config }} -DCage_DIR="C:/cage/cmake" ..
-        cmake --build . --config ${{ matrix.build-config }}
-
 
   Ubuntu:
     name: ubuntu-${{ matrix.os-version }}${{ matrix.build-arch }}-${{ matrix.build-config }}-${{ matrix.compiler.cc }}-${{ matrix.steam-sockets }}
@@ -84,11 +71,6 @@ jobs:
         build-arch: ["", "-arm"]
         build-config: [debug, release]
         compiler:
-        - {
-            cc: gcc-13,
-            cxx: g++-13,
-            install: gcc-13 g++-13
-          }
         - {
             cc: gcc-14,
             cxx: g++-14,
@@ -124,8 +106,6 @@ jobs:
         ${{ matrix.compiler.cxx }} --version
 
     - uses: actions/checkout@v4
-      with:
-        submodules: recursive
 
     - name: Configure
       run: |
@@ -148,23 +128,66 @@ jobs:
         cd build/result/${{ matrix.build-config }}
         ./cage-asset-database
 
-    - name: Install
+    - name: List dependencies
+      run: |
+        cd build/result/${{ matrix.build-config }}
+        echo "cage-core:"
+        ldd libcage-core.so
+        echo "cage-engine:"
+        ldd libcage-engine.so
+
+
+  MacOS:
+    name: macos-${{ matrix.os-version }}-${{ matrix.build-config }}
+    runs-on: macos-${{ matrix.os-version }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os-version: [15]
+        build-config: [debug, release]
+
+    steps:
+    - name: Install packages
+      run: |
+        brew install nasm
+
+    - name: Versions
+      run: |
+        cmake --version
+        git --version
+        clang --version
+        clang++ --version
+
+    - uses: actions/checkout@v4
+
+    - name: Configure
       run: |
-        cd build
-        sudo cmake --install .
-        cd ../sources/test-install
         mkdir build
         cd build
         cmake -DCMAKE_BUILD_TYPE=${{ matrix.build-config }} ..
-        cmake --build . -- -j$(( `nproc` + 1 ))
+
+    - name: Build
+      run: |
+        cd build
+        cmake --build . -- -j$(( `sysctl -n hw.ncpu` + 1 ))
+
+    - name: Tests
+      run: |
+        cd build/result/${{ matrix.build-config }}
+        ./cage-test-core
+
+    - name: Assets
+      run: |
+        cd build/result/${{ matrix.build-config }}
+        ./cage-asset-database
 
     - name: List dependencies
       run: |
         cd build/result/${{ matrix.build-config }}
         echo "cage-core:"
-        ldd libcage-core.so
+        otool -L libcage-core.dylib
         echo "cage-engine:"
-        ldd libcage-engine.so
+        otool -L libcage-engine.dylib
 
 
   NoProfiler:
@@ -184,8 +207,6 @@ jobs:
         sudo apt-get install -y xorg-dev libwayland-dev libxkbcommon-dev libpulse-dev libasound2-dev nasm libssl-dev
 
     - uses: actions/checkout@v4
-      with:
-        submodules: recursive
 
     - name: Configure
       run: |
@@ -246,8 +267,6 @@ jobs:
         clang++ --version
 
     - uses: actions/checkout@v4
-      with:
-        submodules: recursive
 
     - name: Configure
       run: |
@@ -265,53 +284,3 @@ jobs:
       run: |
         cd build/result/${{ matrix.build-config }}
         ./cage-test-core
-
-
-  MacOS:
-    name: macos-${{ matrix.os-version }}-${{ matrix.build-config }}
-    runs-on: macos-${{ matrix.os-version }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os-version: [14, 15]
-        build-config: [debug, release]
-
-    steps:
-    - name: Install packages
-      run: |
-        brew install nasm
-
-    - name: Versions
-      run: |
-        cmake --version
-        git --version
-        clang --version
-        clang++ --version
-
-    - uses: actions/checkout@v4
-      with:
-        submodules: recursive
-
-    - name: Configure
-      run: |
-        mkdir build
-        cd build
-        cmake -DCMAKE_BUILD_TYPE=${{ matrix.build-config }} ..
-
-    - name: Build
-      run: |
-        cd build
-        cmake --build . -- -j$(( `sysctl -n hw.ncpu` + 1 ))
-
-    - name: Tests
-      run: |
-        cd build/result/${{ matrix.build-config }}
-        ./cage-test-core
-
-    - name: List dependencies
-      run: |
-        cd build/result/${{ matrix.build-config }}
-        echo "cage-core:"
-        otool -L libcage-core.dylib
-        echo "cage-engine:"
-        otool -L libcage-engine.dylib

.gitignore

@@ -7,3 +7,4 @@ CMakeLists.txt.user
 CMakeSettings.json
 *~
 *.TMP
+.DS_Store

.gitmodules

@@ -13,9 +13,6 @@
 [submodule "externals/freetype/freetype"]
 	path = externals/freetype/freetype
 	url = https://github.com/ucpu/freetype.git
-[submodule "externals/glad/glad"]
-	path = externals/glad/glad
-	url = https://github.com/ucpu/glad.git
 [submodule "externals/glm/glm"]
 	path = externals/glm/glm
 	url = https://github.com/g-truc/glm.git
@@ -91,9 +88,6 @@
 [submodule "externals/gamenetworkingsockets/GameNetworkingSockets"]
 	path = externals/gamenetworkingsockets/GameNetworkingSockets
 	url = https://github.com/ValveSoftware/GameNetworkingSockets.git
-[submodule "externals/protobuf/protobuf"]
-	path = externals/protobuf/protobuf
-	url = https://github.com/protocolbuffers/protobuf.git
 [submodule "externals/quickhull/quickhull"]
 	path = externals/quickhull/quickhull
 	url = https://github.com/akuukka/quickhull.git
@@ -121,3 +115,12 @@
 [submodule "externals/wamr/zydis"]
 	path = externals/wamr/zydis
 	url = https://github.com/zyantific/zydis.git
+[submodule "externals/dawn/dawn"]
+	path = externals/dawn/dawn
+	url = https://dawn.googlesource.com/dawn
+[submodule "externals/glslang/glslang"]
+	path = externals/glslang/glslang
+	url = https://github.com/KhronosGroup/glslang.git
+[submodule "externals/svector/svector"]
+	path = externals/svector/svector
+	url = https://github.com/martinus/svector.git

CMakeLists.txt

@@ -15,6 +15,8 @@ if(WIN32)
 	message(STATUS "CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION: ${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}")
 endif()
 
+execute_process(COMMAND "bash" "${CMAKE_CURRENT_LIST_DIR}/submodules.sh" WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}" COMMAND_ECHO STDOUT COMMAND_ERROR_IS_FATAL ANY)
+
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 include(cage_all)
 

cmake/cage_assets.cmake

@@ -47,7 +47,6 @@ function(cage_assets_init)
 	endif()
 	cage_assets_add_schemes_path("${cage_assets_current_list_dir}/../schemes")
 	cage_assets_add_data_path("${cage_assets_current_list_dir}/../data")
-	configure_file("${cage_assets_current_list_dir}/../sources/include/cage-engine/shaderConventions.h" "${cage_assets_intermediate_path}/data/cage/shaders/" COPYONLY)
 	cage_assets_generate_config()
 endfunction(cage_assets_init)
 

cmake/cage_build_configuration.cmake

@@ -13,6 +13,7 @@ macro(cage_build_configuration)
 	set(CMAKE_C_STANDARD_REQUIRED ON)
 	set(CMAKE_CXX_STANDARD 20)
 	set(CMAKE_CXX_STANDARD_REQUIRED ON)
+	set(CMAKE_CXX_SCAN_FOR_MODULES OFF)
 
 	# default visibility hidden
 	set(CMAKE_C_VISIBILITY_PRESET hidden)
@@ -29,7 +30,7 @@ macro(cage_build_configuration)
 	set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
 	set(CMAKE_INSTALL_RPATH "\$ORIGIN")
 
-	if(WIN32)
+	if(MSVC)
 		# enable UTF-8
 		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /utf-8")
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /utf-8")

cmake/cage_copy_redist.cmake

@@ -7,12 +7,14 @@ function(cage_copy_redist_license sourcePath targetName)
 endfunction(cage_copy_redist_license)
 
 function(cage_copy_redist)
+	cage_copy_redist_license("${cage_copy_redist_current_list_dir}/../LICENSE" "cage" COPYONLY)
 	cage_copy_redist_license("${cage_copy_redist_current_list_dir}/../externals/assimp/assimp/LICENSE" "assimp" COPYONLY)
 	cage_copy_redist_license("${cage_copy_redist_current_list_dir}/../externals/avir/avir/LICENSE" "avir" COPYONLY)
 	cage_copy_redist_license("${cage_copy_redist_current_list_dir}/../externals/bc7enc_rdo/bc7enc_rdo/LICENSE" "bc7enc_rdo" COPYONLY)
 	cage_copy_redist_license("${cage_copy_redist_current_list_dir}/../externals/cpr/cpr/LICENSE" "cpr" COPYONLY)
 	cage_copy_redist_license("${cage_copy_redist_current_list_dir}/../externals/cubeb/cubeb/LICENSE" "cubeb" COPYONLY)
 	cage_copy_redist_license("${cage_copy_redist_current_list_dir}/../externals/curl/curl/COPYING" "curl" COPYONLY)
+	cage_copy_redist_license("${cage_copy_redist_current_list_dir}/../externals/dawn/dawn/LICENSE" "dawn" COPYONLY)
 	cage_copy_redist_license("${cage_copy_redist_current_list_dir}/../externals/dr_libs/dr_libs/README.md" "dr_libs" COPYONLY)
 	cage_copy_redist_license("${cage_copy_redist_current_list_dir}/../externals/dualmc/dualmc/LICENSE" "dualmc" COPYONLY)
 	cage_copy_redist_license("${cage_copy_redist_current_list_dir}/../externals/fastnoise/fastnoise/LICENSE" "fastnoise" COPYONLY)
@@ -34,7 +36,6 @@ function(cage_copy_redist)
 	cage_copy_redist_license("${cage_copy_redist_current_list_dir}/../externals/pmp/pmp/LICENSE.txt" "pmp" COPYONLY)
 	cage_copy_redist_license("${cage_copy_redist_current_list_dir}/../externals/pmp/pmp/external/eigen-3.4.0/COPYING.MPL2" "pmp_eigen" COPYONLY)
 	cage_copy_redist_license("${cage_copy_redist_current_list_dir}/../externals/png/png/LICENSE" "png" COPYONLY)
-	cage_copy_redist_license("${cage_copy_redist_current_list_dir}/../externals/protobuf/protobuf/LICENSE" "protobuf" COPYONLY)
 	cage_copy_redist_license("${cage_copy_redist_current_list_dir}/../externals/quickhull/quickhull/README.md" "quickhull" COPYONLY)
 	cage_copy_redist_license("${cage_copy_redist_current_list_dir}/../externals/samplerate/libsamplerate/COPYING" "samplerate" COPYONLY)
 	cage_copy_redist_license("${cage_copy_redist_current_list_dir}/../externals/simplefilewatcher/simplefilewatcher/License.txt" "simplefilewatcher" COPYONLY)
@@ -48,5 +49,4 @@ function(cage_copy_redist)
 	cage_copy_redist_license("${cage_copy_redist_current_list_dir}/../externals/xatlas/xatlas/LICENSE" "xatlas" COPYONLY)
 	cage_copy_redist_license("${cage_copy_redist_current_list_dir}/../externals/zlib-ng/zlib-ng/LICENSE.md" "zlib-ng" COPYONLY)
 	cage_copy_redist_license("${cage_copy_redist_current_list_dir}/../externals/zstd/zstd/LICENSE" "zstd" COPYONLY)
-	cage_copy_redist_license("${cage_copy_redist_current_list_dir}/../LICENSE" "cage" COPYONLY)
 endfunction(cage_copy_redist)

data/cage/shaders/effects/bloomApply.glsl

@@ -1,23 +1,25 @@
 
-$include ../shaderConventions.h
-
 $include vertex.glsl
 
 $define shader fragment
 
-layout(binding = 0) uniform sampler2D texColor;
-layout(binding = 1) uniform sampler2D texBloom;
+layout(std140, set = 2, binding = 0) uniform Params
+{
+	vec4 uniBloomParams; // threshold, blur passes
+};
 
-layout(location = 0) uniform int uniLodLevel;
+layout(set = 2, binding = 1) uniform sampler2D texColor;
+layout(set = 2, binding = 3) uniform sampler2D texBloom;
 
-out vec4 outColor;
+layout(location = 0) out vec4 outColor;
 
 void main()
 {
+	int levels = int(uniBloomParams.y);
 	vec3 color = texelFetch(texColor, ivec2(gl_FragCoord), 0).rgb;
 	vec3 bloom = vec3(0);
-	vec2 uv = vec2(gl_FragCoord) / textureSize(texColor, 0).xy;
-	for (int i = 0; i < uniLodLevel; i++)
+	vec2 uv = vec2(gl_FragCoord) / vec2(textureSize(texColor, 0));
+	for (int i = 0; i < levels; i++)
 		bloom += textureLod(texBloom, uv, i).rgb;
-	outColor = vec4(color + bloom / uniLodLevel, 1); // additive mixing
+	outColor = vec4(color + bloom / levels, 1); // additive mixing
 }

data/cage/shaders/effects/bloomGenerate.glsl

@@ -1,15 +1,16 @@
 
-$include ../shaderConventions.h
-
 $include vertex.glsl
 
 $define shader fragment
 
-layout(location = 0) uniform vec4 uniBloomParams; // threshold
+layout(std140, set = 2, binding = 0) uniform Params
+{
+	vec4 uniBloomParams; // threshold, blur passes
+};
 
-layout(binding = 0) uniform sampler2D texColor;
+layout(set = 2, binding = 1) uniform sampler2D texColor;
 
-out vec4 outBloom;
+layout(location = 0) out vec4 outBloom;
 
 const int downscale = 3;
 
@@ -24,7 +25,7 @@ void main()
 			vec3 c = texelFetch(texColor, ivec2(gl_FragCoord) * downscale + ivec2(x, y) - downscale / 2, 0).rgb;
 			//float l = dot(c, vec3(0.2126, 0.7152, 0.0722)); // todo make the "grayscale factor" configurable
 			float l = dot(c, vec3(0.3333));
-			if (isnan(l))
+			if (!(l >= 0.0 || l < 0.0)) // if (isnan(l))
 				continue; // prevent spreading a NaN to other pixels
 			int m = int(l > uniBloomParams[0]);
 			acc += float(m) * c;