Teleport, Linux improvements.

.github/workflows/Build.yml

@@ -15,13 +15,13 @@ jobs:
 
     steps:
     - name: Clone Platform
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
 
     - name: Update Submodules
       run: git submodule update --init --force
 
     - name: Install Vulkan SDK
-      uses: humbletim/install-vulkan-sdk@v1.1.1
+      uses: humbletim/install-vulkan-sdk@v1.2
       with:
         version: 1.3.296.0
         cache: true

Applications/Sfx/CMakeLists.txt

@@ -55,7 +55,4 @@ if(PLATFORM_WINDOWS OR PLATFORM_LINUX)
 			VS_DEBUGGER_COMMAND_ARGUMENTS "${SFX_TEST_FILE} -I\"${CMAKE_SOURCE_DIR}/..\" -I\"${SIMUL_PLATFORM_DIR}/CrossPlatform/Shaders\" -o\"${CMAKE_BINARY_DIR}/Platform/shaderbin/$PLATFORM_NAME\" ${TEST_CONFIGS} -l -v ${SFX_TEST_DEFINES}"
 			)
 	endif()
-	if(PLATFORM_LINUX)
-		target_link_libraries(Sfx c++)
-	endif()
 endif()

Applications/Sfx/Compiler.cpp

@@ -440,6 +440,8 @@ void ReplaceRegexes(string &src, const std::map<string,string> &replace)
 }
 static std::map<std::string,std::string> useCompilerPath;
 
