Daemon-vulkan infrastructure 2

.gitignore

@@ -57,5 +57,8 @@ external_deps/*
 .vs
 .vscode
 
+#ignore python cache
+*.pyc
+
 #ignore removed recastnavigation submodule
 libs/recastnavigation

CMakeLists.txt

@@ -75,7 +75,7 @@ if (Daemon_OUT)
     set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${Daemon_OUT})
 endif()
 
-include(DaemonBuildInfo)
+include(DaemonSourceGenerator)
 include(DaemonPlatform)
 
 ################################################################################
@@ -530,6 +530,7 @@ endif()
 if (USE_VULKAN)
     add_definitions("-DDAEMON_RENDERER_VULKAN=1")
     add_definitions("-DVK_NO_PROTOTYPES=1")
+    include(DaemonVulkan)
 else()
     add_definitions("-DDAEMON_RENDERER_OPENGL=1")
 
@@ -927,39 +928,12 @@ if (BUILD_CLIENT)
         Tests ${CLIENTTESTLIST}
     )
 
-    # generate glsl include files
-    set(GLSL_SOURCE_DIR ${ENGINE_DIR}/renderer/glsl_source)
-    set(EMBED_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/embed_data)
-    file(MAKE_DIRECTORY ${EMBED_INCLUDE_DIR})
-
-    set(SHADERS_CPP_TEXT "// This file is auto-generated by CMakeLists.txt.\n")
-    string(APPEND SHADERS_CPP_TEXT "#include \"common/Common.h\"\n\n")
-    set(SHADERMAP_TEXT "")
-
-    foreach(res ${GLSLSOURCELIST})
-        get_filename_component(filename_no_ext ${res} NAME_WE)
-        set(outpath ${EMBED_INCLUDE_DIR}/${filename_no_ext}.glsl.h)
-
-        add_custom_command(
-            OUTPUT ${outpath}
-            COMMAND ${CMAKE_COMMAND} "-DINPUT_FILE=${res}" "-DOUTPUT_FILE=${outpath}"
-                "-DVARIABLE_NAME=${filename_no_ext}_glsl" -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/EmbedText.cmake
-            MAIN_DEPENDENCY ${res}
-        )
-
-        set_property(TARGET client-objects APPEND PROPERTY SOURCES ${outpath})
-
-        string(APPEND SHADERS_CPP_TEXT "#include \"../embed_data/${filename_no_ext}.glsl.h\"\n")
-        string(APPEND SHADERMAP_TEXT "\t{ \"${filename_no_ext}.glsl\", ")
-        string(APPEND SHADERMAP_TEXT "std::string(reinterpret_cast<const char *>( ${filename_no_ext}_glsl ), ")
-        string(APPEND SHADERMAP_TEXT "sizeof( ${filename_no_ext}_glsl )) },\n")
-    endforeach()
-
-    string(APPEND SHADERS_CPP_TEXT "\nextern const std::unordered_map<std::string, std::string> shadermap\n{\n")
-    string(APPEND SHADERS_CPP_TEXT "${SHADERMAP_TEXT}")
-    string(APPEND SHADERS_CPP_TEXT "};\n")
-
-    daemon_write_generated("shaders.cpp" "${SHADERS_CPP_TEXT}")
+    if (USE_VULKAN)
+        GenerateVulkanShaders( client-objects )
+    else()
+        # Generate GLSL include files.
+        daemon_embed_files("EngineShaders" "${GLSL_EMBED_DIR}" "${GLSL_EMBED_LIST}" "TEXT" "client-objects")
+    endif()
 endif()
 
 if (BUILD_SERVER)

cmake/DaemonFileEmbedder.cmake

@@ -0,0 +1,38 @@
+# Converts a text file into a C-language char array definition.
+# For use in CMake script mode (cmake -P).
+# Required definitions on command line:
+# INPUT_FILE, OUTPUT_FILE, VARIABLE_NAME, FILE_FORMAT, EMBED_MODE
+
+# Inspired by:
+# https://stackoverflow.com/questions/11813271/embed-resources-eg-shader-code-images-into-executable-library-with-cmake/27206982#27206982
+
+file(READ ${INPUT_FILE} contents HEX)
+
+# Translate the file content.
+if ("${FILE_FORMAT}" STREQUAL "TEXT")
+	# Strip \r for consistency.
+	string(REGEX REPLACE "(0d)?(..)" "0x\\2," contents "${contents}") 
+elseif("${FILE_FORMAT}" STREQUAL "BINARY")
+	string(REGEX REPLACE "(..)" "0x\\1," contents "${contents}")
+else()
+	message(FATAL_ERROR "Unknown file format: ${FILE_FORMAT}")
+endif()
+
+# Add null terminator.
+set(contents "${contents}0x00,") 
+
+# Split long lines.
+string(REGEX REPLACE
+	"(0x..,0x..,0x..,0x..,0x..,0x..,0x..,0x..,0x..,0x..,0x..,0x..,0x..,0x..,0x..,)" "\\1\n"
+	contents "${contents}"
+)
+
+# A bit more of beautification.
+string(REGEX REPLACE ",$" ",\n" contents "${contents}")
+
+file(${EMBED_MODE} ${OUTPUT_FILE}
+	"constexpr unsigned char ${VARIABLE_NAME}[] =\n"
+	"{\n"
+	"${contents}"
+	"};\n"
+)

cmake/DaemonGame.cmake

@@ -39,7 +39,7 @@ option(BUILD_GAME_NATIVE_DLL "Build the shared library files, mostly useful for
 option(BUILD_GAME_NATIVE_EXE "Build native executable, which might be used for better performances by server owners" OFF)
 
 include(ExternalProject)
-include(DaemonBuildInfo)
+include(DaemonSourceGenerator)
 include(DaemonPlatform)
 
 # Do not report unused native compiler if native vms are not built.

cmake/DaemonSourceGenerator.cmake

@@ -0,0 +1,183 @@
+# Daemon BSD Source Code
+# Copyright (c) 2025, Daemon Developers
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#  * Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#  * Neither the name of the <organization> nor the
+#    names of its contributors may be used to endorse or promote products
+#    derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+set(DAEMON_SOURCE_GENERATOR "${CMAKE_CURRENT_LIST_FILE}")
+get_filename_component(current_list_dir "${CMAKE_CURRENT_LIST_FILE}" DIRECTORY)
+set(DAEMON_FILE_EMBEDDER "${current_list_dir}/DaemonFileEmbedder.cmake")
+
+set(DAEMON_GENERATED_SUBDIR "GeneratedSource")
+set(DAEMON_GENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}/${DAEMON_GENERATED_SUBDIR}")
+
+set(DAEMON_BUILDINFO_SUBDIR "DaemonBuildInfo")
+set(DAEMON_EMBEDDED_SUBDIR "DaemonEmbeddedFiles")
+
+set(DAEMON_BUILDINFO_DIR "${DAEMON_GENERATED_DIR}/${DAEMON_BUILDINFO_SUBDIR}")
+set(DAEMON_EMBEDDED_DIR "${DAEMON_GENERATED_DIR}/${DAEMON_EMBEDDED_SUBDIR}")
+
+file(MAKE_DIRECTORY "${DAEMON_GENERATED_DIR}")
+include_directories("${DAEMON_GENERATED_DIR}")
+
+file(MAKE_DIRECTORY "${DAEMON_BUILDINFO_DIR}")
+file(MAKE_DIRECTORY "${DAEMON_EMBEDDED_DIR}")
+
+set(DAEMON_GENERATED_HEADER "// Automatically generated, do not modify!\n")
+set(DAEMON_GENERATED_CPP_EXT ".cpp")
+set(DAEMON_GENERATED_H_EXT ".h")
+
+set(BUILDINFOLIST)
+
+foreach(kind CPP H)
+	set(DAEMON_BUILDINFO_${kind}_TEXT "${DAEMON_GENERATED_HEADER}")
+endforeach()
+
+macro(daemon_add_buildinfo type name value)
+	string(APPEND DAEMON_BUILDINFO_CPP_TEXT "const ${type} ${name}=${value};\n")
+	string(APPEND DAEMON_BUILDINFO_H_TEXT "extern const ${type} ${name};\n")
+endmacro()
+
+macro(daemon_write_buildinfo name)
+	foreach(kind CPP H)
+		set(buildinfo_file_path "${DAEMON_BUILDINFO_DIR}/${name}${DAEMON_GENERATED_${kind}_EXT}")
+
+		file(GENERATE OUTPUT "${buildinfo_file_path}" CONTENT "${DAEMON_BUILDINFO_${kind}_TEXT}")
+		list(APPEND BUILDINFOLIST "${buildinfo_file_path}")
+	endforeach()
+endmacro()
+
+function(GenerateEmbedFilesConstexpr srcPaths dstPath format target)
+	set(first TRUE)
+	foreach(srcPath IN LISTS srcPaths)
+		get_filename_component(filename "${srcPath}" NAME_WE)
+
+		if(first)
+			set(mode WRITE)
+			set(first FALSE)
+		else()
+			set(mode APPEND)
+		endif()
+
+		set(cmd ${CMAKE_COMMAND}
+			"-DINPUT_FILE=${srcPath}"
+			"-DOUTPUT_FILE=${dstPath}"
+			"-DFILE_FORMAT=${format}"
+			"-DVARIABLE_NAME=${filename}"
+			"-DEMBED_MODE=${mode}"
+			-P "${CMAKE_CURRENT_SOURCE_DIR}/cmake/EmbedText.cmake" )
+		list(APPEND cmdList ${cmd})
+	endforeach()
+
+	add_custom_command(
+		OUTPUT ${dstPath}
+		COMMAND ${cmdList}
+		DEPENDS ${srcPath} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DaemonEmbed.cmake
+	)
+
+	target_sources(${target} PRIVATE ${dstPath})
+endfunction()
+
+macro(daemon_embed_files basename dir list format targetname)
+	set(embed_subdir "${DAEMON_EMBEDDED_SUBDIR}/${basename}")
+	set(embed_dir "${DAEMON_GENERATED_DIR}/${embed_subdir}")
+
+	file(MAKE_DIRECTORY "${embed_dir}")
+
+	foreach(kind CPP H)
+		set(embed_${kind}_basename "${basename}${DAEMON_GENERATED_${kind}_EXT}")
+		set(embed_${kind}_src_file "${DAEMON_EMBEDDED_DIR}/${embed_${kind}_basename}")
+		set(embed_${kind}_file "${DAEMON_EMBEDDED_SUBDIR}/${embed_${kind}_basename}")
+		set(embed_${kind}_text "${DAEMON_GENERATED_HEADER}")
+		set_property(SOURCE "${embed_${kind}_src_file}" APPEND PROPERTY OBJECT_DEPENDS "${DAEMON_SOURCE_GENERATOR}")
+		set_property(TARGET "${targetname}" APPEND PROPERTY SOURCES "${embed_${kind}_src_file}")
+	endforeach()
+
+	string(APPEND embed_CPP_text
+		"#include \"${embed_H_file}\"\n"
+		"\n"
+		"namespace ${basename} {\n"
+	)
+
+	string(APPEND embed_H_text
+		"#include \"common/Common.h\"\n"
+		"\n"
+		"namespace ${basename} {\n"
+	)
+
+	set(embed_map_text "")
+
+	foreach(filename ${list})
+		string(REGEX REPLACE "[^A-Za-z0-9]" "_" filename_symbol "${filename}")
+
+		set(inpath "${dir}/${filename}")
+		set(outpath "${embed_dir}/${filename_symbol}${DAEMON_GENERATED_H_EXT}")
+
+		add_custom_command(
+			OUTPUT "${outpath}"
+			COMMAND ${CMAKE_COMMAND}
+				"-DINPUT_FILE=${inpath}"
+				"-DOUTPUT_FILE=${outpath}"
+				"-DFILE_FORMAT=${format}"
+				"-DVARIABLE_NAME=${filename_symbol}"
+				"-DEMBED_MODE=WRITE"
+				-P "${DAEMON_TEXT_EMBEDDER}"
+			MAIN_DEPENDENCY ${inpath}
+			DEPENDS
+				"${DAEMON_FILE_EMBEDDER}"
+				"${DAEMON_SOURCE_GENERATOR}"
+		)
+
+		set_property(TARGET "${targetname}" APPEND PROPERTY SOURCES "${outpath}")
+
+		string(APPEND embed_CPP_text
+			"#include \"${basename}/${filename_symbol}.h\"\n"
+		)
+
+		string(APPEND embed_H_text
+			"extern const unsigned char ${filename_symbol}[];\n"
+		)
+
+		string(APPEND embed_map_text
+			"\t{ \"${filename}\", { ${filename_symbol}, sizeof( ${filename_symbol}) - 1 } },\n"
+		)
+	endforeach()
+
+	string(APPEND embed_CPP_text
+		"\n"
+		"const embeddedFileMap_t FileMap\n{\n"
+		"${embed_map_text}"
+		"};\n"
+		"}"
+	)
+
+	string(APPEND embed_H_text
+		"extern const embeddedFileMap_t FileMap;\n"
+		"};\n"
+	)
+
+	foreach(kind CPP H)
+		set(embed_file "${DAEMON_GENERATED_DIR}/${embed_${kind}_file}")
+		file(GENERATE OUTPUT "${embed_file}" CONTENT "${embed_${kind}_text}")
+	endforeach()
+endmacro()