Merge branch 'main' of github.com:simul/Platform

Author: rvkennedy

Applications/Sfx/Sfx.lpp

@@ -69,6 +69,10 @@ the last is C code to be copied verbatim to the output.
 	{
 		insert_line_statement++;
 	}
+	bool charisspace(char c)
+	{
+		return std::isspace((int)c);
+	}
 	float ToFloat(const char * txr)
 	{
 		std::string yytextStr=yytext;
@@ -78,7 +82,7 @@ the last is C code to be copied verbatim to the output.
 		// Clang/Gcc still doesn't implement the standard function std::from_chars properly.
 		float value=atof(yytextStr.c_str());
 	#else
-		yytextStr.erase(std::remove_if(yytextStr.begin(),yytextStr.end(),std::isspace),yytextStr.end());
+		yytextStr.erase(std::remove_if(yytextStr.begin(),yytextStr.end(),charisspace),yytextStr.end());
 		float value=0.0f;
 		std::from_chars(yytextStr.data(),yytextStr.data()+yytextStr.size(),value,std::chars_format::general);
 	#endif
@@ -146,8 +150,8 @@ the last is C code to be copied verbatim to the output.
 %}
 %x renderstate_mode IN_SHADER IN_SHADER_COMPILE IN_LINE IN_RENDER_STATE IN_TEXTURE_DECL IN_LAYOUT IN_STRUCT IN_MULTILINE_COMMENT IN_VARIANT_CASE
 ID_BLCK [a-zA-Z_][a-zA-Z0-9_]*																	
-NUM_BLCK ([0-9][0-9]*)[uU]?
-HEX_BLCK 0x[0-9A-Fa-f][0-9A-Fa-f]*[uU]?
+NUM_BLCK ([0-9][0-9]*)[uU]?L?
+HEX_BLCK 0x[0-9A-Fa-f][0-9A-Fa-f]*[uU]?L?
 STR_BLCK \"[^"\n]*\"																								
 FLOAT_BLCK [0-9]*((\.[0-9])|([0-9]\.))[0-9]*([eE][+-]?[0-9]+)?f?
 
@@ -802,6 +806,7 @@ FLOAT_BLCK [0-9]*((\.[0-9])|([0-9]\.))[0-9]*([eE][+-]?[0-9]+)?f?
 <IN_SHADER>"continue"							stdReturn(CONTINUE);
 <IN_SHADER>"do"									stdReturn(DO);
 <IN_SHADER>"for"								stdReturn(FOR);
+<IN_SHADER>"unroll"								stdReturn(UNROLL);
 <IN_SHADER>"goto"								stdReturn(GOTO);
 <IN_SHADER>"if"									stdReturn(IF);
 <IN_SHADER>"switch"								stdReturn(SWITCH);

Applications/Sfx/Sfx.ypp

@@ -91,10 +91,17 @@
 	{
 		write_line_number_next=true;
 	}
-	void WriteLineNumber(std::ostringstream &str,const std::string &filename,int lineno)
+	bool WriteLineNumber(std::ostringstream &str,const std::string &filename,int lineno)
 	{
-		if(!lineno)
-			return;
+		if(lineno==0)
+		{
+			return true;
+		}
+		if(lineno<0)
+		{
+			std::cerr<<"line: "<<lineno<<" not valid for #line directive.\n";
+			return false;
+		}
 		std::string f=filename;
 		size_t p=f.find("\\");
 		while(p<f.length())
@@ -105,16 +112,20 @@
 		if (gEffect->GetOptions()->disableLineWrites)
 			str<<"//";
 		str<<"#line "<<lineno<<" "<<gEffect->GetFilenameOrNumber(f)<<endl;
+		return true;
 	}
