Rename various things for more inclusive language

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

diff --git a/external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemYCbCrConversionTests.cpp b/external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemYCbCrConversionTests.cpp
index 7544484..6540509 100644 (file)
--- a/external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemYCbCrConversionTests.cpp
+++ b/external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemYCbCrConversionTests.cpp
@@ -357,7 +357,7 @@ void uploadYCbCrImage (ProtectedContext&                                    ctx,
                bufferBarriers.push_back(bufferBarrier);
 
                deMemcpy(buffer->getAllocation().getHostPtr(), imageData.getPlanePtr(planeNdx), imageData.getPlaneSize(planeNdx));
-               flushMappedMemoryRange(vk, device, buffer->getAllocation().getMemory(), buffer->getAllocation().getOffset(), (deUint32)imageData.getPlaneSize(planeNdx));
+               flushAlloc(vk, device, buffer->getAllocation());
                stagingBuffers.push_back(de::SharedPtr<de::MovePtr<vk::BufferWithMemory> >(new de::MovePtr<vk::BufferWithMemory>(buffer.release())));
        }
 
@@ -366,7 +366,7 @@ void uploadYCbCrImage (ProtectedContext&                                    ctx,
 
        for (deUint32 planeNdx = 0; planeNdx < imageData.getDescription().numPlanes; ++planeNdx)
        {
-               const vk::VkImageAspectFlagBits aspect  = formatDesc.numPlanes > 1
+               const vk::VkImageAspectFlags    aspect  = formatDesc.numPlanes > 1
                                                                                                ? vk::getPlaneAspect(planeNdx)
                                                                                                : vk::VK_IMAGE_ASPECT_COLOR_BIT;
 
@@ -419,7 +419,7 @@ void uploadYCbCrImage (ProtectedContext&                                    ctx,
 
        for (deUint32 planeNdx = 0; planeNdx < imageData.getDescription().numPlanes; ++planeNdx)
        {
-               const vk::VkImageAspectFlagBits aspect  = formatDesc.numPlanes > 1
+               const vk::VkImageAspectFlags    aspect  = formatDesc.numPlanes > 1
                                                                                                ? vk::getPlaneAspect(planeNdx)
                                                                                                : vk::VK_IMAGE_ASPECT_COLOR_BIT;
 
@@ -527,7 +527,7 @@ bool validateImage (ProtectedContext&                                                       ctx,
        // Set the reference uniform data
        {
                deMemcpy(refUniform->getAllocation().getHostPtr(), &refData[0], refUniformSize);
-               vk::flushMappedMemoryRange(vk, device, refUniform->getAllocation().getMemory(), refUniform->getAllocation().getOffset(), refUniformSize);
+               flushAlloc(vk, device, refUniform->getAllocation());
        }
 
        const deUint32                                                          helperBufferSize        = (deUint32)(2 * sizeof(deUint32));
@@ -646,13 +646,13 @@ void testShaders (vk::SourceCollections& dst, const TestConfig config)
                "layout(std140, set = 0, binding = 2) buffer ProtectedHelper\n"
                "{\n"
                "    highp uint zero;\n"
-               "    highp uint dummyOut;\n"
+               "    highp uint unusedOut;\n"
                "} helper;\n"
                "\n"
                "void error()\n"
                "{\n"
                "    for (uint x = 0u; x < 10u; x += helper.zero)\n"
-               "        atomicAdd(helper.dummyOut, 1u);\n"
+               "        atomicAdd(helper.unusedOut, 1u);\n"
                "}\n"
                "\n"
                "${COMPARE_FUNCTION}"
@@ -674,13 +674,13 @@ void testShaders (vk::SourceCollections& dst, const TestConfig config)
                "layout(std140, set=0, binding=2) buffer ProtectedHelper\n"
                "{\n"
                "    highp uint zero; // set to 0\n"
-               "    highp uint dummyOut;\n"
+               "    highp uint unusedOut;\n"
                "} helper;\n"
                "\n"
                "void main (void)\n"
                "{\n"
                "    helper.zero = 0;\n"
-               "    helper.dummyOut = 0;\n"
+               "    helper.unusedOut = 0;\n"
                "}\n";
 
        dst.glslSources.add("ResetSSBO") << glu::ComputeSource(resetSSBOShader);
@@ -859,7 +859,7 @@ void renderYCbCrToColor (ProtectedContext&                                                  ctx,
        // Set the reference uniform data
        {
                deMemcpy(refUniform->getAllocation().getHostPtr(), &referenceData[0], refUniformSize);
-               vk::flushMappedMemoryRange(vk, device, refUniform->getAllocation().getMemory(), refUniform->getAllocation().getOffset(), refUniformSize);
+               flushAlloc(vk, device, refUniform->getAllocation());
        }
 
        // Update descriptor set
@@ -904,7 +904,7 @@ void renderYCbCrToColor (ProtectedContext&                                                  ctx,
                                                                  vk::MemoryRequirement::HostVisible);
 
                deMemcpy(vertexBuffer->getAllocation().getHostPtr(), &posCoords[0], bufferSize);
-               vk::flushMappedMemoryRange(vk, device, vertexBuffer->getAllocation().getMemory(), vertexBuffer->getAllocation().getOffset(), bufferSize);
+               flushAlloc(vk, device, vertexBuffer->getAllocation());
        }
 
        const vk::Unique<vk::VkPipeline>                pipeline                        (makeGraphicsPipeline(vk,