SpirvShader: Move type declaration out to its own function

src/Pipeline/SpirvShader.cpp

@@ -115,54 +115,8 @@ namespace sw
 			case spv::OpTypeStruct:
 			case spv::OpTypePointer:
 			case spv::OpTypeFunction:
-			{
-				TypeID resultId = insn.word(1);
-				auto &type = types[resultId];
-				type.definition = insn;
-				type.sizeInComponents = ComputeTypeSize(insn);
-
-				// A structure is a builtin block if it has a builtin
-				// member. All members of such a structure are builtins.
-				switch (insn.opcode())
-				{
-				case spv::OpTypeStruct:
-				{
-					auto d = memberDecorations.find(resultId);
-					if (d != memberDecorations.end())
-					{
-						for (auto &m : d->second)
-						{
-							if (m.HasBuiltIn)
-							{
-								type.isBuiltInBlock = true;
-								break;
-							}
-						}
-					}
-					break;
-				}
-				case spv::OpTypePointer:
-				{
-					TypeID elementTypeId = insn.word(3);
-					type.element = elementTypeId;
-					type.isBuiltInBlock = getType(elementTypeId).isBuiltInBlock;
-					type.storageClass = static_cast<spv::StorageClass>(insn.word(2));
-					break;
-				}
-				case spv::OpTypeVector:
-				case spv::OpTypeMatrix:
-				case spv::OpTypeArray:
-				case spv::OpTypeRuntimeArray:
-				{
-					TypeID elementTypeId = insn.word(2);
-					type.element = elementTypeId;
-					break;
-				}
-				default:
-					break;
-				}
+				DeclareType(insn);
 				break;
-			}
 
 			case spv::OpVariable:
 			{
@@ -299,6 +253,56 @@ namespace sw
 		}
 	}
 
+	void SpirvShader::DeclareType(InsnIterator insn)
+	{
+		TypeID resultId = insn.word(1);
+
+		auto &type = types[resultId];
+		type.definition = insn;
+		type.sizeInComponents = ComputeTypeSize(insn);
+
+		// A structure is a builtin block if it has a builtin
+		// member. All members of such a structure are builtins.
+		switch (insn.opcode())
+		{
+		case spv::OpTypeStruct:
+		{
+			auto d = memberDecorations.find(resultId);
+			if (d != memberDecorations.end())
+			{
+				for (auto &m : d->second)
+				{
+					if (m.HasBuiltIn)
+					{
+						type.isBuiltInBlock = true;
+						break;
+					}
+				}
+			}
+			break;
+		}
+		case spv::OpTypePointer:
+		{
+			TypeID elementTypeId = insn.word(3);
+			type.element = elementTypeId;
+			type.isBuiltInBlock = getType(elementTypeId).isBuiltInBlock;
+			type.storageClass = static_cast<spv::StorageClass>(insn.word(2));
+			break;
+		}
+		case spv::OpTypeVector:
+		case spv::OpTypeMatrix:
+		case spv::OpTypeArray:
+		case spv::OpTypeRuntimeArray:
+		{
+			TypeID elementTypeId = insn.word(2);
+			type.element = elementTypeId;
+			break;
+		}
+		default:
+			break;
+		}
+	}
+
 	SpirvShader::Object& SpirvShader::CreateConstant(InsnIterator insn)
 	{
 		TypeID typeId = insn.word(1);

src/Pipeline/SpirvShader.hpp

@@ -357,6 +357,10 @@ namespace sw
 		HandleMap<Type> types;
 		HandleMap<Object> defs;
 
+		// DeclareType creates a Type for the given OpTypeX instruction, storing
+		// it into the types map. It is called from the analysis pass (constructor).
+		void DeclareType(InsnIterator insn);
+
 		void ProcessExecutionMode(InsnIterator it);
 
 		uint32_t ComputeTypeSize(InsnIterator insn);