-	void WriteLineNumber(std::ostringstream &str,int lineno)
+	bool WriteLineNumber(std::ostringstream &str,int lineno)
 	{
-		WriteLineNumber(str,current_filename,lineno);//.c_str()<<"\""<<endl;
+		return WriteLineNumber(str,current_filename,lineno);//.c_str()<<"\""<<endl;
 	}
 	std::string CreateLineStatement(int lineno)
 	{
 		ostringstream ostr;
 		ostr<<"\n";
-		WriteLineNumber(ostr,current_filename,lineno+last_linenumber-global_linenumber);
+		if(!WriteLineNumber(ostr,current_filename,lineno+last_linenumber-global_linenumber))
+		{
+			std::cerr<<"lineno: "<<lineno<<" last_linenumber: "<<last_linenumber<<", global_linenumber: "<<global_linenumber<<".\n";
+		}
 		return ostr.str();
 	}
 	void stringReplaceAll(std::string& str, const std::string& from, const std::string& to)
@@ -616,6 +627,7 @@
 %token SET_RAY_GENERATION SET_MISS SET_CALLABLE SET_HIT_GROUP SET_CLOSEST_HIT SET_ANY_HIT SET_INTERSECTION SET_MISS_SHADERS SET_CALLABLE_SHADERS SET_RAY_TRACING_SHADER_CONFIG SET_RAY_TRACING_PIPELINE_CONFIG SET_MAX_PAYLOAD_SIZE SET_MAX_ATTRIBUTE_SIZE SET_MAX_TRACE_RECURSION_DEPTH
 %token SFX_VARIANT SFX_VARIANT_IF SFX_VARIANT_ELSE SFX_VARIANT_END
 
+%token UNROLL
 %%
 
 prog : prog tok
@@ -1056,6 +1068,13 @@ gslayout : '[' MAX_VERTEX_COUNT '(' NUM ')' ']'
 	$$.strs[0]=$1.strs[0]+$2.strs[0]+$3.strs[0]+$4.strs[0]+$5.strs[0]+$6.strs[0];
 	}
 
+optional_unroll : '[' UNROLL ']'
+{
+	$$.strs[0]=$1.strs[0]+$2.strs[0]+$3.strs[0]+" ";
+} | %empty
+{
+	$$.strs[0] = "";
+}
 optional_expression : expression
 	{
 		$$.strs[0]=$1.strs[0];
@@ -2598,7 +2617,7 @@ statement : COMMENT
 		$$.strs[0]=$1.strs[0]+$2.strs[0]+$3.strs[0]+$4.strs[0]+$5.strs[0]+$6.strs[0]+$7.strs[0];
 		$$.strs[1]="";
 	}
-	| FOR '(' for_init_statement ';' optional_expression ';' optional_expression ')' statement
+	| for '(' for_init_statement ';' optional_expression ';' optional_expression ')' statement
 	{
 		string statement=$9.strs[0];
 		$$.strs[0]=$1.strs[0]+$2.strs[0]+$3.strs[0]+$4.strs[0]+$5.strs[0]+$6.strs[0]+$7.strs[0]+$8.strs[0]+statement;
@@ -2644,7 +2663,13 @@ statement : COMMENT
 		$$.strs[1]="";
 		$$.lineno=$1.lineno;
 	}
-
+for: optional_unroll FOR
+	{
+		int line=$2.lineno;
+		$$.lineno=line;
+		$$.strs[0] = $1.strs[0] + $2.strs[0] ;
+		$$.strs[1] = "";
+	}
 variant_conditional_expression: SFX_VARIANT_IF '(' conditional_exp ')'
 {
 // TODO: Properly change the identifiers, instead of this hack.

CMake/Include.cmake

@@ -1,6 +1,6 @@
 include_guard()
 
-set( PLATFORM_CPP_VERSION 17 CACHE STRING "Set the C++ version to compile." )
+set( PLATFORM_CPP_VERSION 20 CACHE STRING "Set the C++ version to compile." )
 set( CMAKE_CXX_STANDARD_REQUIRED ON )
 set( CMAKE_CXX_EXTENSIONS ON )
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)

