fix(build): 修复shaderc编译参数中的语法错误

移除多余的WERROR参数并修正条件表达式语法

.github/CODEOWNERS

@@ -1 +1,2 @@
 * @bwrsandman
+* @jsm174

.github/workflows/ci.yml

@@ -15,15 +15,15 @@ jobs:
     name: Check compatibility with minimum cmake version
     runs-on: ubuntu-latest
     env:
-      CMAKE_VERSION: 3.10.2
+      CMAKE_VERSION: 3.20.0
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
       - name: Install Linux dependencies
         run: |
           sudo apt-get update
-          sudo apt install -y libgl1-mesa-dev
+          sudo apt install -y libgl1-mesa-dev libwayland-dev libwayland-egl-backend-dev
       - uses: lukka/get-cmake@latest
         with:
           cmakeVersion: ${{ env.CMAKE_VERSION }}
@@ -57,13 +57,13 @@ jobs:
       CC: ${{ matrix.cc }}
       CXX: ${{ matrix.cxx }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
       - name: Install Linux dependencies
         run: |
           sudo apt-get update
-          sudo apt install -y libgl1-mesa-dev
+          sudo apt install -y libgl1-mesa-dev libwayland-dev libwayland-egl-backend-dev
         if: matrix.os == 'ubuntu-latest'
 
       # Setup the build machine with the most recent versions of CMake and Ninja. Both are cached if not already: on subsequent runs both will be quickly restored from GitHub cache service.
@@ -94,13 +94,13 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
       - name: Install Linux dependencies
         run: |
           sudo apt-get update
-          sudo apt install -y libgl1-mesa-dev
+          sudo apt install -y libgl1-mesa-dev libwayland-dev libwayland-egl-backend-dev
         if: matrix.os == 'ubuntu-latest'
 
       # Setup the build machine with the most recent versions of CMake and Ninja. Both are cached if not already: on subsequent runs both will be quickly restored from GitHub cache service.

.github/workflows/format.yml

@@ -12,7 +12,7 @@ jobs:
     name: cmake-format
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
         with:
           ref: ${{ github.event.pull_request.head.ref }}
           repository: ${{ github.event.pull_request.head.repo.full_name }}
@@ -21,7 +21,7 @@ jobs:
         if: startsWith(github.event_name, 'pull_request')
       - name: Format CMake files
         id: cmake-format
-        uses: PuneetMatharu/cmake-format-lint-action@main
+        uses: PuneetMatharu/cmake-format-lint-action@v1.0.6
         with:
           args: --config-files .cmake-format.py --check
   # Run only if a PR and cmake-format has failed
@@ -31,7 +31,7 @@ jobs:
     needs: cmake-format-check
     if: always() && startsWith(github.event_name, 'pull_request') && needs.cmake-format-check.result == 'failure'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
         with:
           ref: ${{ github.event.pull_request.head.ref }}
           repository: ${{ github.event.pull_request.head.repo.full_name }}
@@ -40,12 +40,12 @@ jobs:
         if: startsWith(github.event_name, 'pull_request')
       - name: Format CMake files
         id: cmake-format
-        uses: PuneetMatharu/cmake-format-lint-action@v1.0.0
+        uses: PuneetMatharu/cmake-format-lint-action@v1.0.6
         with:
           args: --config-files .cmake-format.py --in-place
       - run: |
           git diff > cmake-format.patch
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v7
         with:
           name: formatting-fix-${{github.sha}}
           path: cmake-format.patch

.github/workflows/release.yml

@@ -18,7 +18,7 @@ jobs:
       sha: ${{ steps.version.outputs.sha }}
       tag: ${{ steps.version.outputs.tag }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
           fetch-depth: 0
@@ -51,13 +51,13 @@ jobs:
       CMAKE_INSTALL_DIR: ${{ github.workspace }}/install/
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
       - name: Install Linux dependencies
         run: |
           sudo apt-get update
-          sudo apt install -y libgl1-mesa-dev
+          sudo apt install -y libgl1-mesa-dev libwayland-dev libwayland-egl-backend-dev
         if: matrix.os == 'ubuntu-latest'
       # Setup the build machine with the most recent versions of CMake and Ninja. Both are cached if not already: on subsequent runs both will be quickly restored from GitHub cache service.
       - uses: lukka/get-cmake@latest
@@ -80,7 +80,7 @@ jobs:
       - name: Build
         run: |
           cmake --build "${{ env.CMAKE_BUILD_DIR }}" --target install --config Release
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v7
         with:
           name: ${{ matrix.os }}
           path: ${{ github.workspace }}/install/
@@ -93,7 +93,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
           fetch-depth: 0
@@ -102,69 +102,69 @@ jobs:
           find src/bgfx.cmake -name ".git*" -exec rm -rf {} +
           find src/bgfx.cmake -name ".editorconfig" -delete
           rm src/bgfx.cmake/.cmake-format.py
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v8
         with:
           name: windows-latest
           path: ${{ github.workspace }}/install/windows/bgfx.cmake
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v8
         with:
           name: ubuntu-latest
           path: ${{ github.workspace }}/install/linux/bgfx.cmake
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v8
         with:
           name: macos-latest
           path: ${{ github.workspace }}/install/macos/bgfx.cmake
       - name: Create Source Zip
-        uses: thedoctor0/zip-release@0.7.1
+        uses: thedoctor0/zip-release@0.7.6
         with:
           type: 'zip'
           filename: 'bgfx.cmake.${{ needs.version.outputs.tag }}.zip'
           directory: 'src'
           path: 'bgfx.cmake'
       - name: Create Source Tar
-        uses: thedoctor0/zip-release@0.7.1
+        uses: thedoctor0/zip-release@0.7.6
         with:
           type: 'tar'
           filename: 'bgfx.cmake.${{ needs.version.outputs.tag }}.tar.gz'
           directory: 'src'
           path: 'bgfx.cmake'
       - name: Create Windows Zip
-        uses: thedoctor0/zip-release@0.7.1
+        uses: thedoctor0/zip-release@0.7.6
         with:
           type: 'zip'
           filename: 'bgfx.cmake.binary.windows.${{ needs.version.outputs.tag }}.zip'
           directory: 'install/windows'
           path: 'bgfx.cmake'
       - name: Create Windows Tar
-        uses: thedoctor0/zip-release@0.7.1
+        uses: thedoctor0/zip-release@0.7.6
         with:
           type: 'tar'
           filename: 'bgfx.cmake.binary.windows.${{ needs.version.outputs.tag }}.tar.gz'
           directory: 'install/windows'
           path: 'bgfx.cmake'
       - name: Create Linux Zip
-        uses: thedoctor0/zip-release@0.7.1
+        uses: thedoctor0/zip-release@0.7.6
         with:
           type: 'zip'
           filename: 'bgfx.cmake.binary.linux.${{ needs.version.outputs.tag }}.zip'
           directory: 'install/linux'
           path: 'bgfx.cmake'
       - name: Create Linux Tar
-        uses: thedoctor0/zip-release@0.7.1
+        uses: thedoctor0/zip-release@0.7.6
         with:
           type: 'tar'
           filename: 'bgfx.cmake.binary.linux.${{ needs.version.outputs.tag }}.tar.gz'
           directory: 'install/linux'
           path: 'bgfx.cmake'
       - name: Create MacOS Zip
-        uses: thedoctor0/zip-release@0.7.1
+        uses: thedoctor0/zip-release@0.7.6
         with:
           type: 'zip'
           filename: 'bgfx.cmake.binary.macos.${{ needs.version.outputs.tag }}.zip'
           directory: 'install/macos'
           path: 'bgfx.cmake'
       - name: Create MacOS Tar
-        uses: thedoctor0/zip-release@0.7.1
+        uses: thedoctor0/zip-release@0.7.6
         with:
           type: 'tar'
           filename: 'bgfx.cmake.binary.macos.${{ needs.version.outputs.tag }}.tar.gz'

CMakeLists.txt

@@ -8,12 +8,12 @@
 # You should have received a copy of the CC0 Public Domain Dedication along with
 # this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
 
-cmake_minimum_required(VERSION 3.10.2) # version supported by android studio
+cmake_minimum_required(VERSION 3.20) # C++20 support required
 project(bgfx)
 cmake_policy(SET CMP0054 NEW)
 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
@@ -43,9 +43,9 @@ option(BGFX_INSTALL "Create installation target." ON)
 cmake_dependent_option(
 	BGFX_INSTALL_EXAMPLES "Install examples and their runtimes." OFF "BGFX_INSTALL;BGFX_BUILD_EXAMPLES" OFF
 )
-cmake_dependent_option(BGFX_WITH_WAYLAND "Use Wayland backend." ON "CMAKE_SYSTEM_NAME STREQUAL 'Linux'" OFF)
+cmake_dependent_option(BGFX_WITH_WAYLAND "Use Wayland backend." ON "CMAKE_SYSTEM_NAME STREQUAL Linux" OFF)
 option(BGFX_CUSTOM_TARGETS "Include convenience custom targets." ON)
-option(BGFX_CONFIG_MULTITHREADED "Build bgfx with multithreaded configuration" ON)
+cmake_dependent_option(BGFX_CONFIG_MULTITHREADED "Build bgfx with multithreaded configuration" ON "NOT CMAKE_SYSTEM_NAME STREQUAL Emscripten" OFF)
 option(BGFX_CONFIG_RENDERER_WEBGPU "Enable the webgpu renderer" OFF)
 option(BGFX_CONFIG_DEBUG_ANNOTATION "Enable gfx debug annotations (default: on in debug)" OFF)
 

README.md

@@ -94,12 +94,12 @@ bgfx_compile_shaders(
 	SHADERS filenames
 	VARYING_DEF filename
 	OUTPUT_DIR directory
-	[AS_HEADER]
+	[AS_HEADERS]
 )
 ```
 This defines a shaderc command to generate binaries or headers for a number of `TYPE` shaders with `SHADERS` files and `VARYING_DEF` file in the `OUTPUT_DIR` directory. There will be one generated shader for each supported rendering API on this current platform according to the `BGFX_EMBEDDED_SHADER` macro in `bgfx/embedded_shader.h` for headers and in the directory expected by `load_shader` in `bgfx_utils.h`.
 
-The generated headers will have names in the format of `${RENDERING_API}/${SHADERS}.bin[.h]` where `RENDERING_API` can be `glsl`, `essl`, `spv`, `dx11` and `mtl` depending on the availability of the platform.
+The generated headers will have names in the format of `${RENDERING_API}/${SHADERS}.bin[.h]` where `RENDERING_API` can be `glsl`, `essl`, `spirv`, `dx11` and `metal` depending on the availability of the platform.
 
 Adding these `SHADERS` as source files to a target will run `shaderc` at build time and they will rebuild if either the contents of the `SHADERS` or the `VARYING_DEF` change.
 
@@ -110,14 +110,14 @@ bgfx_compile_shaders(
   SHADERS vs.sc
   VARYING_DEF varying.def.sc
   OUTPUT_DIR ${CMAKE_BINARY_DIR}/include/generated/shaders
-  AS_HEADER
+  AS_HEADERS
 )
-bgfx_compile_shader_to_header(
+bgfx_compile_shaders(
   TYPE FRAGMENT
   SHADERS fs.sc
   VARYING_DEF ${CMAKE_SOURCE_DIR}/varying.def.sc
   OUTPUT_DIR ${CMAKE_BINARY_DIR}/include/generated/shaders
-  AS_HEADER
+  AS_HEADERS
 )
 
 add_library(myLib main.cpp vs.sc fs.sc)
@@ -128,17 +128,17 @@ target_include_directories(myLib ${CMAKE_BINARY_DIR}/include/generated/shaders)
 // main.cpp
 #include <glsl/vs.sc.bin.h>
 #include <essl/vs.sc.bin.h>
-#include <spv/vs.sc.bin.h>
+#include <spirv/vs.sc.bin.h>
 #include <glsl/fs.sc.bin.h>
 #include <essl/fs.sc.bin.h>
-#include <spv/fs.sc.bin.h>
+#include <spirv/fs.sc.bin.h>
 #if defined(_WIN32)
 #include <dx11/vs.sc.bin.h>
 #include <dx11/fs.sc.bin.h>
 #endif //  defined(_WIN32)
 #if __APPLE__
-#include <mtl/vs.sc.bin.h>
-#include <mtl/fs.sc.bin.h>
+#include <metal/vs.sc.bin.h>
+#include <metal/fs.sc.bin.h>
 #endif // __APPLE__
 
 const bgfx::EmbeddedShader k_vs = BGFX_EMBEDDED_SHADER(vs);

cmake/bgfx/3rdparty/glslang.cmake

@@ -55,9 +55,10 @@ set_target_properties(glslang PROPERTIES FOLDER "bgfx")
 
 target_include_directories(
 	glslang
-	PUBLIC ${GLSLANG} #
-		   ${GLSLANG}/glslang/Public #
-	PRIVATE ${GLSLANG}/.. #
-			${SPIRV_TOOLS}/include #
-			${SPIRV_TOOLS}/source #
+	PUBLIC ${GLSLANG}
+		   ${GLSLANG}/glslang/Public
+		   ${GLSLANG}/glslang/Include
+	PRIVATE ${GLSLANG}/..
+			${SPIRV_TOOLS}/include
+			${SPIRV_TOOLS}/source
 )

cmake/bgfx/3rdparty/spirv-opt.cmake

@@ -70,16 +70,21 @@ file(
 	${SPIRV_TOOLS}/source/spirv_validator_options.h
 	${SPIRV_TOOLS}/source/table.cpp
 	${SPIRV_TOOLS}/source/table.h
+	${SPIRV_TOOLS}/source/table2.cpp
+	${SPIRV_TOOLS}/source/table2.h
 	${SPIRV_TOOLS}/source/text.cpp
 	${SPIRV_TOOLS}/source/text.h
 	${SPIRV_TOOLS}/source/text_handler.cpp
 	${SPIRV_TOOLS}/source/text_handler.h
+	${SPIRV_TOOLS}/source/to_string.cpp
+	${SPIRV_TOOLS}/source/to_string.h
 	${SPIRV_TOOLS}/source/util/bit_vector.cpp
 	${SPIRV_TOOLS}/source/util/bit_vector.h
 	${SPIRV_TOOLS}/source/util/bitutils.h
 	${SPIRV_TOOLS}/source/util/hex_float.h
 	${SPIRV_TOOLS}/source/util/parse_number.cpp
 	${SPIRV_TOOLS}/source/util/parse_number.h
+	${SPIRV_TOOLS}/source/util/status.h
 	${SPIRV_TOOLS}/source/util/string_utils.cpp
 	${SPIRV_TOOLS}/source/util/string_utils.h
 	${SPIRV_TOOLS}/source/util/timer.h
@@ -105,15 +110,20 @@ file(
 	${SPIRV_TOOLS}/source/val/validate_debug.cpp
 	${SPIRV_TOOLS}/source/val/validate_decorations.cpp
 	${SPIRV_TOOLS}/source/val/validate_derivatives.cpp
+	${SPIRV_TOOLS}/source/val/validate_dot_product.cpp
 	${SPIRV_TOOLS}/source/val/validate_execution_limitations.cpp
 	${SPIRV_TOOLS}/source/val/validate_extensions.cpp
 	${SPIRV_TOOLS}/source/val/validate_function.cpp
+	${SPIRV_TOOLS}/source/val/validate_graph.cpp
+	${SPIRV_TOOLS}/source/val/validate_group.cpp
 	${SPIRV_TOOLS}/source/val/validate_id.cpp
 	${SPIRV_TOOLS}/source/val/validate_image.cpp
 	${SPIRV_TOOLS}/source/val/validate_instruction.cpp
 	${SPIRV_TOOLS}/source/val/validate_interfaces.cpp
+	${SPIRV_TOOLS}/source/val/validate_invalid_type.cpp
 	${SPIRV_TOOLS}/source/val/validate_layout.cpp
 	${SPIRV_TOOLS}/source/val/validate_literals.cpp
+	${SPIRV_TOOLS}/source/val/validate_logical_pointers.cpp
 	${SPIRV_TOOLS}/source/val/validate_logicals.cpp
 	${SPIRV_TOOLS}/source/val/validate_memory.cpp
 	${SPIRV_TOOLS}/source/val/validate_memory_semantics.cpp
@@ -121,12 +131,15 @@ file(
 	${SPIRV_TOOLS}/source/val/validate_misc.cpp
 	${SPIRV_TOOLS}/source/val/validate_mode_setting.cpp
 	${SPIRV_TOOLS}/source/val/validate_non_uniform.cpp
+	${SPIRV_TOOLS}/source/val/validate_pipe.cpp
 	${SPIRV_TOOLS}/source/val/validate_primitives.cpp
 	${SPIRV_TOOLS}/source/val/validate_ray_query.cpp
 	${SPIRV_TOOLS}/source/val/validate_ray_tracing.cpp
 	${SPIRV_TOOLS}/source/val/validate_ray_tracing_reorder.cpp
 	${SPIRV_TOOLS}/source/val/validate_scopes.cpp
 	${SPIRV_TOOLS}/source/val/validate_small_type_uses.cpp
+	${SPIRV_TOOLS}/source/val/validate_tensor.cpp
+	${SPIRV_TOOLS}/source/val/validate_tensor_layout.cpp
 	${SPIRV_TOOLS}/source/val/validate_type.cpp
 	${SPIRV_TOOLS}/source/val/validation_state.cpp
 )

cmake/bgfx/3rdparty/tint.cmake

@@ -0,0 +1,98 @@
+# bgfx.cmake - bgfx building in cmake
+# Written in 2017 by Joshua Brookover <joshua.al.brookover@gmail.com>
+#
+# To the extent possible under law, the author(s) have dedicated all copyright
+# and related and neighboring rights to this software to the public domain
+# worldwide. This software is distributed without any warranty.
+#
+# You should have received a copy of the CC0 Public Domain Dedication along with
+# this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
+
+if(TARGET tint)
+	return()
+endif()
+
+if(NOT IS_DIRECTORY ${BGFX_DIR})
+	message(SEND_ERROR "Could not load bgfx, directory does not exist. ${BGFX_DIR}")
+	return()
+endif()
+
+set(TINT_DIR ${BGFX_DIR}/3rdparty/dawn)
+set(SPIRV_HEADERS ${BGFX_DIR}/3rdparty/spirv-headers)
+set(SPIRV_TOOLS ${BGFX_DIR}/3rdparty/spirv-tools)
+
+file(
+	GLOB_RECURSE
+	TINT_SOURCES
+	${TINT_DIR}/src/tint/utils/*.cc
+	${TINT_DIR}/src/tint/utils/*.h
+	${TINT_DIR}/src/tint/lang/core/*.cc
+	${TINT_DIR}/src/tint/lang/core/*.h
+	${TINT_DIR}/src/tint/lang/null/*.cc
+	${TINT_DIR}/src/tint/lang/null/*.h
+	${TINT_DIR}/src/tint/lang/spirv/*.cc
+	${TINT_DIR}/src/tint/lang/spirv/*.h
+	${TINT_DIR}/src/tint/lang/wgsl/*.cc
+	${TINT_DIR}/src/tint/lang/wgsl/*.h
+	${TINT_DIR}/src/tint/api/*.cc
+	${TINT_DIR}/src/tint/api/*.h
+)
+
+add_library(tint STATIC ${TINT_SOURCES})
+
+set_target_properties(tint PROPERTIES FOLDER "bgfx")
+
+target_include_directories(
+	tint
+	PUBLIC ${TINT_DIR}
+		   ${TINT_DIR}/src/tint
+	PRIVATE ${TINT_DIR}/third_party/protobuf/src
+			${TINT_DIR}/third_party/abseil-cpp
+			${SPIRV_TOOLS}
+			${SPIRV_TOOLS}/include
+			${SPIRV_TOOLS}/include/generated
+			${SPIRV_HEADERS}/include
+)
+
+target_compile_definitions(
+	tint
+	PRIVATE TINT_BUILD_GLSL_WRITER=0
+			TINT_BUILD_HLSL_WRITER=0
+			TINT_BUILD_MSL_WRITER=0
+			TINT_BUILD_NULL_WRITER=0
+			TINT_BUILD_SPV_READER=1
+			TINT_BUILD_SPV_WRITER=0
+			TINT_BUILD_WGSL_READER=0
+			TINT_BUILD_WGSL_WRITER=1
+			TINT_ENABLE_IR_VALIDATION=0
+)
+
+if(WIN32)
+	target_compile_definitions(
+		tint
+		PRIVATE TINT_BUILD_IS_LINUX=0
+				TINT_BUILD_IS_MAC=0
+				TINT_BUILD_IS_WIN=1
+	)
+elseif(APPLE)
+	target_compile_definitions(
+		tint
+		PRIVATE TINT_BUILD_IS_LINUX=0
+				TINT_BUILD_IS_MAC=1
+				TINT_BUILD_IS_WIN=0
+	)
+else()
+	target_compile_definitions(
+		tint
+		PRIVATE TINT_BUILD_IS_LINUX=1
+				TINT_BUILD_IS_MAC=0
+				TINT_BUILD_IS_WIN=0
+	)
+endif()
+
+if(MSVC)
+	target_compile_options(
+		tint
+		PRIVATE "/Zc:preprocessor"
+	)
+endif()

cmake/bgfx/CMakeLists.txt

@@ -26,6 +26,7 @@ if(BGFX_BUILD_TOOLS_SHADER)
 	include(3rdparty/glsl-optimizer.cmake)
 	include(3rdparty/fcpp.cmake)
 	include(3rdparty/webgpu.cmake)
+	include(3rdparty/tint.cmake)
 	include(shaderc.cmake)
 endif()
 

cmake/bgfx/bgfx.cmake

@@ -19,22 +19,18 @@ if(NOT IS_DIRECTORY ${BGFX_DIR})
 	return()
 endif()
 
-if(NOT APPLE)
-	set(BGFX_AMALGAMATED_SOURCE ${BGFX_DIR}/src/amalgamated.cpp)
-else()
-	set(BGFX_AMALGAMATED_SOURCE ${BGFX_DIR}/src/amalgamated.mm)
-endif()
-
 # Grab the bgfx source files
 file(
 	GLOB
 	BGFX_SOURCES
 	${BGFX_DIR}/src/*.cpp
-	${BGFX_DIR}/src/*.mm
 	${BGFX_DIR}/src/*.h
 	${BGFX_DIR}/include/bgfx/*.h
 	${BGFX_DIR}/include/bgfx/c99/*.h
 )
+
+set(BGFX_AMALGAMATED_SOURCE ${BGFX_DIR}/src/amalgamated.cpp)
+
 if(BGFX_AMALGAMATED)
 	set(BGFX_NOBUILD ${BGFX_SOURCES})
 	list(REMOVE_ITEM BGFX_NOBUILD ${BGFX_AMALGAMATED_SOURCE})
@@ -43,8 +39,7 @@ if(BGFX_AMALGAMATED)
 	endforeach()
 else()
 	# Do not build using amalgamated sources
-	set_source_files_properties(${BGFX_DIR}/src/amalgamated.cpp PROPERTIES HEADER_FILE_ONLY ON)
-	set_source_files_properties(${BGFX_DIR}/src/amalgamated.mm PROPERTIES HEADER_FILE_ONLY ON)
+	set_source_files_properties(${BGFX_AMALGAMATED_SOURCE} PROPERTIES HEADER_FILE_ONLY ON)
 endif()
 
 # Create the bgfx target
@@ -57,7 +52,6 @@ endif()
 
 if(BGFX_CONFIG_RENDERER_WEBGPU)
 	include(${CMAKE_CURRENT_LIST_DIR}/3rdparty/webgpu.cmake)
-	target_compile_definitions(bgfx PRIVATE BGFX_CONFIG_RENDERER_WEBGPU=1)
 	if(EMSCRIPTEN)
 		target_link_options(bgfx PRIVATE "-s USE_WEBGPU=1")
 	else()
@@ -87,6 +81,7 @@ endif()
 
 if(BGFX_WITH_WAYLAND)
 	target_compile_definitions(bgfx PRIVATE "WL_EGL_PLATFORM=1")
+	target_link_libraries(bgfx PRIVATE wayland-egl)
 endif()
 
 set(BGFX_CONFIG_OPTIONS "")
@@ -189,13 +184,6 @@ if(UNIX
 	target_link_libraries(bgfx PUBLIC ${X11_LIBRARIES} ${OPENGL_LIBRARIES})
 endif()
 
-# Exclude mm files if not on OS X
-if(NOT APPLE)
-	set_source_files_properties(${BGFX_DIR}/src/glcontext_eagl.mm PROPERTIES HEADER_FILE_ONLY ON)
-	set_source_files_properties(${BGFX_DIR}/src/glcontext_nsgl.mm PROPERTIES HEADER_FILE_ONLY ON)
-	set_source_files_properties(${BGFX_DIR}/src/renderer_mtl.mm PROPERTIES HEADER_FILE_ONLY ON)
-endif()
-
 # Exclude glx context on non-unix
 if(NOT UNIX OR APPLE)
 	set_source_files_properties(${BGFX_DIR}/src/glcontext_glx.cpp PROPERTIES HEADER_FILE_ONLY ON)
@@ -204,10 +192,14 @@ endif()
 # Put in a "bgfx" folder in Visual Studio
 set_target_properties(bgfx PROPERTIES FOLDER "bgfx")
 
-# in Xcode we need to specify this file as objective-c++ (instead of renaming to .mm)
+# in Xcode we need to specify these files as objective-c++ (instead of renaming to .mm)
 if(XCODE)
 	set_source_files_properties(
-		${BGFX_DIR}/src/renderer_vk.cpp PROPERTIES LANGUAGE OBJCXX XCODE_EXPLICIT_FILE_TYPE sourcecode.cpp.objcpp
+		${BGFX_DIR}/src/renderer_vk.cpp
+		${BGFX_DIR}/src/renderer_webgpu.cpp
+		PROPERTIES
+			LANGUAGE OBJCXX
+			XCODE_EXPLICIT_FILE_TYPE sourcecode.cpp.objcpp
 	)
 endif()
 

cmake/bgfx/examples.cmake

@@ -31,6 +31,8 @@ function(add_bgfx_shader FILE FOLDER)
 		set(COMMON FILE ${FILE} ${TYPE} INCLUDES ${BGFX_DIR}/src)
 		set(OUTPUTS "")
 		set(OUTPUTS_PRETTY "")
+		set(OUTPUT_FILES "")
+		set(COMMANDS "")
 
 		if(WIN32)
 			# dx11
@@ -85,11 +87,15 @@ function(add_bgfx_shader FILE FOLDER)
 			set(SPIRV_OUTPUT ${BGFX_DIR}/examples/runtime/shaders/spirv/${FILENAME}.bin)
 			_bgfx_shaderc_parse(SPIRV ${COMMON} LINUX PROFILE spirv OUTPUT ${SPIRV_OUTPUT})
 			list(APPEND OUTPUTS "SPIRV")
-			set(OUTPUTS_PRETTY "${OUTPUTS_PRETTY}SPIRV")
-			set(OUTPUT_FILES "")
-			set(COMMANDS "")
+			set(OUTPUTS_PRETTY "${OUTPUTS_PRETTY}SPIRV, ")
 		endif()
 
+		# wgsl
+		set(WGSL_OUTPUT ${BGFX_DIR}/examples/runtime/shaders/wgsl/${FILENAME}.bin)
+		_bgfx_shaderc_parse(WGSL ${COMMON} LINUX PROFILE wgsl OUTPUT ${WGSL_OUTPUT})
+		list(APPEND OUTPUTS "WGSL")
+		set(OUTPUTS_PRETTY "${OUTPUTS_PRETTY}WGSL")
+
 		foreach(OUT ${OUTPUTS})
 			list(APPEND OUTPUT_FILES ${${OUT}_OUTPUT})
 			list(APPEND COMMANDS COMMAND "bgfx::shaderc" ${${OUT}})
@@ -136,14 +142,19 @@ function(add_example ARG_NAME)
 		target_link_libraries(
 			example-${ARG_NAME} PUBLIC bgfx bx bimg bimg_decode ${DEAR_IMGUI_LIBRARIES} ${MESHOPTIMIZER_LIBRARIES}
 		)
+
+		if(BGFX_WITH_WAYLAND)
+			target_compile_definitions(example-${ARG_NAME} PUBLIC ENTRY_CONFIG_USE_WAYLAND=1)
+		endif()
+
 		if(BGFX_WITH_GLFW)
 			find_package(glfw3 REQUIRED)
 			target_link_libraries(example-${ARG_NAME} PUBLIC glfw)
-			target_compile_definitions(example-${ARG_NAME} PUBLIC ENTRY_CONFIG_USE_GLFW)
+			target_compile_definitions(example-${ARG_NAME} PUBLIC ENTRY_CONFIG_USE_GLFW=1)
 		elseif(BGFX_WITH_SDL)
 			find_package(SDL2 REQUIRED)
 			target_link_libraries(example-${ARG_NAME} PUBLIC ${SDL2_LIBRARIES})
-			target_compile_definitions(example-${ARG_NAME} PUBLIC ENTRY_CONFIG_USE_SDL)
+			target_compile_definitions(example-${ARG_NAME} PUBLIC ENTRY_CONFIG_USE_SDL=1)
 		elseif(UNIX AND NOT APPLE AND NOT ANDROID)
 			target_link_libraries(example-${ARG_NAME} PUBLIC X11)
 		endif()
@@ -158,38 +169,44 @@ function(add_example ARG_NAME)
 				# on iOS we need to build a bundle so have to copy the data rather than symlink
 				# and on windows we can't create symlinks
 				add_custom_command(
-					TARGET example-${ARG_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${BGFX_DIR}/examples/runtime/
+					TARGET example-${ARG_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory ${BGFX_DIR}/examples/runtime/
 													   $<TARGET_FILE_DIR:example-${ARG_NAME}>
 				)
 			else()
 				# For everything else symlink some folders into our output directory
 				add_custom_command(
 					TARGET example-${ARG_NAME}
+					POST_BUILD
 					COMMAND ${CMAKE_COMMAND} -E create_symlink ${BGFX_DIR}/examples/runtime/font
 							$<TARGET_FILE_DIR:example-${ARG_NAME}>/font
 				)
 				add_custom_command(
 					TARGET example-${ARG_NAME}
+					POST_BUILD
 					COMMAND ${CMAKE_COMMAND} -E create_symlink ${BGFX_DIR}/examples/runtime/images
 							$<TARGET_FILE_DIR:example-${ARG_NAME}>/images
 				)
 				add_custom_command(
 					TARGET example-${ARG_NAME}
+					POST_BUILD
 					COMMAND ${CMAKE_COMMAND} -E create_symlink ${BGFX_DIR}/examples/runtime/meshes
 							$<TARGET_FILE_DIR:example-${ARG_NAME}>/meshes
 				)
 				add_custom_command(
 					TARGET example-${ARG_NAME}
+					POST_BUILD
 					COMMAND ${CMAKE_COMMAND} -E create_symlink ${BGFX_DIR}/examples/runtime/shaders
 							$<TARGET_FILE_DIR:example-${ARG_NAME}>/shaders
 				)
 				add_custom_command(
 					TARGET example-${ARG_NAME}
+					POST_BUILD
 					COMMAND ${CMAKE_COMMAND} -E create_symlink ${BGFX_DIR}/examples/runtime/text
 							$<TARGET_FILE_DIR:example-${ARG_NAME}>/text
 				)
 				add_custom_command(
 					TARGET example-${ARG_NAME}
+					POST_BUILD
 					COMMAND ${CMAKE_COMMAND} -E create_symlink ${BGFX_DIR}/examples/runtime/textures
 							$<TARGET_FILE_DIR:example-${ARG_NAME}>/textures
 				)
@@ -329,6 +346,10 @@ if(BGFX_BUILD_EXAMPLES)
 		45-bokeh
 		46-fsr
 		47-pixelformats
+		48-drawindirect
+		49-hextile
+		50-headless
+		51-gpufont
 	)
 
 	foreach(EXAMPLE ${BGFX_EXAMPLES})

cmake/bgfx/generated/shader.cpp.in

@@ -1,3 +1 @@
 #include "@BGFX_DIR@/src/shader.cpp"
-#include "@BGFX_DIR@/src/shader_dxbc.cpp"
-#include "@BGFX_DIR@/src/shader_spirv.cpp"

cmake/bgfx/shaderc.cmake

@@ -19,16 +19,6 @@ file(
 
 add_executable(shaderc ${SHADERC_SOURCES})
 
-target_link_libraries(
-	shaderc
-	PRIVATE bx
-			bgfx-vertexlayout
-			fcpp
-			glslang
-			glsl-optimizer
-			spirv-opt
-			spirv-cross
-)
 target_link_libraries(
 	shaderc
 	PRIVATE bx
@@ -40,7 +30,32 @@ target_link_libraries(
 			spirv-opt
 			spirv-cross
 			webgpu
+			tint
 )
+
+target_include_directories(
+	shaderc
+	PRIVATE ${BGFX_DIR}/3rdparty/dawn
+			${BGFX_DIR}/3rdparty/dawn/src
+)
+
+set(DXCOMPILER_RUNTIME)
+if(UNIX
+   AND NOT APPLE
+   AND NOT EMSCRIPTEN
+   AND NOT ANDROID
+)
+	target_include_directories(
+		shaderc
+		PRIVATE ${BGFX_DIR}/3rdparty/directx-headers/include/directx
+				${BGFX_DIR}/3rdparty/directx-headers/include
+				${BGFX_DIR}/3rdparty/directx-headers/include/wsl/stubs
+	)
+	set(DXCOMPILER_RUNTIME ${BGFX_DIR}/tools/bin/linux/libdxcompiler.so)
+elseif(WIN32)
+	set(DXCOMPILER_RUNTIME ${BGFX_DIR}/tools/bin/windows/dxcompiler.dll)
+endif()
+
 if(BGFX_AMALGAMATED)
 	target_link_libraries(shaderc PRIVATE bgfx-shader)
 endif()
@@ -66,3 +81,15 @@ endif()
 if(BGFX_INSTALL)
 	install(TARGETS shaderc EXPORT "${TARGETS_EXPORT_NAME}" DESTINATION "${CMAKE_INSTALL_BINDIR}")
 endif()
+
+# DXIL compiler will be dynamically loaded at runtime - no need
+# to link, just install the needed binaries alongside shaderc.exe
+if(DXCOMPILER_RUNTIME)
+	add_custom_command(
+		TARGET shaderc POST_BUILD
+		COMMAND ${CMAKE_COMMAND} -E copy_if_different ${DXCOMPILER_RUNTIME} $<TARGET_FILE_DIR:shaderc>
+	)
+	if(BGFX_INSTALL)
+		install(FILES ${DXCOMPILER_RUNTIME} DESTINATION "${CMAKE_INSTALL_BINDIR}")
+	endif()
+endif()

cmake/bgfxToolUtils.cmake

@@ -215,7 +215,7 @@ if(TARGET bgfx::texturec)
 		add_custom_command(
 			OUTPUT ${ARG_OUTPUT} #
 			COMMAND bgfx::texturec ${CLI} #
-			MAIN_DEPENDENCY ${ARG_INPUT} #
+			MAIN_DEPENDENCY ${ARG_FILE} #
 		)
 	endfunction()
 endif()
@@ -279,12 +279,12 @@ if(TARGET bgfx::geometryc)
 
 		# --packnormal
 		if(ARG_PACKNORMAL)
-			list(APPEND CLI "--packnormal ${ARG_PACKNORMAL}")
+			list(APPEND CLI "--packnormal" "${ARG_PACKNORMAL}")
 		endif()
 
 		# --packuv
 		if(ARG_PACKUV)
-			list(APPEND CLI "--packuv" ${ARG_PACKUV})
+			list(APPEND CLI "--packuv" "${ARG_PACKUV}")
 		endif()
 
 		# --tangent
@@ -352,7 +352,7 @@ if(TARGET bgfx::geometryc)
 		add_custom_command(
 			OUTPUT ${ARG_OUTPUT} #
 			COMMAND bgfx::geometryc ${CLI} #
-			MAIN_DEPENDENCY ${ARG_INPUT} #
+			MAIN_DEPENDENCY ${ARG_FILE} #
 		)
 	endfunction()
 endif()
@@ -364,7 +364,7 @@ if(TARGET bgfx::shaderc)
 	#	FILE filename
 	#	OUTPUT filename
 	#	FRAGMENT|VERTEX|COMPUTE
-	#	ANDROID|ASM_JS|IOS|LINUX|NACL|OSX|WINDOWS
+	#	ANDROID|ASM_JS|IOS|LINUX|OSX|WINDOWS|ORBIS
 	#	PROFILE profile
 	#	[O 0|1|2|3]
 	#	[VARYINGDEF filename]
@@ -382,7 +382,7 @@ if(TARGET bgfx::shaderc)
 	function(_bgfx_shaderc_parse ARG_OUT)
 		cmake_parse_arguments(
 			ARG
-			"DEPENDS;ANDROID;ASM_JS;IOS;LINUX;NACL;OSX;WINDOWS;PREPROCESS;RAW;FRAGMENT;VERTEX;COMPUTE;VERBOSE;DEBUG;DISASM;WERROR"
+			"DEPENDS;ANDROID;ASM_JS;IOS;LINUX;OSX;WINDOWS;ORBIS;PREPROCESS;RAW;FRAGMENT;VERTEX;COMPUTE;VERBOSE;DEBUG;DISASM;WERROR"
 			"FILE;OUTPUT;VARYINGDEF;BIN2C;PROFILE;O"
 			"INCLUDES;DEFINES"
 			${ARGN}
@@ -423,7 +423,7 @@ if(TARGET bgfx::shaderc)
 
 		# --platform
 		set(PLATFORM "")
-		set(PLATFORMS "ANDROID;ASM_JS;IOS;LINUX;NACL;OSX;WINDOWS")
+		set(PLATFORMS "ANDROID;ASM_JS;IOS;LINUX;OSX;WINDOWS;ORBIS")
 		foreach(P ${PLATFORMS})
 			if(ARG_${P})
 				if(PLATFORM)
@@ -436,20 +436,20 @@ if(TARGET bgfx::shaderc)
 		if(PLATFORM STREQUAL "")
 			message(SEND_ERROR "Call to _bgfx_shaderc_parse() must have a platform flag: ${PLATFORMS}")
 			return()
-		elseif(PLATFORM STREQUAL ANDROID)
+		elseif(PLATFORM STREQUAL "ANDROID")
 			list(APPEND CLI "--platform" "android")
-		elseif(PLATFORM STREQUAL ASM_JS)
+		elseif(PLATFORM STREQUAL "ASM_JS")
 			list(APPEND CLI "--platform" "asm.js")
-		elseif(PLATFORM STREQUAL IOS)
+		elseif(PLATFORM STREQUAL "IOS")
 			list(APPEND CLI "--platform" "ios")
-		elseif(PLATFORM STREQUAL NACL)
-			list(APPEND CLI "--platform" "nacl")
-		elseif(PLATFORM STREQUAL OSX)
+		elseif(PLATFORM STREQUAL "OSX")
 			list(APPEND CLI "--platform" "osx")
-		elseif(PLATFORM STREQUAL UNIX)
+		elseif(PLATFORM STREQUAL "LINUX")
 			list(APPEND CLI "--platform" "linux")
-		elseif(PLATFORM STREQUAL WINDOWS)
+		elseif(PLATFORM STREQUAL "WINDOWS")
 			list(APPEND CLI "--platform" "windows")
+		elseif(PLATFORM STREQUAL "ORBIS")
+			list(APPEND CLI "--platform" "orbis")
 		endif()
 
 		# --preprocess
@@ -459,16 +459,10 @@ if(TARGET bgfx::shaderc)
 
 		# --define
 		if(ARG_DEFINES)
-			list(APPEND CLI "--defines")
-			set(DEFINES "")
-			foreach(DEFINE ${ARG_DEFINES})
-				if(NOT "${DEFINES}" STREQUAL "")
-					set(DEFINES "${DEFINES}\\\\;${DEFINE}")
-				else()
-					set(DEFINES "${DEFINE}")
-				endif()
-			endforeach()
-			list(APPEND CLI "${DEFINES}")
+			# Add extra escapes or CMake will expand in the final CLI
+			string(REPLACE ";" "\\\\\\;" DEFINES "${ARG_DEFINES}")
+			# Also need to quote escape for Unix shells
+			list(APPEND CLI "--define" "\"${DEFINES}\"")
 		endif()
 
 		# --raw
@@ -539,15 +533,27 @@ if(TARGET bgfx::shaderc)
 		set(${ARG_OUT} ${CLI} PARENT_SCOPE)
 	endfunction()
 
-	function(_bgfx_get_profile_ext PROFILE PROFILE_EXT)
+	# extensions consistent with those listed under bgfx/runtime/shaders
+	function(_bgfx_get_profile_path_ext PROFILE PROFILE_PATH_EXT)
+		string(REPLACE 100_es essl PROFILE ${PROFILE})
 		string(REPLACE 300_es essl PROFILE ${PROFILE})
 		string(REPLACE 120 glsl PROFILE ${PROFILE})
+		string(REPLACE 430 glsl PROFILE ${PROFILE})
+		string(REPLACE s_5_0 dxbc PROFILE ${PROFILE})
+		string(REPLACE s_6_0 dxil PROFILE ${PROFILE})
+		set(${PROFILE_PATH_EXT} ${PROFILE} PARENT_SCOPE)
+	endfunction()
+
+	# extensions consistent with embedded_shader.h
+	function(_bgfx_get_profile_ext PROFILE PROFILE_EXT)
+		string(REPLACE 100_es essl PROFILE ${PROFILE})
+		string(REPLACE 300_es essl PROFILE ${PROFILE})
+		string(REPLACE 120 glsl PROFILE ${PROFILE})
+		string(REPLACE 430 glsl PROFILE ${PROFILE})
 		string(REPLACE spirv spv PROFILE ${PROFILE})
 		string(REPLACE metal mtl PROFILE ${PROFILE})
-		string(REPLACE s_3_0 dx9 PROFILE ${PROFILE})
-		string(REPLACE s_4_0 dx10 PROFILE ${PROFILE})
-		string(REPLACE s_5_0 dx11 PROFILE ${PROFILE})
-
+		string(REPLACE s_5_0 dxbc PROFILE ${PROFILE})
+		string(REPLACE s_6_0 dxil PROFILE ${PROFILE})
 		set(${PROFILE_EXT} ${PROFILE} PARENT_SCOPE)
 	endfunction()
 
@@ -558,17 +564,31 @@ if(TARGET bgfx::shaderc)
 	# 	OUTPUT_DIR directory
 	# 	OUT_FILES_VAR variable name
 	# 	INCLUDE_DIRS directories
+	# 	DEFINES defines
 	# 	[AS_HEADERS]
 	# )
 	#
 	function(bgfx_compile_shaders)
 		set(options AS_HEADERS)
 		set(oneValueArgs TYPE VARYING_DEF OUTPUT_DIR OUT_FILES_VAR)
-		set(multiValueArgs SHADERS INCLUDE_DIRS)
+		set(multiValueArgs SHADERS INCLUDE_DIRS DEFINES)
 		cmake_parse_arguments(ARGS "${options}" "${oneValueArgs}" "${multiValueArgs}" "${ARGN}")
 
-		set(PROFILES 120 300_es spirv)
-		if(UNIX AND NOT APPLE)
+		set(PROFILES spirv)
+		if(ARGS_TYPE STREQUAL "COMPUTE")
+			list(APPEND PROFILES 430 300_es)
+		else()
+			list(APPEND PROFILES 120 100_es)
+		endif()
+		if(BGFX_CONFIG_RENDERER_WEBGPU)
+			list(APPEND PROFILES wgsl)
+		endif()
+		if(IOS)
+			set(PLATFORM IOS)
+			list(APPEND PROFILES metal)
+		elseif(ANDROID)
+			set(PLATFORM ANDROID)
+		elseif(UNIX AND NOT APPLE)
 			set(PLATFORM LINUX)
 		elseif(EMSCRIPTEN)
 			set(PLATFORM ASM_JS)
@@ -582,8 +602,11 @@ if(TARGET bgfx::shaderc)
 			OR CYGWIN
 		)
 			set(PLATFORM WINDOWS)
-			list(APPEND PROFILES s_4_0)
 			list(APPEND PROFILES s_5_0)
+			list(APPEND PROFILES s_6_0)
+		elseif(ORBIS) # ORBIS should be defined by a PS4 CMake toolchain
+			set(PLATFORM ORBIS)
+			list(APPEND PROFILES pssl)
 		else()
 			# pssl for Agc and Gnm renderers
 			# nvn for Nvn renderer
@@ -602,15 +625,13 @@ if(TARGET bgfx::shaderc)
 			set(COMMANDS "")
 			set(MKDIR_COMMANDS "")
 			foreach(PROFILE ${PROFILES})
+				_bgfx_get_profile_path_ext(${PROFILE} PROFILE_PATH_EXT)
 				_bgfx_get_profile_ext(${PROFILE} PROFILE_EXT)
 				if(ARGS_AS_HEADERS)
 					set(HEADER_PREFIX .h)
 				endif()
-				set(OUTPUT ${ARGS_OUTPUT_DIR}/${PROFILE_EXT}/${SHADER_FILE_BASENAME}.bin${HEADER_PREFIX})
+				set(OUTPUT ${ARGS_OUTPUT_DIR}/${PROFILE_PATH_EXT}/${SHADER_FILE_BASENAME}.bin${HEADER_PREFIX})
 				set(PLATFORM_I ${PLATFORM})
-				if(PROFILE STREQUAL "spirv")
-					set(PLATFORM_I LINUX)
-				endif()
 				set(BIN2C_PART "")
 				if(ARGS_AS_HEADERS)
 					set(BIN2C_PART BIN2C ${SHADER_FILE_NAME_WE}_${PROFILE_EXT})
@@ -618,13 +639,14 @@ if(TARGET bgfx::shaderc)
 				_bgfx_shaderc_parse(
 					CLI #
 					${BIN2C_PART} #
-					${ARGS_TYPE} ${PLATFORM_I} WERROR "$<$<CONFIG:debug>:DEBUG>$<$<CONFIG:relwithdebinfo>:DEBUG>"
+					${ARGS_TYPE} ${PLATFORM_I} "$<$<CONFIG:Debug,RelWithDebInfo>:DEBUG>"
 					FILE ${SHADER_FILE_ABSOLUTE}
 					OUTPUT ${OUTPUT}
 					PROFILE ${PROFILE}
-					O "$<$<CONFIG:debug>:0>$<$<CONFIG:release>:3>$<$<CONFIG:relwithdebinfo>:3>$<$<CONFIG:minsizerel>:3>"
+					O "$<IF:$<CONFIG:Debug>,0,3>"
 					VARYINGDEF ${ARGS_VARYING_DEF}
 					INCLUDES ${BGFX_SHADER_INCLUDE_PATH} ${ARGS_INCLUDE_DIRS}
+					DEFINES ${ARGS_DEFINES}
 				)
 				list(APPEND OUTPUTS ${OUTPUT})
 				list(APPEND ALL_OUTPUTS ${OUTPUT})
@@ -635,7 +657,7 @@ if(TARGET bgfx::shaderc)
 					${CMAKE_COMMAND}
 					-E
 					make_directory
-					${ARGS_OUTPUT_DIR}/${PROFILE_EXT}
+					${ARGS_OUTPUT_DIR}/${PROFILE_PATH_EXT}
 				)
 				list(APPEND COMMANDS COMMAND bgfx::shaderc ${CLI})
 			endforeach()

cmake/bimg/3rdparty/miniz.cmake

@@ -19,5 +19,5 @@ if(NOT MINIZ_LIBRARIES)
 		 MINIZ_SOURCES #
 		 ${BIMG_DIR}/3rdparty/tinyexr/deps/miniz/miniz.* #
 	)
-	set(MINIZ_INCLUDE_DIR ${BIMG_DIR}/3rdparty/tinyexr/deps/miniz)
+	set(MINIZ_INCLUDE_DIR ${BIMG_DIR}/3rdparty/tinyexr/deps)
 endif()

cmake/bx/bx.cmake

@@ -60,6 +60,11 @@ endforeach()
 
 add_library(bx STATIC ${BX_SOURCES})
 
+if(MSVC)
+	target_compile_options(bx PRIVATE /EHs-c-)
+	target_compile_definitions(bx PRIVATE _HAS_EXCEPTIONS=0)
+endif()
+
 # Put in a "bgfx" folder in Visual Studio
 set_target_properties(bx PROPERTIES FOLDER "bgfx")