Implement Vulkan renderer

.github/workflows/build.yml

@@ -191,13 +191,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        runner: [macos-13, macos-14]
+        runner: [macos-15-intel, macos-15]
         build_type: [Debug, Release]
         portable: [Non-Portable]
         include:
-          - runner: macos-13
+          - runner: macos-15-intel
             arch: x86_64
-          - runner: macos-14
+          - runner: macos-15
             arch: arm64
 
     steps:

.gitignore

@@ -194,3 +194,4 @@ compile_commands.json
 #############
 [Bb]uild*/
 cmake-build-*
+codemp/rd-vulkan/shaders/tools/compile_threaded.exe

CMakeLists.txt

@@ -37,6 +37,7 @@ option(BuildPortableVersion "Build portable version (does not read or write file
 
 option(BuildMPEngine "Whether to create projects for the MP client (openjk.exe)" ON)
 option(BuildMPRdVanilla "Whether to create projects for the MP default renderer (rd-vanilla_x86.dll)" ON)
+option(BuildMPRdVulkan "Whether to create projects for the MP vulkan renderer (rd-vulkan_x86.dll)" ON)
 option(BuildMPDed "Whether to create projects for the MP dedicated server (openjkded.exe)" ON)
 option(BuildMPGame "Whether to create projects for the MP server-side gamecode (jampgamex86.dll)" ON)
 option(BuildMPCGame "Whether to create projects for the MP clientside gamecode (cgamex86.dll)" ON)
@@ -168,6 +169,7 @@ set(SPGame "jagame${Architecture}")
 set(SPRDVanillaRenderer "rdsp-vanilla_${Architecture}")
 set(MPEngine "openjk.${Architecture}")
 set(MPVanillaRenderer "rd-vanilla_${Architecture}")
+set(MPVulkanRenderer "rd-vulkan_${Architecture}")
 set(MPDed "openjkded.${Architecture}")
 set(MPGame "jampgame${Architecture}")
 set(MPCGame "cgame${Architecture}")

codemp/CMakeLists.txt

@@ -43,6 +43,11 @@ if(BuildMPRdVanilla)
 	add_subdirectory("${MPDir}/rd-vanilla")
 endif(BuildMPRdVanilla)
 
+#	 Add Vulkan JKA Renderer Project
+if(BuildMPRdVulkan)
+	add_subdirectory("${MPDir}/rd-vulkan")
+endif(BuildMPRdVulkan)
+
 #	Add rend2 JKA Renderer Project
 if(BuildMPRend2)
 	add_subdirectory("${MPDir}/rd-rend2")

codemp/client/cl_main.cpp

@@ -2529,6 +2529,12 @@ void CL_InitRef( void ) {
 	ri.PD_Store = PD_Store;
 	ri.PD_Load = PD_Load;
 
+	// Vulkan 
+	ri.VK_IsMinimized = WIN_VK_IsMinimized;
+	ri.VK_GetInstanceProcAddress = WIN_VK_GetInstanceProcAddress;
+	ri.VK_createSurfaceImpl = WIN_VK_createSurfaceImpl;
+	ri.VK_destroyWindow = WIN_VK_destroyWindow;
+
 	ret = GetRefAPI( REF_API_VERSION, &ri );
 
 //	Com_Printf( "-------------------------------\n");

codemp/rd-common/tr_public.h

@@ -346,6 +346,12 @@ typedef struct refimport_s {
 	// Persistent data store
 	bool			(*PD_Store)							( const char *name, const void *data, size_t size );
 	const void *	(*PD_Load)							( const char *name, size_t *size );
+
+	// Vulkan
+	qboolean		(*VK_IsMinimized)					( void );
+	void			*(*VK_GetInstanceProcAddress)		( void );
+	qboolean		(*VK_createSurfaceImpl)				( void *instance, void **surface );
+	void			(*VK_destroyWindow)					( void);
 } refimport_t;
 
 // this is the only function actually exported at the linker level

codemp/rd-vulkan/CMakeLists.txt

@@ -0,0 +1,203 @@
+#============================================================================
+# Copyright (C) 2013 - 2018, OpenJK contributors
+#
+# This file is part of the OpenJK source code.
+#
+# OpenJK is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+#============================================================================
+
+# Make sure the user is not executing this script directly
+if(NOT InOpenJK)
+	message(FATAL_ERROR "Use the top-level cmake script!")
+endif(NOT InOpenJK)
+
+# Check for dependencies first
+
+set(MPVulkanRendererIncludeDirectories ${MPDir})
+set(MPVulkanRendererIncludeDirectories
+	${MPVulkanRendererIncludeDirectories}
+	${SharedDir}
+	${MPDir}
+	"${MPDir}/rd-vulkan"
+	"${GSLIncludeDirectory}"
+	)
+
+set(MPVulkanRendererFiles
+	"${MPDir}/rd-vulkan/G2_API.cpp"
+	"${MPDir}/rd-vulkan/G2_bolts.cpp"
+	"${MPDir}/rd-vulkan/G2_bones.cpp"
+	"${MPDir}/rd-vulkan/G2_gore_r2.cpp"
+	"${MPDir}/rd-vulkan/G2_gore_r2.h"
+	"${MPDir}/rd-vulkan/G2_misc.cpp"
+	"${MPDir}/rd-vulkan/G2_surfaces.cpp"
+	"${MPDir}/rd-vulkan/tr_backend.cpp"
+	"${MPDir}/rd-vulkan/tr_bsp.cpp"
+	"${MPDir}/rd-vulkan/tr_cache.h"
+	"${MPDir}/rd-vulkan/tr_cache.cpp"
+	"${MPDir}/rd-vulkan/tr_cmds.cpp"
+	"${MPDir}/rd-vulkan/tr_curve.cpp"
+	"${MPDir}/rd-vulkan/tr_decals.cpp"
+	"${MPDir}/rd-vulkan/tr_ghoul2.cpp"
+	"${MPDir}/rd-vulkan/tr_image.cpp"
+	"${MPDir}/rd-vulkan/tr_init.cpp"
+	"${MPDir}/rd-vulkan/tr_light.cpp"
+	"${MPDir}/rd-vulkan/tr_local.h"
+	"${MPDir}/rd-vulkan/tr_main.cpp"
+	"${MPDir}/rd-vulkan/tr_marks.cpp"
+	"${MPDir}/rd-vulkan/tr_mesh.cpp"
+	"${MPDir}/rd-vulkan/tr_model.cpp"
+	"${MPDir}/rd-vulkan/tr_quicksprite.cpp"
+	"${MPDir}/rd-vulkan/tr_quicksprite.h"
+	"${MPDir}/rd-vulkan/tr_scene.cpp"
+	"${MPDir}/rd-vulkan/tr_shade.cpp"
+	"${MPDir}/rd-vulkan/tr_shader.cpp"
+	"${MPDir}/rd-vulkan/tr_shade_calc.cpp"
+	"${MPDir}/rd-vulkan/tr_shadows.cpp"
+	"${MPDir}/rd-vulkan/tr_skin.cpp"
+	"${MPDir}/rd-vulkan/tr_sky.cpp"
+	"${MPDir}/rd-vulkan/tr_subs.cpp"
+	"${MPDir}/rd-vulkan/tr_surface.cpp"
+	"${MPDir}/rd-vulkan/tr_surfacesprites.cpp"
+	"${MPDir}/rd-vulkan/tr_world.cpp"
+	"${MPDir}/rd-vulkan/tr_WorldEffects.cpp"
+	"${MPDir}/rd-vulkan/tr_WorldEffects.h"
+	"${MPDir}/rd-vulkan/vk_attachments.cpp"
+	"${MPDir}/rd-vulkan/vk_bloom.cpp"
+	"${MPDir}/rd-vulkan/vk_cmd.cpp"
+	"${MPDir}/rd-vulkan/vk_debug.cpp"
+	"${MPDir}/rd-vulkan/vk_dynamic_glow.cpp"
+	"${MPDir}/rd-vulkan/vk_flares.cpp"
+	"${MPDir}/rd-vulkan/vk_frame.cpp"
+	"${MPDir}/rd-vulkan/vk_image.cpp"
+	"${MPDir}/rd-vulkan/vk_image_process.cpp"
+	"${MPDir}/rd-vulkan/vk_info.cpp"
+	"${MPDir}/rd-vulkan/vk_init.cpp"
+	"${MPDir}/rd-vulkan/vk_instance.cpp"
+	"${MPDir}/rd-vulkan/vk_local.h"
+	"${MPDir}/rd-vulkan/vk_pipelines.cpp"
+	"${MPDir}/rd-vulkan/vk_shaders.cpp"
+	"${MPDir}/rd-vulkan/vk_shade_geometry.cpp"
+	"${MPDir}/rd-vulkan/vk_swapchain.cpp"
+	"${MPDir}/rd-vulkan/vk_vbo.cpp"
+	"${MPDir}/rd-vulkan/vk_vbo_surfacesprites.cpp"
+	)
+source_group("renderer" FILES ${MPVulkanRendererFiles})
+
+set(MPVulkanRendererGhoul2Files
+	"${MPDir}/ghoul2/g2_local.h"
+	"${MPDir}/ghoul2/ghoul2_shared.h"
+	"${MPDir}/ghoul2/G2_gore.cpp"
+	"${MPDir}/ghoul2/G2_gore.h")
+source_group("ghoul2" FILES ${MPVulkanRendererGhoul2Files})
+set(MPVulkanRendererFiles ${MPVulkanRendererFiles} ${MPVulkanRendererGhoul2Files})
+
+set(MPVulkanRendererRdCommonFiles
+	"${MPDir}/rd-common/mdx_format.h"
+	"${MPDir}/rd-common/tr_common.h"
+	"${MPDir}/rd-common/tr_font.cpp"
+	"${MPDir}/rd-common/tr_font.h"
+	"${MPDir}/rd-common/tr_image_load.cpp"
+	"${MPDir}/rd-common/tr_image_jpg.cpp"
+	"${MPDir}/rd-common/tr_image_tga.cpp"
+	"${MPDir}/rd-common/tr_image_png.cpp"
+	"${MPDir}/rd-common/tr_noise.cpp"
+	"${MPDir}/rd-common/tr_public.h"
+	"${MPDir}/rd-common/tr_types.h")
+source_group("rd-common" FILES ${MPVulkanRendererRdCommonFiles})
+set(MPVulkanRendererFiles ${MPVulkanRendererFiles} ${MPVulkanRendererRdCommonFiles})
+
+set(MPVulkanRendererVulkanAssets
+	"${MPDir}/rd-vulkan/vulkan/vk_platform.h"
+	"${MPDir}/rd-vulkan/vulkan/vulkan.h"
+	"${MPDir}/rd-vulkan/vulkan/vulkan_core.h"
+	"${MPDir}/rd-vulkan/vulkan/vulkan_win32.h"
+	"${MPDir}/rd-vulkan/vulkan/vulkan_xlib.h"
+	"${MPDir}/rd-vulkan/vulkan/vulkan_xlib_xrandr.h")
+source_group("renderer\\vulkan" FILES ${MPVulkanRendererVulkanAssets})
+set(MPVulkanRendererFiles ${MPVulkanRendererFiles} ${MPVulkanRendererVulkanAssets})
+
+set(MPVulkanRendererUtils
+	"${MPDir}/rd-vulkan/utils/stb_dxt.h")
+source_group("renderer\\utils" FILES ${MPVulkanRendererUtils})
+set(MPVulkanRendererFiles ${MPVulkanRendererFiles} ${MPVulkanRendererUtils})
+
+set(MPVulkanRendererCommonFiles
+	"${MPDir}/qcommon/matcomp.cpp"
+	"${MPDir}/qcommon/q_shared.cpp"
+
+	${SharedCommonFiles})
+source_group("common" FILES ${MPVulkanRendererCommonFiles})
+set(MPVulkanRendererFiles ${MPVulkanRendererFiles} ${MPVulkanRendererCommonFiles})
+
+set(MPVulkanRendererCommonSafeFiles
+	${SharedCommonSafeFiles}
+	)
+source_group("common/safe" FILES ${MPVulkanRendererCommonSafeFiles})
+set(MPVulkanRendererFiles ${MPVulkanRendererFiles} ${MPVulkanRendererCommonSafeFiles})
+
+# Transparently use either bundled or system libjpeg.
+list(APPEND MPVulkanRendererIncludeDirectories ${JPEG_INCLUDE_DIR})
+list(APPEND MPVulkanRendererLibraries          ${JPEG_LIBRARIES})
+
+# Transparently use either bundled or system libpng.  Order is important --
+# libpng used zlib, so it must come before it on the linker command line.
+list(APPEND MPVulkanRendererIncludeDirectories ${PNG_INCLUDE_DIRS})
+list(APPEND MPVulkanRendererLibraries          ${PNG_LIBRARIES})
+
+# Transparently use either bundled or system zlib.
+list(APPEND MPVulkanRendererIncludeDirectories ${ZLIB_INCLUDE_DIR})
+list(APPEND MPVulkanRendererLibraries          ${ZLIB_LIBRARIES})
+
+# Transparently use our bundled minizip.
+list(APPEND MPVulkanRendererIncludeDirectories ${MINIZIP_INCLUDE_DIRS})
+list(APPEND MPVulkanRendererLibraries          ${MINIZIP_LIBRARIES})
+
+#find_package(OpenGL REQUIRED)
+#set(MPVulkanRendererIncludeDirectories ${MPVulkanRendererIncludeDirectories} ${OPENGL_INCLUDE_DIR})
+#set(MPVulkanRendererLibraries ${MPVulkanRendererLibraries} ${OPENGL_LIBRARIES})
+
+set(MPVulkanRendererIncludeDirectories ${MPVulkanRendererIncludeDirectories} ${OpenJKLibDir})
+add_library(${MPVulkanRenderer} SHARED ${MPVulkanRendererFiles})
+
+if(NOT MSVC)
+	# remove "lib" prefix for .so/.dylib files
+	set_target_properties(${MPVulkanRenderer} PROPERTIES PREFIX "")
+endif()
+
+if(WIN32)
+	install(TARGETS ${MPVulkanRenderer}
+		RUNTIME
+		DESTINATION ${JKAInstallDir}
+		COMPONENT ${JKAMPClientComponent})
+else(WIN32)
+	if(MakeApplicationBundles AND BuildMPEngine)
+		install(TARGETS ${MPVulkanRenderer}
+			LIBRARY
+			DESTINATION "${JKAInstallDir}/${MPEngine}.app/Contents/MacOS/"
+			COMPONENT ${JKAMPClientComponent})
+	else()
+		install(TARGETS ${MPVulkanRenderer}
+			LIBRARY
+			DESTINATION ${JKAInstallDir}
+			COMPONENT ${JKAMPClientComponent})
+	endif()
+endif()
+
+set_target_properties(${MPVulkanRenderer} PROPERTIES COMPILE_DEFINITIONS "${SharedDefines}")
+
+# Hide symbols not explicitly marked public.
+set_property(TARGET ${MPVulkanRenderer} APPEND PROPERTY COMPILE_OPTIONS ${OPENJK_VISIBILITY_FLAGS})
+
+set_target_properties(${MPVulkanRenderer} PROPERTIES INCLUDE_DIRECTORIES "${MPVulkanRendererIncludeDirectories}")
+set_target_properties(${MPVulkanRenderer} PROPERTIES PROJECT_LABEL "MP Vulkan Renderer")
+target_link_libraries(${MPVulkanRenderer} ${MPVulkanRendererLibraries})