Core/DefaultFileLoader.cpp

@@ -176,7 +176,7 @@ uint64_t DefaultFileLoader::GetFileDate(const char *filename_utf8) const
 	// https://stackoverflow.com/questions/61030383/how-to-convert-stdfilesystemfile-time-type-to-time-t
 	// https://stackoverflow.com/questions/51273205/how-to-compare-time-t-and-stdfilesystemfile-time-type
 	fs::file_time_type fileTime = fs::last_write_time(filename_utf8);
-#if PLATFORM_CXX20
+#if PLATFORM_CXX20_OR_ABOVE
 	const std::chrono::system_clock systemTime = std::chrono::clock_cast<std::chrono::system_clock>(fileTime);
 	const time_t time = std::chrono::system_clock::to_time_t(systemTime);
 #else

Core/RuntimeError.h

@@ -1,14 +1,28 @@
-#ifndef PLATFORM_RUNTIMEERROR_H
-#define PLATFORM_RUNTIMEERROR_H
+#pragma once
+
+// C++ Versions
+#if defined(_WIN64)
+#define PLATFORM_CXX20_OR_ABOVE _HAS_CXX20
+#define PLATFORM_CXX17_OR_ABOVE _HAS_CXX17
+#elif defined(__linux__)
+#define PLATFORM_CXX20_OR_ABOVE (__cplusplus >= 202002L)
+#define PLATFORM_CXX17_OR_ABOVE (__cplusplus >= 201703L)
+#endif
 
 #include "Export.h"
 
 #include <string>
+#include <string_view>
 #include <string.h>
 #include <iostream>
 #include <cerrno>
 #include <assert.h>
+#if PLATFORM_CXX20_OR_ABOVE
+#include <format>
+#include <fmt/core.h>
+#else
 #include <fmt/core.h>
+#endif
 
 #ifndef SIMUL_INTERNAL_CHECKS
 #define SIMUL_INTERNAL_CHECKS 0
@@ -35,14 +49,6 @@
 #endif
 #include <stdexcept> // for runtime_error
 
-// C++ Versions
-#if defined(_WIN64)
-#define PLATFORM_CXX20 _HAS_CXX20
-#define PLATFORM_CXX17 _HAS_CXX17
-#elif defined(__linux__)
-#define PLATFORM_CXX20 (__cplusplus == 202002L)
-#define PLATFORM_CXX17 (__cplusplus == 201703L)
-#endif
 
 #define SIMUL_COUT \
 	std::cout << __FILE__ << "(" << std::dec << __LINE__ << "): info: "
@@ -121,13 +127,22 @@ namespace platform
 #endif
 
 #define PLATFORM_ERROR(txt, ...) \