+static bool checkedCompilerPath=false;
+
 extern void CalcCompilerPathToUse(const SfxConfig &sfxConfig,const SfxOptions &sfxOptions)
 {
 	std::string usePath="";
@@ -657,7 +659,7 @@ bool RewriteOutput(const SfxConfig &sfxConfig
 	(*log)<< str.c_str();
 	return has_errors;
 }
-
+#pragma optimize("",off)
 bool IsShaderUnchanged(std::string sourceFilename,std::string outputFilename,const std::string &src)
 {
 	if(!std::filesystem::exists(outputFilename))
@@ -676,7 +678,6 @@ bool IsShaderUnchanged(std::string sourceFilename,std::string outputFilename,con
 	return true;
 }
 
-
 int Compile(std::shared_ptr<ShaderInstance> shaderInstance
 		,const string &sourceFile
 		,string targetFile
@@ -869,7 +870,7 @@ int Compile(std::shared_ptr<ShaderInstance> shaderInstance
 	string src = preamble;
 	src += sharedSource;
 	src+=shaderInstance->m_augmentedSource;
-	ReplaceRegexes(src, sfxConfig.replace);
+
 	const char *strSrc=src.c_str();
 
 	wstring targetDir=StringToWString(GetDirectoryFromFilename(targetFile));
@@ -893,8 +894,8 @@ int Compile(std::shared_ptr<ShaderInstance> shaderInstance
 #else
 		ofstream ofs(WStringToUtf8(generatedSourceFilename).c_str());
 #endif
-		ofs.write(strSrc, strlen(strSrc));
-		ofs.close();
+	ofs.write(strSrc, strlen(strSrc));
+	ofs.close();
 	}
 #ifdef _MSC_VER
 	// Now delete the corresponding sdb's
@@ -933,52 +934,52 @@ int Compile(std::shared_ptr<ShaderInstance> shaderInstance
 	if(!unchanged)
 	{
 		compile_command=BuildCompileCommand
-		(
-			shaderInstance,
-			sfxConfig,
-			sfxOptions,
-			targetDir,
-			outputFile,
+	(
+		shaderInstance,
+		sfxConfig,
+		sfxOptions,
+		targetDir,
+		outputFile,
 			generatedSourceFilename,
-			t,
-			pixelOutputFormat
-		);
-		// If no compiler provided, we can return now (perhaps we are only interested in
-		// the shader source)
-		if (compile_command.empty())
-		{
-			if(sfxOptions.verbose)
+		t,
+		pixelOutputFormat
+	);
+	// If no compiler provided, we can return now (perhaps we are only interested in
+	// the shader source)
+	if (compile_command.empty())
+	{
+		if(sfxOptions.verbose)
 				std::cout<<WStringToUtf8(generatedSourceFilename).c_str()<<"\n";
-			// But let's in that case, wrap up the GENERATED SOURCE in sfxb:
-			if (sfxOptions.wrapOutput)
-			{
-				//concatenate
-	#ifdef _MSC_VER
+		// But let's in that case, wrap up the GENERATED SOURCE in sfxb:
+		if (sfxOptions.wrapOutput)
+		{
+			//concatenate
+#ifdef _MSC_VER
 				std::ifstream if_c(generatedSourceFilename.c_str(), std::ios_base::binary);
-	#else
+#else
 				std::ifstream if_c(WStringToUtf8(generatedSourceFilename).c_str(), std::ios_base::binary);
-	#endif
-				if(!if_c.good())
-				{
-					SFX_BREAK("Failed to load generated shader source");
-					exit(1002);
-				}
-				std::streampos startp = combinedBinary.tellp();
-				combinedBinary << if_c.rdbuf();
-				std::streampos endp = combinedBinary.tellp();
-				size_t sz=endp - startp;
-				if(!sz)
-				{
-					SFX_BREAK("Empty output shader ");
+#endif
+			if(!if_c.good())
+			{
+				SFX_BREAK("Failed to load generated shader source");
+				exit(1002);
+			}
+			std::streampos startp = combinedBinary.tellp();
+			combinedBinary << if_c.rdbuf();
+			std::streampos endp = combinedBinary.tellp();
+			size_t sz=endp - startp;
+			if(!sz)
+			{
+				SFX_BREAK("Empty output shader ");
 					std::cerr<<"Empty output shader "<<WStringToUtf8(generatedSourceFilename)<<"\n";
-					exit(1001);
-				}
-				binaryMap[sbf] = std::make_tuple(startp, sz);
+				exit(1001);
 			}
-			return true;
+			binaryMap[sbf] = std::make_tuple(startp, sz);
 		}
-		if(sfxOptions.verbose)
-			std::cout<<WStringToUtf8(compile_command).c_str()<<std::endl;
+		return true;
+	}
+	if(sfxOptions.verbose)
+		std::cout<<WStringToUtf8(compile_command).c_str()<<std::endl;
 	}
 
 	// Run the provided .exe! 
@@ -1036,7 +1037,7 @@ int Compile(std::shared_ptr<ShaderInstance> shaderInstance
 				{
 					if (terminate_command)
 						exit(2000);
-					Sleep(10);
+					sleep(10);
 				}
 				if(!if_c.good())
 				{

Applications/Sfx/Compiler.h

@@ -1,10 +1,12 @@
 #pragma once
 #include <string>
 #include <map>
+#include <memory>
 #include "SfxClasses.h"
 #include "SfxEffect.h"
 #include "ShaderInstance.h"
 
+extern void ReplaceRegexes(std::string &src, const std::map<std::string,std::string> &replace);
 extern int Compile(std::shared_ptr<sfx::ShaderInstance> shader, const std::string &sourceFile, std::string targetFile
 					, sfx::ShaderType t
 					, sfx::PixelOutputFormat pixelOutputFormat

Applications/Sfx/Environ.h

@@ -42,9 +42,7 @@ static void SetEnv(const std::string &name_utf8, const std::string &value_utf8)
 	errno_t err = _wputenv_s(
 		wname.c_str(),wval.c_str());
 #else
-	char txt[1000];
-	sprintf(txt,"%s=%s",name_utf8.c_str(),value_utf8.c_str());
-	putenv(txt);
+	setenv(name_utf8.c_str(),value_utf8.c_str(),1);
 #endif
 }
 
@@ -53,7 +51,6 @@ static void SetEnv(const std::string &name_utf8, const std::string &value_utf8)
 static std::string ProcessEnvironmentVariables(const std::string &str)
 {
 	std::string ret=str;
-#if defined(WIN32)|| defined(WIN64)
 	std::regex re("\\$([A-Z|a-z|0-9|_]+)");
 	std::sregex_iterator next(str.begin(), str.end(), re);
 	std::sregex_iterator end;
@@ -71,6 +68,5 @@ static std::string ProcessEnvironmentVariables(const std::string &str)
 	  // Syntax error in the regular expression
 		}
 	}
-#endif
 	return ret;
 }

Applications/Sfx/FileLoader.cpp

@@ -197,7 +197,7 @@ void FileLoader::AcquireFileContents(void*& pointer, unsigned int& bytes, const
 	fclose(fp);
 }
 
-uint64_t FileLoader::GetFileDate(const char *filename_utf8)
+uint64_t FileLoader::GetFileDateUnixTimeMs(const char *filename_utf8)
 {
 	std::wstring filenamew=StringToWString(filename_utf8);
 	#ifdef _MSC_VER
@@ -208,7 +208,7 @@ uint64_t FileLoader::GetFileDate(const char *filename_utf8)
 	stat(filename_utf8, &buf);
 	#endif
 	buf.st_mtime;
-	time_t t = buf.st_mtime;
+	time_t t = buf.st_mtime*1000;
 	return static_cast<uint64_t>(t);
 }		
 

Applications/Sfx/FileLoader.h

@@ -1,6 +1,7 @@
 #pragma once
 #include <vector>
 #include <string>
+#include <stdint.h>
 #ifndef _MAX_PATH
 #define _MAX_PATH 260
 #endif
@@ -16,7 +17,7 @@ class FileLoader
 	bool FileExists(const char *filename_utf8) const;
 	const char *FindFileInPathStack(const char *filename_utf8,const std::vector<std::string> &path_stack_utf8) const;
 	void AcquireFileContents(void*& pointer, unsigned int& bytes, const char* filename_utf8,bool open_as_text);
-	static uint64_t GetFileDate(const char* filename_utf8);
+	static uint64_t GetFileDateUnixTimeMs(const char* filename_utf8);
 	void ReleaseFileContents(void* pointer);
 	void Save(void* pointer, unsigned int bytes, const char* filename_utf8,bool save_as_text);
 };

Applications/Sfx/Main.cpp

@@ -1,7 +1,3 @@
-
-/* Parts of this program are Copyright (c) 2011, Max Aizenshtein <max.sniffer@gmail.com>
-*/
-
 #include <stdio.h>
 #include <vector>
 #include <iomanip> // for setw
@@ -50,6 +46,7 @@ const SfxOptions &GetSfxOptions()
     return sfxOptions;
 }
 extern bool terminate_command;
+#ifdef _MSC_VER
 // A ctrl message handler to detect "close" events.
 BOOL WINAPI CtrlHandler(DWORD fdwCtrlType)
 {
@@ -86,13 +83,14 @@ BOOL WINAPI CtrlHandler(DWORD fdwCtrlType)
         return FALSE;
     }
 }
+#endif
 std::string templateOutputFile;
 int main(int argc, char** argv) 
 {
+	#ifdef _MSC_VER
     if (SetConsoleCtrlHandler(CtrlHandler, TRUE))
 	{
 	}
-	#ifdef _MSC_VER
 	SetErrorMode(SEM_NOGPFAULTERRORBOX | SEM_NOOPENFILEERRORBOX | SEM_NOALIGNMENTFAULTEXCEPT);
 	_set_abort_behavior(0, _WRITE_ABORT_MSG);
 	#endif
@@ -127,6 +125,8 @@ int main(int argc, char** argv)
 		int a=0;
 		for(int i=1;i<argc;i++)
 		{
+			while(argv[i][0]==' ')
+				argv[i]++;
 			if(strlen(argv[i])>=2&&(argv[i][0]=='-'))
 			{
 				const char *arg=argv[i]+2;
@@ -241,6 +241,7 @@ int main(int argc, char** argv)
 		}
 		std::cout << std::setw(4)<< "info: building "<<sourceName<<" for "<<platformName<<"."<< std::endl;
 		SetEnv("PLATFORM_DIR",platform_dir.c_str());
+		std::cout<<"\n"<<GetEnv("BUILD_DIR")<<std::endl;
 		auto pathStrings=genericPathStrings;
 		pathStrings.push_back(json_path);
 		pathStrings.push_back(platform_dir+"/Shaders/SL"s);

Applications/Sfx/Preprocessor.h

@@ -4,6 +4,7 @@
 #include <vector>
 #include <string>
 #include <map>
+#include <stdint.h>
 enum Test
 {
 	IS_DEFINED,NOT_DEFINED,ZERO,NONZERO,EQUALS,NOTEQUAL,GREATER,LESS,GREATER_EQUAL,LESS_EQUAL

Applications/Sfx/Sfx.cpp

@@ -59,6 +59,7 @@ typedef int errno_t;
 #include "SfxClasses.h"
 #include "Sfx.h"
 #include "SfxEffect.h"
+#include "Compiler.h"
 
 #ifdef _MSC_VER
 #define YY_NO_UNISTD_H
@@ -106,7 +107,7 @@ FILE* OpenFile(const char *filename_utf8,std::string &fullPathNameUtf8,uint64_t
 	if(last_slash>0)
 		path=path.substr(0,last_slash);
 	shaderPathsUtf8.push_back(path);
-	datetime=FileLoader::GetFileDate(fullPathNameUtf8.c_str());
+	datetime=FileLoader::GetFileDateUnixTimeMs(fullPathNameUtf8.c_str());
 	return f;
 }
 
@@ -513,6 +514,13 @@ std::string GetExecutableDirectory()
 	}
 	else
 		str=L"";
+#else
+	char pBuf[512];
+	size_t len = sizeof(pBuf); 
+	int bytes = std::min((int)readlink("/proc/self/exe", pBuf, len), (int)len - 1);
+	if(bytes >= 0)
+		pBuf[bytes] = '\0';
+	return std::string(pBuf);
 #endif
 	return WStringToUtf8(str);
 }
@@ -602,13 +610,13 @@ bool sfxParseEffectFromFile(int effect, const char *file, const std::vector<std:
 		readlink("/proc/self/exe",exeNameUtf8,_MAX_PATH);
 		#endif
 		// start with the date that this exe was made, so new exe's rebuild the shaders.
-		uint64_t exe_datetime=FileLoader::GetFileDate(exeNameUtf8);
-		uint64_t platformfile_datetime=FileLoader::GetFileDate(config->platformFilename.c_str());
+		uint64_t exe_datetime=FileLoader::GetFileDateUnixTimeMs(exeNameUtf8);
+		uint64_t platformfile_datetime=FileLoader::GetFileDateUnixTimeMs(config->platformFilename.c_str());
 		latest_datetime= std::max(exe_datetime,platformfile_datetime);
 		latest_file=file;
 		if (!preprocess(file, config->define, sfxOptions->disableLineWrites))
 			return false;
-		uint64_t output_filedatetime = FileLoader::GetFileDate(sfxoFilename.c_str());
+		uint64_t output_filedatetime = FileLoader::GetFileDateUnixTimeMs(sfxoFilename.c_str());
 		bool recompile=false;
 		if(sfxOptions->force)
 		{
@@ -646,9 +654,6 @@ bool sfxParseEffectFromFile(int effect, const char *file, const std::vector<std:
 		if(sfxOptions->verbose)
 		{
 			char buffer[_MAX_PATH];
-			string wd="";
-			if(_getcwd(buffer,_MAX_PATH))
-				wd=string(buffer)+"/";
 			mkpath(sfxOptions->intermediateDirectory);
 			ppfile=((string(sfxOptions->intermediateDirectory)+"/")+GetFilenameOnly(file))+"_pp";
 			ofstream pps(ppfile);

Applications/Sfx/Sfx.ypp

@@ -1094,7 +1094,7 @@ primary_exp : IDENTIFIER
 		{
 			buildFunction.declarations.insert(varName);
 			buildFunction.declareResource(varName);
-			if (cb=gEffect->GetNamedConstantBufferForMember(varName))
+			if (cb=gEffect->GetNamedConstantBufferForMember(varName);cb)
 				buildFunction.declareConstantBuffer(cb);
 		}
 		else if ((cb = gEffect->GetConstantBufferForMember(varName)) != nullptr)