Update dependabot.yml (#12)

.github/CODEOWNERS

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

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/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/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}})
@@ -163,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
 				)

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,6 +30,13 @@ target_link_libraries(
 			spirv-opt
 			spirv-cross
 			webgpu
+			tint
+)
+
+target_include_directories(
+	shaderc
+	PRIVATE ${BGFX_DIR}/3rdparty/dawn
+			${BGFX_DIR}/3rdparty/dawn/src
 )
 if(BGFX_AMALGAMATED)
 	target_link_libraries(shaderc PRIVATE bgfx-shader)

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")