Merge branch '395-convert-assembly-fix-arraystride' into 'vulkan-cts-1.0-dev'
authorMika Isojarvi <misojarvi@google.com>
Fri, 24 Jun 2016 17:28:13 +0000 (17:28 +0000)
committerMika Isojarvi <misojarvi@google.com>
Fri, 24 Jun 2016 17:28:13 +0000 (17:28 +0000)
Fix missing ArrayStride decorator.

Fix the missing ArrayStride decorator in OpSConvert and OpUConvert tests.

See merge request !578

1  2 
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp

@@@ -8130,9 -8052,9 +8155,9 @@@ tcu::TestCaseGroup* createSConvertTest
        {
                ComputeShaderSpec       spec;
  
-               spec.assembly = getConvertCaseShaderStr(instruction, test->m_asmTypes);
+               spec.assembly = getConvertCaseShaderStr(instruction, *test);
                spec.inputs.push_back(test->m_inputBuffer);
 -              spec.outputs.push_back(test->m_inputBuffer);
 +              spec.outputs.push_back(test->m_outputBuffer);
                spec.numWorkGroups = IVec3(1, 1, 1);
  
                group->addChild(new ConvertTestCase(testCtx, test->m_name.c_str(), "Convert integers with OpSConvert.", spec, test->m_features));
@@@ -8168,9 -8090,9 +8193,9 @@@ tcu::TestCaseGroup* createUConvertTest
        {
                ComputeShaderSpec       spec;
  
-               spec.assembly = getConvertCaseShaderStr(instruction, test->m_asmTypes);
+               spec.assembly = getConvertCaseShaderStr(instruction, *test);
                spec.inputs.push_back(test->m_inputBuffer);
 -              spec.outputs.push_back(test->m_inputBuffer);
 +              spec.outputs.push_back(test->m_outputBuffer);
                spec.numWorkGroups = IVec3(1, 1, 1);
  
                group->addChild(new ConvertTestCase(testCtx, test->m_name.c_str(), "Convert integers with OpUConvert.", spec, test->m_features));