Add source language to parsed IR source data

Author: TheMostDiligent

spirv_cross_parsed_ir.hpp

@@ -111,6 +111,7 @@ class ParsedIR
 
 	struct Source
 	{
+		spv::SourceLanguage lang = spv::SourceLanguageUnknown;
 		uint32_t version = 0;
 		bool es = false;
 		bool known = false;

spirv_glsl.cpp

@@ -16087,7 +16087,7 @@ void CompilerGLSL::emit_instruction(const Instruction &instruction)
 		        join("createTensorLayoutNV(", to_expression(type.ext.tensorLayoutNv.dim_id), ", ",
 		             to_pretty_expression_if_int_constant(type.ext.tensorLayoutNv.clamp_mode_id,
 		                                                  std::begin(CooperativeMatrixClampModeNames),
-		                                                  std::end(CooperativeMatrixClampModeNames), true, ""),
+		                                                  std::end(CooperativeMatrixClampModeNames), true),
 		             ")"),
 		        true);
 		break;
@@ -17123,7 +17123,7 @@ string CompilerGLSL::type_to_glsl(const SPIRType &type, uint32_t id)
 		uint32_t dim = dim_constant.scalar();
 		auto clamp_expr = to_pretty_expression_if_int_constant(type.ext.tensorLayoutNv.clamp_mode_id,
 		                                                       std::begin(CooperativeMatrixClampModeNames),
-		                                                       std::end(CooperativeMatrixClampModeNames), true, "");
+		                                                       std::end(CooperativeMatrixClampModeNames), true);
 		return join("tensorLayoutNV<", dim, ", ", clamp_expr, ">");
 	}
 
@@ -20409,8 +20409,7 @@ std::string CompilerGLSL::format_double(double value) const
 std::string CompilerGLSL::to_pretty_expression_if_int_constant(uint32_t id,
                                                                const GlslConstantNameMapping *mapping_start,
                                                                const GlslConstantNameMapping *mapping_end,
-                                                               bool register_expression_read,
-							       const char* target_type)
+                                                               bool register_expression_read)
 {
 	auto *c = maybe_get<SPIRConstant>(id);
 	if (c && !c->specialization)
@@ -20421,5 +20420,5 @@ std::string CompilerGLSL::to_pretty_expression_if_int_constant(uint32_t id,
 		if (pretty_name != mapping_end)
 			return pretty_name->alias;
 	}
-	return join(target_type, "(", to_expression(id, register_expression_read), ")");
+	return join("int(", to_expression(id, register_expression_read), ")");
 }

spirv_glsl.hpp

@@ -812,8 +812,7 @@ class CompilerGLSL : public Compiler
 	std::string to_pretty_expression_if_int_constant(
 			uint32_t id,
 			const GlslConstantNameMapping *mapping_start, const GlslConstantNameMapping *mapping_end,
-			bool register_expression_read = true,
-	                const char* target_type = "int");
+			bool register_expression_read = true);
 	std::string to_expression(uint32_t id, bool register_expression_read = true);
 	std::string to_composite_constructor_expression(const SPIRType &parent_type, uint32_t id, bool block_like_type);
 	std::string to_rerolled_array_expression(const SPIRType &parent_type, const std::string &expr, const SPIRType &type);

spirv_parser.cpp

@@ -213,8 +213,8 @@ void Parser::parse(const Instruction &instruction)
 
 	case OpSource:
 	{
-		auto lang = static_cast<SourceLanguage>(ops[0]);
-		switch (lang)
+		ir.source.lang = static_cast<SourceLanguage>(ops[0]);
+		switch (ir.source.lang)
 		{
 		case SourceLanguageESSL:
 			ir.source.es = true;