Refactor the code, extract the assembly type declaration.

diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
index a6dc11a4d1e2a4ad27574c0f882581bcb3ca607f..5712d69b935ff5976fef21f7d85a452a08572ccb 100644 (file)
--- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
+++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
@@ -8252,21 +8252,22 @@ void createCompositeCases (vector<map<string, string> >& testCases, de::Random&
        }
 }
 
-const string specializeCompositeShaderTemplate (const NumberType type, const map<string, string>& params)
+const string getAssemblyTypeDeclaration (const NumberType type)
 {
-       map<string, string>     parameters(params);
-
-       string typeAssembly;
-
        switch (type)
        {
-               case TYPE_INT:          typeAssembly = "OpTypeInt 32 1"; break;
-               case TYPE_UINT:         typeAssembly = "OpTypeInt 32 0"; break;
-               case TYPE_FLOAT:        typeAssembly = "OpTypeFloat 32"; break;
-               default:                        DE_ASSERT(false);
+               case TYPE_INT:          return "OpTypeInt 32 1";
+               case TYPE_UINT:         return "OpTypeInt 32 0";
+               case TYPE_FLOAT:        return "OpTypeFloat 32";
+               default:                        DE_ASSERT(false); return "";
        }
+}
+
+const string specializeCompositeInsertShaderTemplate (const NumberType type, const map<string, string>& params)
+{
+       map<string, string>     parameters(params);
 
-       parameters["typeDeclaration"] = typeAssembly;
+       parameters["typeDeclaration"] = getAssemblyTypeDeclaration(type);
 
        return StringTemplate (
                "OpCapability Shader\n"
@@ -8363,7 +8364,7 @@ tcu::TestCaseGroup* createOpCompositeInsertGroup (tcu::TestContext& testCtx)
                {
                        ComputeShaderSpec       spec;
 
-                       spec.assembly = specializeCompositeShaderTemplate(numberType, *test);
+                       spec.assembly = specializeCompositeInsertShaderTemplate(numberType, *test);
 
                        switch (numberType)
                        {