Merge vk-gl-cts/vulkan-cts-1.2.2 into vk-gl-cts/vulkan-cts-1.2.3

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

diff --git a/external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemStorageBufferTests.cpp b/external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemStorageBufferTests.cpp
index 6d1980e..6f8113f 100644 (file)
--- a/external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemStorageBufferTests.cpp
+++ b/external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemStorageBufferTests.cpp
@@ -202,12 +202,13 @@ public:
                                                                                                                 const char*                            name,
                                                                                                                 const tcu::UVec4                       testInput,
                                                                                                                 ValidationDataStorage<T>       validationData,
+                                                                                                                vk::VkFormat                           format,
                                                                                                                 const std::string&                     extraShader = "")
                                                                        : TestCase              (testctx, name, getSSBOTestDescription(testType))
                                                                        , m_testType    (testType)
                                                                        , m_shaderType  (shaderType)
                                                                        , m_testInput   (testInput)
-                                                                       , m_validator   (validationData)
+                                                                       , m_validator   (validationData, format)
                                                                        , m_extraShader (extraShader)
                                                                {
                                                                }
@@ -377,7 +378,7 @@ tcu::TestStatus StorageBufferTestInstance<T>::executeFragmentTest(void)
        // Set the test input uniform data
        {
                deMemcpy(testUniform->getAllocation().getHostPtr(), &m_testInput, testUniformSize);
-               vk::flushMappedMemoryRange(vk, device, testUniform->getAllocation().getMemory(), testUniform->getAllocation().getOffset(), testUniformSize);
+               vk::flushAlloc(vk, device, testUniform->getAllocation());
        }
        const deUint32                                                  testBufferSize          = sizeof(ValidationDataStorage<T>);
        de::MovePtr<vk::BufferWithMemory>               testBuffer                      (makeBuffer(ctx,
@@ -564,7 +565,7 @@ tcu::TestStatus StorageBufferTestInstance<T>::executeComputeTest(void)
        // Set the test input uniform data
        {
                deMemcpy(testUniform->getAllocation().getHostPtr(), &m_testInput, testUniformSize);
-               vk::flushMappedMemoryRange(vk, device, testUniform->getAllocation().getMemory(), testUniform->getAllocation().getOffset(), testUniformSize);
+               vk::flushAlloc(vk, device, testUniform->getAllocation());
        }
 
        const deUint32                                                  testBufferSize          = sizeof(ValidationDataStorage<T>);
@@ -676,7 +677,7 @@ tcu::TestCaseGroup* createSpecifiedStorageBufferTests (tcu::TestContext&                                            te
        for (size_t ndx = 0; ndx < testCount; ++ndx)
        {
                const std::string name = testTypeStr + "_" + de::toString(ndx + 1);
-               testGroup->addChild(new StorageBufferTestCase<tcu::UVec4>(testCtx, testType, shaderType, name.c_str(), testData[ndx].values, testData[ndx]));
+               testGroup->addChild(new StorageBufferTestCase<tcu::UVec4>(testCtx, testType, shaderType, name.c_str(), testData[ndx].values, testData[ndx], vk::VK_FORMAT_R32G32B32A32_UINT));
        }
 
        return testGroup.release();
@@ -871,7 +872,7 @@ tcu::TestCaseGroup* createAtomicStorageBufferTests (tcu::TestContext& testctx)
                                calculateAtomicOpData(atomicType, inputValue, atomicArg, atomicCall, refValue, testData[ndx].swapNdx);
 
                                ValidationDataStorage<tcu::UVec4>       validationData  = { refValue };
-                               staticTests->addChild(new StorageBufferTestCase<tcu::UVec4>(testctx, SSBO_ATOMIC, shaderType, name.c_str(), inputValue, validationData, atomicCall));
+                               staticTests->addChild(new StorageBufferTestCase<tcu::UVec4>(testctx, SSBO_ATOMIC, shaderType, name.c_str(), inputValue, validationData, vk::VK_FORMAT_R32G32B32A32_UINT, atomicCall));
                        }
 
                        de::MovePtr<tcu::TestCaseGroup> randomTests             (new tcu::TestCaseGroup(testctx, "random", (atomicDesc + " with random input").c_str()));
@@ -889,7 +890,7 @@ tcu::TestCaseGroup* createAtomicStorageBufferTests (tcu::TestContext& testctx)
                                calculateAtomicOpData(atomicType, inputValue, atomicArg, atomicCall, refValue, ndx);
 
                                ValidationDataStorage<tcu::UVec4>       validationData  = { refValue };
-                               randomTests->addChild(new StorageBufferTestCase<tcu::UVec4>(testctx, SSBO_ATOMIC, shaderType, name.c_str(), inputValue, validationData, atomicCall));
+                               randomTests->addChild(new StorageBufferTestCase<tcu::UVec4>(testctx, SSBO_ATOMIC, shaderType, name.c_str(), inputValue, validationData, vk::VK_FORMAT_R32G32B32A32_UINT, atomicCall));
 
                        }