GLSL: SPIRFunction::used_as_lambda for SPV_NV_cooperative_matrix2 lambdas

Author: theHamsta

spirv_common.hpp

@@ -1028,8 +1028,6 @@ struct SPIRFunction : IVariant
 		// read and write counts as access to the function arguments
 		// is not local to the function in question.
 		bool alias_global_variable;
-		spv::StorageClass storage;
-	        bool force_const;
 	};
 
 	// When calling a function, and we're remapping separate image samplers,
@@ -1061,6 +1059,9 @@ struct SPIRFunction : IVariant
 	BlockID entry_block = 0;
 	SmallVector<BlockID> blocks;
 	SmallVector<CombinedImageSamplerParameter> combined_parameters;
+	// SPV_NV_cooperative_matrix2 uses lambdas where all parameters need
+	// to be annotated as `const in`
+	bool used_as_lambda = false;
 
 	struct EntryLine
 	{
@@ -1077,7 +1078,7 @@ struct SPIRFunction : IVariant
 	void add_parameter(TypeID parameter_type, ID id, bool alias_global_variable = false)
 	{
 		// Arguments are read-only until proven otherwise.
-		arguments.push_back({ parameter_type, id, 0u, 0u, alias_global_variable, spv::StorageClassGeneric, false });
+		arguments.push_back({ parameter_type, id, 0u, 0u, alias_global_variable });
 	}
 
 	// Hooks to be run when the function returns.

spirv_cross.cpp

@@ -2983,7 +2983,7 @@ void Compiler::CombinedImageSamplerHandler::register_combined_image_sampler(SPIR
 		                  join("SPIRV_Cross_Combined", compiler.to_name(image_id), compiler.to_name(sampler_id)));
 
 		caller.combined_parameters.push_back(param);
-		caller.shadow_arguments.push_back({ ptr_type_id, combined_id, 0u, 0u, true, StorageClassGeneric, false });
+		caller.shadow_arguments.push_back({ ptr_type_id, combined_id, 0u, 0u, true });
 	}
 }
 

spirv_glsl.cpp

@@ -15927,11 +15927,7 @@ void CompilerGLSL::emit_instruction(const Instruction &instruction)
 		auto called_func = maybe_get_called_function(instruction);
 		if (called_func)
 		{
-			for (auto &par : called_func->arguments)
-			{
-				par.storage = StorageClassInput;
-				par.force_const = true;
-			}
+			called_func->used_as_lambda = true;
 		}
 		break;
 	}
@@ -15976,11 +15972,7 @@ void CompilerGLSL::emit_instruction(const Instruction &instruction)
 		auto called_func = maybe_get_called_function(instruction);
 		if (called_func)
 		{
-			for (auto &par : called_func->arguments)
-			{
-				par.storage = StorageClassInput;
-				par.force_const = true;
-			}
+			called_func->used_as_lambda = true;
 		}
 		break;
 	}
@@ -16020,11 +16012,7 @@ void CompilerGLSL::emit_instruction(const Instruction &instruction)
 		auto called_func = maybe_get_called_function(instruction);
 		if (called_func)
 		{
-			for (auto &par : called_func->arguments)
-			{
-				par.storage = StorageClassInput;
-				par.force_const = true;
-			}
+			called_func->used_as_lambda = true;
 		}
 
 		register_read(id, ops[2], false);
@@ -16682,13 +16670,13 @@ string CompilerGLSL::to_qualifiers_glsl(uint32_t id)
 	return res;
 }
 
