update after merge, make it build and run with rasterizer

have not checked ray tracing, or playing longer than a couple of minutes
w23 · Aug 8, 2022 · 85c55a7 · 85c55a7
1 parent 6b9ddf2
commit 85c55a7
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 10 deletions.
diff --git a/engine/client/cl_gameui.c b/engine/client/cl_gameui.c
@@ -1263,7 +1263,7 @@ static ui_extendedfuncs_t gExtendedfuncs =
 	pfnGetRenderers,
 	Sys_DoubleTime,
 	pfnParseFileSafe,
-	NET_AdrToString
+	NET_AdrToString,
 	R_GetRenderDevice
 };
 

diff --git a/engine/common/pm_local.h b/engine/common/pm_local.h
@@ -17,6 +17,9 @@ GNU General Public License for more details.
 #define PM_LOCAL_H
 
 #include "pm_defs.h"
+#include "xash3d_mathlib.h"
+
+#include <string.h> // memset
 
 typedef int (*pfnIgnore)( physent_t *pe );	// custom trace filter
 

diff --git a/ref_vk/vk_core.c b/ref_vk/vk_core.c
@@ -830,7 +830,7 @@ VkShaderModule loadShader(const char *filename) {
 		.sType = VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO,
 	};
 	VkShaderModule shader;
-	byte* buf = gEngine.COM_LoadFile( filename, &size, false);
+	byte* buf = gEngine.fsapi->LoadFile( filename, &size, false);
 	uint32_t *pcode;
 
 	if (!buf)

diff --git a/ref_vk/vk_framectl.c b/ref_vk/vk_framectl.c
@@ -672,7 +672,7 @@ qboolean VID_ScreenShot( const char *filename, int shot_type )
 	case VID_SCREENSHOT:
 		break;
 	case VID_SNAPSHOT:
-		gEngine.FS_AllowDirectPaths( true );
+		gEngine.fsapi->AllowDirectPaths( true );
 		break;
 	case VID_LEVELSHOT:
 		flags |= IMAGE_RESAMPLE;
@@ -703,7 +703,7 @@ qboolean VID_ScreenShot( const char *filename, int shot_type )
 
 	// write image
 	result = gEngine.FS_SaveImage( filename, r_shot );
-	gEngine.FS_AllowDirectPaths( false );			// always reset after store screenshot
+	gEngine.fsapi->AllowDirectPaths( false );			// always reset after store screenshot
 	gEngine.FS_FreeImage( r_shot );
 
 	gEngine.Con_Printf("Wrote screenshot %s\n", filename);

diff --git a/ref_vk/vk_light.c b/ref_vk/vk_light.c
@@ -98,7 +98,7 @@ static void loadRadData( const model_t *map, const char *fmt, ... ) {
 	vsnprintf( filename, sizeof filename, fmt, argptr );
 	va_end( argptr );
 
-	buffer = gEngine.COM_LoadFile( filename, &size, false);
+	buffer = gEngine.fsapi->LoadFile( filename, &size, false);
 
 	if (!buffer) {
 		gEngine.Con_Printf(S_ERROR "Couldn't load RAD data from file %s, the map will be completely black\n", filename);

diff --git a/ref_vk/vk_mapents.c b/ref_vk/vk_mapents.c
@@ -513,7 +513,7 @@ static void parsePatches( const model_t *const map ) {
 
 	Q_snprintf(filename, sizeof(filename), "luchiki/%s.patch", map->name);
 	gEngine.Con_Reportf("Loading patches from file \"%s\"\n", filename);
-	data = gEngine.COM_LoadFile( filename, 0, false );
+	data = gEngine.fsapi->LoadFile( filename, 0, false );
 	if (!data) {
 		gEngine.Con_Reportf("No patch file \"%s\"\n", filename);
 		return;

diff --git a/ref_vk/vk_materials.c b/ref_vk/vk_materials.c
@@ -47,7 +47,7 @@ static void loadMaterialsFromFile( const char *filename, int depth ) {
 	fs_offset_t size;
 	const char *const path_begin = filename;
 	const char *path_end = Q_strrchr(filename, '/');
-	byte *data = gEngine.COM_LoadFile( filename, 0, false );
+	byte *data = gEngine.fsapi->LoadFile( filename, 0, false );
 	char *pos = (char*)data;
 	xvk_material_t current_material = {
 		.base_color = -1,

diff --git a/ref_vk/vk_studio.c b/ref_vk/vk_studio.c
@@ -2314,7 +2314,7 @@ static model_t *R_StudioSetupPlayerModel( int index )
 
 			Q_snprintf( state->modelname, sizeof( state->modelname ), "models/player/%s/%s.mdl", info->model, info->model );
 
-			if( gEngine.FS_FileExists( state->modelname, false ))
+			if( gEngine.fsapi->FileExists( state->modelname, false ))
 				state->model = gEngine.Mod_ForName( state->modelname, false, true );
 			else state->model = NULL;
 

diff --git a/ref_vk/vk_textures.c b/ref_vk/vk_textures.c
@@ -960,7 +960,7 @@ static int CheckSkybox( const char *name )
 		{
 			// build side name
 			sidename = va( "%s%s.%s", name, g_skybox_info[j].suffix, skybox_ext[i] );
-			if( gEngine.FS_FileExists( sidename, false ))
+			if( gEngine.fsapi->FileExists( sidename, false ))
 				num_checked_sides++;
 
 		}
@@ -972,7 +972,7 @@ static int CheckSkybox( const char *name )
 		{
 			// build side name
 			sidename = va( "%s_%s.%s", name, g_skybox_info[j].suffix, skybox_ext[i] );
-			if( gEngine.FS_FileExists( sidename, false ))
+			if( gEngine.fsapi->FileExists( sidename, false ))
 				num_checked_sides++;
 		}
 

diff --git a/ref_vk/wscript b/ref_vk/wscript
@@ -89,6 +89,7 @@ def build(bld):
 	rtx_glsl_source = bld.path.ant_glob(['shaders/*.rgen', 'shaders/*.rchit', 'shaders/*.rmiss', 'shaders/*.rahit'])
 
 	includes = ['.',
+		'../filesystem',
 		'../engine',
 		'../engine/common',
 		'../engine/server',