-	platform::core::Error(txt, __FILE__, __LINE__, ##__VA_ARGS__)
+	{\
+	std::string str = fmt::format(txt, ##__VA_ARGS__);\
+	std::cerr << fmt::format("{} ({}): error: {}", __FILE__, __LINE__, str) << "\n";\
+	}
 
 #define PLATFORM_WARN(txt, ...) \
-	platform::core::Warn(txt, __FILE__, __LINE__, ##__VA_ARGS__)
+	{\
+	std::string str = fmt::format(txt, ##__VA_ARGS__);\
+	std::cerr << fmt::format("{} ({}): warn: {}", __FILE__, __LINE__, str) << "\n";\
+	}
 
 #define PLATFORM_LOG(txt, ...) \
-	platform::core::Info(txt, __FILE__, __LINE__, ##__VA_ARGS__)
+	{\
+		std::string str = fmt::format(txt, ##__VA_ARGS__);\
+		std::cout << fmt::format("{} ({}): info: {}", __FILE__, __LINE__, str) << "\n";\
+	}
 
 
 #define SIMUL_INTERNAL_COUT                  \
@@ -187,7 +202,7 @@ namespace platform
 
 #define SIMUL_BREAK(msg, ...)                                          \
 	{                                                                  \
-		platform::core::Error(msg, __FILE__, __LINE__, ##__VA_ARGS__); \
+		PLATFORM_ERROR(msg, ##__VA_ARGS__); \
 		BREAK_IF_DEBUGGING                                             \
 	}
 
@@ -196,7 +211,7 @@ namespace platform
 		static bool done = false;                                          \
 		if (!done)                                                         \
 		{                                                                  \
-			platform::core::Error(msg, __FILE__, __LINE__, ##__VA_ARGS__); \
+			PLATFORM_ERROR(msg, ##__VA_ARGS__); \
 			BREAK_IF_DEBUGGING;                                            \
 			done = true;                                                   \
 		}                                                                  \
@@ -347,4 +362,3 @@ namespace platform
 #pragma warning(pop)
 #endif
 
-#endif

Core/TrackingAllocator.cpp

@@ -2,7 +2,12 @@
 #include "Platform/Core/StringFunctions.h"
 #include "Platform/Core/RuntimeError.h"
 #include <string.h> // for strlen
+#if PLATFORM_CXX20_OR_ABOVE
+#include <format>
 #include <fmt/format.h>
+#else
+#include <fmt/format.h>
+#endif
 
 using namespace platform;
 using namespace core;

CrossPlatform/Effect.cpp

@@ -674,7 +674,7 @@ crossplatform::SamplerStateDesc::Wrapping stringToWrapping(string s)
 		return crossplatform::SamplerStateDesc::CLAMP;
 	if(is_equal(s,"MIRROR"))
 		return crossplatform::SamplerStateDesc::MIRROR;
-	SIMUL_BREAK_ONCE((string("Invalid string")+s).c_str());
+	SIMUL_BREAK_ONCE("Invalid string: {}",s);
 	return crossplatform::SamplerStateDesc::WRAP;
 }
 
@@ -686,7 +686,7 @@ crossplatform::SamplerStateDesc::Filtering stringToFilter(string s)
 		return crossplatform::SamplerStateDesc::LINEAR;
 	if(is_equal(s,"ANISOTROPIC"))
 		return crossplatform::SamplerStateDesc::ANISOTROPIC;
-	SIMUL_BREAK((string("Invalid string: ")+s).c_str());
+	SIMUL_BREAK("Invalid string: {}",s);
 	return crossplatform::SamplerStateDesc::POINT;
 }
 
@@ -706,7 +706,7 @@ static crossplatform::CullFaceMode toCullFadeMode(string s)
 		return crossplatform::CULL_FACE_FRONTANDBACK;
 	else if(is_equal(s,"CULL_NONE"))
 		return crossplatform::CULL_FACE_NONE;
-	SIMUL_BREAK((string("Invalid string")+s).c_str());
+	SIMUL_BREAK("Invalid string: {}",s);
 	return crossplatform::CULL_FACE_NONE;
 }
 
@@ -730,7 +730,7 @@ static crossplatform::Topology toTopology(string s)
 		return crossplatform::Topology::TRIANGLELIST_ADJ;
 	else if(is_equal(s,"TriangleStripAdjacency"))
 		return crossplatform::Topology::TRIANGLESTRIP_ADJ;
-	SIMUL_BREAK((string("Invalid string")+s).c_str());
+	SIMUL_BREAK("Invalid string: {}",s);
 	return crossplatform::Topology::UNDEFINED;
 }
 
@@ -1015,8 +1015,7 @@ bool Effect::Load(crossplatform::RenderPlatform *r, const char *filename_utf8)
 		std::transform(binFilenameUtf8.begin(), binFilenameUtf8.end(), binFilenameUtf8.begin(), ::tolower);
 		if(!platform::core::FileLoader::GetFileLoader()->FileExists(binFilenameUtf8.c_str()))
 		{
-			string err= platform::core::QuickFormat("Shader effect file not found: %s",binFilenameUtf8.c_str());
-			SIMUL_BREAK_ONCE(err.c_str());
+			SIMUL_BREAK_ONCE("Shader effect file not found: {}",binFilenameUtf8);
 			static bool already = false;
 			if (!already)
 			{
@@ -1515,7 +1514,7 @@ bool Effect::Load(crossplatform::RenderPlatform *r, const char *filename_utf8)
 								platform::core::FileLoader::GetFileLoader()->AcquireFileContents(bin_ptr, bin_num_bytes, sfxbFilenameUtf8.c_str(), true);
 								if (!bin_ptr)
 								{
-									SIMUL_BREAK(platform::core::QuickFormat("Failed to load combined shader binary: %s\n", sfxbFilenameUtf8.c_str()));
+									SIMUL_BREAK("Failed to load combined shader binary: {}\n", sfxbFilenameUtf8);
 								}
 							}
 						}
@@ -1701,7 +1700,7 @@ bool Effect::Load(crossplatform::RenderPlatform *r, const char *filename_utf8)
 					}
 					else
 					{
-						SIMUL_BREAK(platform::core::QuickFormat("Unknown shader type or command: %s\n",type.c_str()));
+						SIMUL_BREAK("Unknown shader type or command: {}\n",type);
 						continue;
 					}
 					Shader *s = nullptr;

CrossPlatform/PlatformStructuredBuffer.h

@@ -71,6 +71,7 @@ namespace platform
 		public:
 			virtual ~BaseStructuredBuffer() = default;
 			PlatformStructuredBuffer* platformStructuredBuffer=nullptr;
+			int count=0;
 		};
 		class PlatformStructuredBuffer;
 		/// Templated structured buffer, which uses platform-specific implementations of PlatformStructuredBuffer.
@@ -83,7 +84,6 @@ namespace platform
 		{
 		public:
 			StructuredBuffer()
-				:count(0)
 			{
 			}
 			~StructuredBuffer()
@@ -187,8 +187,6 @@ namespace platform
 				if (platformStructuredBuffer)
 					platformStructuredBuffer->ResetCopies();
 			}
-
-			int count;
 		};
 
 	}

CrossPlatform/RenderPlatform.cpp

@@ -31,7 +31,6 @@
 #include <algorithm>
 #include <array>
 #include <atomic>
-#include <fmt/core.h>
 
 using namespace std::literals;
 using namespace std::string_literals;
@@ -1982,6 +1981,8 @@ void RenderPlatform::SetConstantBuffer(DeviceContext& deviceContext,ConstantBuff
 
 void RenderPlatform::SetStructuredBuffer(DeviceContext& deviceContext, BaseStructuredBuffer* s, const ShaderResource& shaderResource)
 {
+	if(!s||!s->platformStructuredBuffer)
+		return;
 	if((shaderResource.shaderResourceType & ShaderResourceType::RW) == ShaderResourceType::RW)
 		s->platformStructuredBuffer->ApplyAsUnorderedAccessView(deviceContext, shaderResource);
 	else
@@ -2059,7 +2060,7 @@ std::shared_ptr<Effect> RenderPlatform::GetOrCreateEffect(const char *filename_u
 	bool success = e->Load(this,filename_utf8);
 	if (!success)
 	{
-		SIMUL_BREAK(platform::core::QuickFormat("Failed to load effect file: %s. Effect will be placeholder.\n", filename_utf8));
+		SIMUL_BREAK("Failed to load effect file: {}. Effect will be placeholder.\n", filename_utf8);
 		return e;
 	}
 	return e;

CrossPlatform/Shaders/vec2.sl

@@ -223,7 +223,7 @@ struct tvector2
 	}
 	friend tvector2 operator/(const T &m, const tvector2 &v)
 	{
-		tvector3 r;
+		tvector2 r;
 		r.x = m / v.x;
 		r.y = m / v.y;
 		return r;