Refactor: Compatible compute and graphics VerifyIO

[platform/upstream/VK-GL-CTS.git] / external / vulkancts / modules / vulkan / spirv_assembly / vktSpvAsmPointerParameterTests.cpp

diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmPointerParameterTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmPointerParameterTests.cpp
index af80b97..0f37402 100644 (file)
--- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmPointerParameterTests.cpp
+++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmPointerParameterTests.cpp
@@ -752,7 +752,7 @@ void addGraphicsPointerParamToParamTest (tcu::TestCaseGroup* group)
        getDefaultColors(defaultColors);
        expectedOutput.push_back(7.0f);
        requiredFeatures.coreFeatures.vertexPipelineStoresAndAtomics = DE_TRUE;
-       resources.outputs.push_back(std::make_pair(vk::VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, BufferSp(new Float32Buffer(expectedOutput))));
+       resources.outputs.push_back(Resource(BufferSp(new Float32Buffer(expectedOutput)), vk::VK_DESCRIPTOR_TYPE_STORAGE_BUFFER));
 
        createTestsForAllStages("global_to_param", defaultColors, defaultColors, fragments, resources, extensions, group, requiredFeatures);
 }
@@ -847,7 +847,7 @@ void addGraphicsPointerParamToGlobalTest (tcu::TestCaseGroup* group)
        getDefaultColors(defaultColors);
        expectedOutput.push_back(7.0f);
        requiredFeatures.coreFeatures.vertexPipelineStoresAndAtomics = DE_TRUE;
-       resources.outputs.push_back(std::make_pair(vk::VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, BufferSp(new Float32Buffer(expectedOutput))));
+       resources.outputs.push_back(Resource(BufferSp(new Float32Buffer(expectedOutput)), vk::VK_DESCRIPTOR_TYPE_STORAGE_BUFFER));
 
        createTestsForAllStages("param_to_global", defaultColors, defaultColors, fragments, resources, extensions, group, requiredFeatures);
 }
@@ -955,7 +955,7 @@ void addGraphicsPointerBufferMemoryTest (tcu::TestCaseGroup* group)
                expectedOutput.push_back(2.0f);
 
        requiredFeatures.coreFeatures.vertexPipelineStoresAndAtomics = DE_TRUE;
-       resources.outputs.push_back(std::make_pair(vk::VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, BufferSp(new Float32Buffer(expectedOutput))));
+       resources.outputs.push_back(Resource(BufferSp(new Float32Buffer(expectedOutput)), vk::VK_DESCRIPTOR_TYPE_STORAGE_BUFFER));
 
        createTestsForAllStages("buffer_memory", defaultColors, defaultColors, fragments, resources, extensions, group, requiredFeatures);
 }
@@ -1064,7 +1064,7 @@ void addGraphicsPointerBufferMemoryVariablePointersTest (tcu::TestCaseGroup* gro
 
        extensions.push_back("VK_KHR_variable_pointers");
        requiredFeatures.coreFeatures.vertexPipelineStoresAndAtomics = DE_TRUE;
-       resources.outputs.push_back(std::make_pair(vk::VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, BufferSp(new Float32Buffer(expectedOutput))));
+       resources.outputs.push_back(Resource(BufferSp(new Float32Buffer(expectedOutput)), vk::VK_DESCRIPTOR_TYPE_STORAGE_BUFFER));
 
        createTestsForAllStages("buffer_memory_variable_pointers", defaultColors, defaultColors, fragments, resources, extensions, group, requiredFeatures);
 }