Support [unroll] before for loops.

Author: rvkennedy

Applications/Sfx/Sfx.lpp

@@ -806,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.

Vulkan/Sfx/Vulkan.json

@@ -57,7 +57,7 @@
 	"pixelOutputDeclaration": "[layout(location = {slot}) out {type} {name};]",
 	"pixelOutputDeclarationDSB": "[layout(location = {slot}, index = {id}) out {type} {name};]",
 	"compilerMessageRegex": [ "(ERROR|WARNING):[\\S]*(.*):[\\S]*([0-9]+)[\\S]*:[ ]*(.*)", "$2($3): $1: $4" ],
-	"preamble": "#version 450\n#extension GL_EXT_debug_printf : enable\n#extension GL_GOOGLE_cpp_style_line_directive : enable\n#extension GL_EXT_samplerless_texture_functions : enable\n#extension GL_EXT_shader_io_blocks : enable\n#extension GL_ARB_enhanced_layouts : enable\n#extension GL_EXT_multiview : enable\n#extension GL_EXT_shader_explicit_arithmetic_types_float16 : enable\n#extension GL_EXT_shader_explicit_arithmetic_types_int16 : enable\n",
+	"preamble": "#version 450\n#extension GL_EXT_debug_printf : enable\n#extension GL_GOOGLE_cpp_style_line_directive : enable\n#extension GL_EXT_samplerless_texture_functions : enable\n#extension GL_EXT_shader_io_blocks : enable\n#extension GL_ARB_enhanced_layouts : enable\n#extension GL_EXT_multiview : enable\n#extension GL_EXT_shader_explicit_arithmetic_types_float16 : enable\n#extension GL_EXT_shader_explicit_arithmetic_types_int16 : enable\n#extension GL_EXT_control_flow_attributes: enable\n",
 	"computePreamble": "#extension GL_KHR_shader_subgroup_quad : enable\n#extension GL_KHR_shader_subgroup_shuffle: enable\n#extension GL_KHR_shader_subgroup_vote : enable\n#extension GL_KHR_shader_subgroup_ballot : enable\n#extension GL_KHR_shader_subgroup_arithmetic : enable\n#extension GL_KHR_shader_subgroup_basic : enable\n#extension GL_ARB_gpu_shader_int64 : enable\n#extension GL_ARB_compute_shader : enable\n#extension GL_ARB_shader_image_load_store : enable\n#extension GL_ARB_gpu_shader_int64 : enable\n",
 	"vertexSemantics": {
 		"SV_VertexId": "gl_VertexIndex",
@@ -274,6 +274,7 @@
 		"._m33": "[3][3]",
 		"round": "roundEven",
 		"roundNearest": "round",
-		"firstbitlow": "findLSB"
+		"firstbitlow": "findLSB",
+		"unroll": "[unroll]"
 	}
 }