-string CompilerGLSL::argument_decl(const SPIRFunction::Parameter &arg)
+string CompilerGLSL::argument_decl(const SPIRFunction::Parameter &arg, bool is_lambda)
 {
 	// glslangValidator seems to make all arguments pointer no matter what which is rather bizarre ...
 	auto &type = expression_type(arg.id);
 	const char *direction = "";
-	const char *constness = arg.force_const ? "const " : "";
-	if (arg.storage == StorageClassInput)
+	const char *constness = is_lambda ? "const " : "";
+	if (is_lambda == StorageClassInput)
 	{
 		direction = "in ";
 	}
@@ -17611,7 +17599,7 @@ void CompilerGLSL::emit_function_prototype(SPIRFunction &func, const Bitset &ret
 		// Since we want to make the GLSL debuggable and somewhat sane, use fallback names for variables which are duplicates.
 		add_local_variable_name(arg.id);
 
-		arglist.push_back(argument_decl(arg));
+		arglist.push_back(argument_decl(arg, func.used_as_lambda));
 
 		// Hold a pointer to the parameter so we can invalidate the readonly field if needed.
 		auto *var = maybe_get<SPIRVariable>(arg.id);
@@ -17627,7 +17615,7 @@ void CompilerGLSL::emit_function_prototype(SPIRFunction &func, const Bitset &ret
 		// Since we want to make the GLSL debuggable and somewhat sane, use fallback names for variables which are duplicates.
 		add_local_variable_name(arg.id);
 
-		arglist.push_back(argument_decl(arg));
+		arglist.push_back(argument_decl(arg, func.used_as_lambda));
 
 		// Hold a pointer to the parameter so we can invalidate the readonly field if needed.
 		auto *var = maybe_get<SPIRVariable>(arg.id);

spirv_glsl.hpp

@@ -837,7 +837,7 @@ class CompilerGLSL : public Compiler
 	virtual std::string to_member_reference(uint32_t base, const SPIRType &type, uint32_t index, bool ptr_chain_is_resolved);
 	std::string to_multi_member_reference(const SPIRType &type, const SmallVector<uint32_t> &indices);
 	std::string type_to_glsl_constructor(const SPIRType &type);
-	std::string argument_decl(const SPIRFunction::Parameter &arg);
+	std::string argument_decl(const SPIRFunction::Parameter &arg, bool is_lambda);
 	virtual std::string to_qualifiers_glsl(uint32_t id);
 	void fixup_io_block_patch_primitive_qualifiers(const SPIRVariable &var);
 	void emit_output_variable_initializer(const SPIRVariable &var);

spirv_hlsl.cpp

@@ -2556,7 +2556,7 @@ void CompilerHLSL::analyze_meshlet_writes(uint32_t func_id, uint32_t id_per_vert
 						// basetype is effectively ignored here since we declare the argument
 						// with explicit types. Just pass down a valid type.
 						func.arguments.push_back({ expression_type_id(iarg.id), iarg.id,
-						                           iarg.read_count, iarg.write_count, true, StorageClassGeneric, false });
+						                           iarg.read_count, iarg.write_count, true });
 					}
 				}
 				break;
@@ -2600,9 +2600,9 @@ void CompilerHLSL::analyze_meshlet_writes(uint32_t func_id, uint32_t id_per_vert
 						// with explicit types. Just pass down a valid type.
 						uint32_t type_id = expression_type_id(var_id);
 						if (var->storage == StorageClassTaskPayloadWorkgroupEXT)
-							func.arguments.push_back({ type_id, var_id, 1u, 0u, true, StorageClassGeneric, false });
+							func.arguments.push_back({ type_id, var_id, 1u, 0u, true });
 						else
-							func.arguments.push_back({ type_id, var_id, 1u, 1u, true, StorageClassGeneric, false });
+							func.arguments.push_back({ type_id, var_id, 1u, 1u, true });
 					}
 				}
 				break;
@@ -3107,7 +3107,7 @@ void CompilerHLSL::emit_function_prototype(SPIRFunction &func, const Bitset &ret
 		// Since we want to make the GLSL debuggable and somewhat sane, use fallback names for variables which are duplicates.
 		add_local_variable_name(arg.id);
 
-		arglist.push_back(argument_decl(arg));
+		arglist.push_back(argument_decl(arg, func.used_as_lambda));
 
 		// Flatten a combined sampler to two separate arguments in modern HLSL.
 		auto &arg_type = get<SPIRType>(arg.type);
@@ -3133,7 +3133,7 @@ void CompilerHLSL::emit_function_prototype(SPIRFunction &func, const Bitset &ret
 		// Since we want to make the GLSL debuggable and somewhat sane, use fallback names for variables which are duplicates.
 		add_local_variable_name(arg.id);
 
-		arglist.push_back(argument_decl(arg));
+		arglist.push_back(argument_decl(arg, func.used_as_lambda));
 
 		// Hold a pointer to the parameter so we can invalidate the readonly field if needed.
 		auto *var = maybe_get<SPIRVariable>(arg.id);