Indentation improvement after removal KHR suffix
authorAlexander Galazin <alexander.galazin@arm.com>
Wed, 20 Sep 2017 17:06:39 +0000 (12:06 -0500)
committerAlexander Galazin <Alexander.Galazin@arm.com>
Tue, 3 Oct 2017 08:23:45 +0000 (04:23 -0400)
Components: Vulkan

VK-GL-CTS issue: 473

Change-Id: Ic58e5c2775504c724936b62d5c9d4b1330bc085e
(cherry picked from commit 03e5ace049a785f9e7fc62116089f121643eb345)

22 files changed:
external/vulkancts/modules/vulkan/api/vktApiBufferTests.cpp
external/vulkancts/modules/vulkan/api/vktApiBufferViewCreateTests.cpp
external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
external/vulkancts/modules/vulkan/clipping/vktClippingTests.cpp
external/vulkancts/modules/vulkan/compute/vktComputeBasicComputeShaderTests.cpp
external/vulkancts/modules/vulkan/image/vktImageMutableTests.cpp
external/vulkancts/modules/vulkan/image/vktImageTestsUtil.hpp
external/vulkancts/modules/vulkan/memory/vktMemoryAllocationTests.cpp
external/vulkancts/modules/vulkan/memory/vktMemoryMappingTests.cpp
external/vulkancts/modules/vulkan/multiview/vktMultiViewRenderTests.cpp
external/vulkancts/modules/vulkan/multiview/vktMultiViewRenderUtil.cpp
external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesTestsUtil.cpp
external/vulkancts/modules/vulkan/synchronization/vktSynchronizationCrossInstanceSharingTests.cpp
external/vulkancts/modules/vulkan/synchronization/vktSynchronizationWin32KeyedMutexTests.cpp
external/vulkancts/modules/vulkan/vktExternalMemoryUtil.cpp
external/vulkancts/modules/vulkan/vktExternalMemoryUtil.hpp
external/vulkancts/modules/vulkan/wsi/vktWsiSurfaceTests.cpp
external/vulkancts/modules/vulkan/ycbcr/vktYCbCrConversionTests.cpp
external/vulkancts/modules/vulkan/ycbcr/vktYCbCrFormatTests.cpp
external/vulkancts/modules/vulkan/ycbcr/vktYCbCrImageQueryTests.cpp
external/vulkancts/modules/vulkan/ycbcr/vktYCbCrViewTests.cpp

index 3bd7780..fbf03de 100644 (file)
@@ -602,7 +602,7 @@ tcu::TestStatus                                                     DedicatedAllocationBufferTestInstance::bufferCreateAndAllo
                }
 
                info.buffer = *buffer;
-               vk.getBufferMemoryRequirements2(vkDevice, &info, &memReqs); // get the proper size requirement
+               vk.getBufferMemoryRequirements2(vkDevice, &info, &memReqs);             // get the proper size requirement
 
                if (size > memReqs.memoryRequirements.size)
                {
index 5279918..295d2b7 100644 (file)
@@ -29,8 +29,8 @@
 #include "tcuTestLog.hpp"
 #include "vkPrograms.hpp"
 #include "vkRefUtil.hpp"
-#include "vkQueryUtil.hpp"
 #include "vktTestCase.hpp"
+#include "vkQueryUtil.hpp"
 
 namespace vkt
 {
@@ -207,14 +207,14 @@ tcu::TestStatus BufferDedicatedAllocation::createTestBuffer                               (VkDeviceSize
        const DeviceInterface&                          vk                                                              = context.getDeviceInterface();
        const deUint32                                          queueFamilyIndex                                = context.getUniversalQueueFamilyIndex();
        VkPhysicalDeviceMemoryProperties        memoryProperties;
-       VkMemoryDedicatedRequirements   dedicatedRequirements                   =
+       VkMemoryDedicatedRequirements           dedicatedRequirements                   =
        {
                VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS,                                // VkStructureType              sType;
                DE_NULL,                                                                                                                // const void*                  pNext;
                false,                                                                                                                  // VkBool32                             prefersDedicatedAllocation
                false                                                                                                                   // VkBool32                             requiresDedicatedAllocation
        };
-       VkMemoryRequirements2                   memReqs                                                 =
+       VkMemoryRequirements2                           memReqs                                                 =
        {
                VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2,                                                // VkStructureType              sType
                &dedicatedRequirements,                                                                                 // void*                                pNext
@@ -242,7 +242,7 @@ tcu::TestStatus BufferDedicatedAllocation::createTestBuffer                         (VkDeviceSize
                return tcu::TestStatus::fail("Buffer creation failed! (Error code: " + de::toString(error.getMessage()) + ")");
        }
 
-       VkBufferMemoryRequirementsInfo2 info                                                    =
+       VkBufferMemoryRequirementsInfo2 info                                                            =
        {
                VK_STRUCTURE_TYPE_BUFFER_MEMORY_REQUIREMENTS_INFO_2,                    // VkStructureType              sType
                DE_NULL,                                                                                                                // const void*                  pNext
@@ -269,10 +269,8 @@ tcu::TestStatus BufferDedicatedAllocation::createTestBuffer                                (VkDeviceSize
        vkInstance.getPhysicalDeviceMemoryProperties(vkPhysicalDevice, &memoryProperties);
 
        const deUint32                                          heapTypeIndex                                   = static_cast<deUint32>(deCtz32(memReqs.memoryRequirements.memoryTypeBits));
-       //const VkMemoryType                                    memoryType                                              = memoryProperties.memoryTypes[heapTypeIndex];
-       //const VkMemoryHeap                                    memoryHeap                                              = memoryProperties.memoryHeaps[memoryType.heapIndex];
 
-       vk.getBufferMemoryRequirements2(vkDevice, &info, &memReqs); // get the proper size requirement
+       vk.getBufferMemoryRequirements2(vkDevice, &info, &memReqs);                     // get the proper size requirement
 
        if (size > memReqs.memoryRequirements.size)
        {
@@ -419,21 +417,22 @@ tcu::TestStatus BufferViewTestInstance::iterate                                                   (void)
 
                for (deUint32 format = vk::VK_FORMAT_UNDEFINED + 1; format < VK_CORE_FORMAT_LAST; format++)
                {
-                       const std::string                               formatName              = de::toLower(getFormatName((VkFormat)format)).substr(10);
+                       const std::string                       formatName                                              = de::toLower(getFormatName((VkFormat)format)).substr(10);
                        de::MovePtr<tcu::TestCaseGroup> formatGroup             (new tcu::TestCaseGroup(testCtx, "suballocation", "BufferView Construction Tests for Suballocated Buffer"));
 
-                       const std::string                               testName                = de::toLower(getFormatName((VkFormat)format)).substr(10);
-                       const std::string                               testDescription = "vkBufferView test " + testName;
+                       const std::string                       testName                                                = de::toLower(getFormatName((VkFormat)format)).substr(10);
+                       const std::string                       testDescription                                 = "vkBufferView test " + testName;
 
                        {
-                               const BufferViewCaseParameters  testParams                                      =
+                               const BufferViewCaseParameters
+                                                                               testParams                                              =
                                {
-                                       static_cast<vk::VkFormat>(format),                                              // VkFormat                                     format;
-                                       0,                                                                                                              // VkDeviceSize                         offset;
-                                       range,                                                                                                  // VkDeviceSize                         range;
-                                       usage[usageNdx],                                                                                // VkBufferUsageFlags           usage;
-                                       feature[usageNdx],                                                                              // VkFormatFeatureFlags         flags;
-                                       static_cast<AllocationKind>(allocationKind)                             // AllocationKind                       bufferAllocationKind;
+                                       static_cast<vk::VkFormat>(format),                                      // VkFormat                                     format;
+                                       0,                                                                                                      // VkDeviceSize                         offset;
+                                       range,                                                                                          // VkDeviceSize                         range;
+                                       usage[usageNdx],                                                                        // VkBufferUsageFlags           usage;
+                                       feature[usageNdx],                                                                      // VkFormatFeatureFlags         flags;
+                                       static_cast<AllocationKind>(allocationKind)                     // AllocationKind                       bufferAllocationKind;
                                };
 
                                usageGroup->addChild(new BufferViewTestCase(testCtx, testName.c_str(), testDescription.c_str(), testParams));
index aaa657e..516b408 100644 (file)
@@ -64,8 +64,8 @@ namespace
 {
 
 vk::VkMemoryDedicatedRequirements getMemoryDedicatedRequirements (const vk::DeviceInterface&   vkd,
-                                                                                                                                 vk::VkDevice                          device,
-                                                                                                                                 vk::VkBuffer                          buffer)
+                                                                                                                                 vk::VkDevice                                  device,
+                                                                                                                                 vk::VkBuffer                                  buffer)
 {
        const vk::VkBufferMemoryRequirementsInfo2       requirementInfo                 =
        {
@@ -93,8 +93,8 @@ vk::VkMemoryDedicatedRequirements getMemoryDedicatedRequirements (const vk::Devi
 }
 
 vk::VkMemoryDedicatedRequirements getMemoryDedicatedRequirements (const vk::DeviceInterface&   vkd,
-                                                                                                                                 vk::VkDevice                          device,
-                                                                                                                                 vk::VkImage                           image)
+                                                                                                                                 vk::VkDevice                                  device,
+                                                                                                                                 vk::VkImage                                   image)
 {
        const vk::VkImageMemoryRequirementsInfo2        requirementInfo         =
        {
@@ -201,7 +201,7 @@ std::vector<std::string> getInstanceExtensions (const deUint32 instanceVersion,
        return instanceExtensions;
 }
 
-vk::Move<vk::VkInstance> createInstance (const vk::PlatformInterface&                                          vkp,
+vk::Move<vk::VkInstance> createInstance (const vk::PlatformInterface&                                  vkp,
                                                                                 const vk::VkExternalSemaphoreHandleTypeFlags   externalSemaphoreTypes,
                                                                                 const vk::VkExternalMemoryHandleTypeFlags              externalMemoryTypes,
                                                                                 const vk::VkExternalFenceHandleTypeFlags               externalFenceTypes)
@@ -221,14 +221,14 @@ vk::Move<vk::VkInstance> createInstance (const vk::PlatformInterface&                                             vkp,
        }
 }
 
-vk::Move<vk::VkDevice> createDevice (const deUint32                                                                            apiVersion,
-                                                                        const vk::InstanceInterface&                                           vki,
-                                                                        vk::VkPhysicalDevice                                                           physicalDevice,
+vk::Move<vk::VkDevice> createDevice (const deUint32                                                                    apiVersion,
+                                                                        const vk::InstanceInterface&                                   vki,
+                                                                        vk::VkPhysicalDevice                                                   physicalDevice,
                                                                         const vk::VkExternalSemaphoreHandleTypeFlags   externalSemaphoreTypes,
                                                                         const vk::VkExternalMemoryHandleTypeFlags              externalMemoryTypes,
                                                                         const vk::VkExternalFenceHandleTypeFlags               externalFenceTypes,
-                                                                        deUint32                                                                                       queueFamilyIndex,
-                                                                        bool                                                                                           useDedicatedAllocs = false)
+                                                                        deUint32                                                                               queueFamilyIndex,
+                                                                        bool                                                                                   useDedicatedAllocs = false)
 {
        std::vector<const char*>        deviceExtensions;
 
@@ -339,8 +339,8 @@ vk::VkQueue getQueue (const vk::DeviceInterface&    vkd,
        return queue;
 }
 
-void checkSemaphoreSupport (const vk::InstanceInterface&                                       vki,
-                                                       vk::VkPhysicalDevice                                                    device,
+void checkSemaphoreSupport (const vk::InstanceInterface&                               vki,
+                                                       vk::VkPhysicalDevice                                            device,
                                                        vk::VkExternalSemaphoreHandleTypeFlagBits       externalType)
 {
        const vk::VkPhysicalDeviceExternalSemaphoreInfo info            =
@@ -367,8 +367,8 @@ void checkSemaphoreSupport (const vk::InstanceInterface&                                    vki,
                TCU_THROW(NotSupportedError, "Semaphore doesn't support importing in external type");
 }
 
-void checkFenceSupport (const vk::InstanceInterface&                           vki,
-                                               vk::VkPhysicalDevice                                            device,
+void checkFenceSupport (const vk::InstanceInterface&                   vki,
+                                               vk::VkPhysicalDevice                                    device,
                                                vk::VkExternalFenceHandleTypeFlagBits   externalType)
 {
        const vk::VkPhysicalDeviceExternalFenceInfo     info            =
@@ -397,7 +397,7 @@ void checkFenceSupport (const vk::InstanceInterface&                                vki,
 
 void checkBufferSupport (const vk::InstanceInterface&                          vki,
                                                 vk::VkPhysicalDevice                                           device,
-                                                vk::VkExternalMemoryHandleTypeFlagBits externalType,
+                                                vk::VkExternalMemoryHandleTypeFlagBits         externalType,
                                                 vk::VkBufferViewCreateFlags                            createFlag,
                                                 vk::VkBufferUsageFlags                                         usageFlag,
                                                 bool                                                                           dedicated)
@@ -431,22 +431,22 @@ void checkBufferSupport (const vk::InstanceInterface&                             vki,
                TCU_THROW(NotSupportedError, "External handle type requires dedicated allocation");
 }
 
-void checkImageSupport (const vk::InstanceInterface&                           vki,
-                                                vk::VkPhysicalDevice                                           device,
-                                                vk::VkExternalMemoryHandleTypeFlagBits externalType,
-                                                vk::VkImageViewCreateFlags                                     createFlag,
-                                                vk::VkImageUsageFlags                                          usageFlag,
-                                                vk::VkFormat                                                           format,
-                                                vk::VkImageTiling                                                      tiling,
-                                                bool                                                                           dedicated)
+void checkImageSupport (const vk::InstanceInterface&                                           vki,
+                                                vk::VkPhysicalDevice                                                           device,
+                                                vk::VkExternalMemoryHandleTypeFlagBits                         externalType,
+                                                vk::VkImageViewCreateFlags                                                     createFlag,
+                                                vk::VkImageUsageFlags                                                          usageFlag,
+                                                vk::VkFormat                                                                           format,
+                                                vk::VkImageTiling                                                                      tiling,
+                                                bool                                                                                           dedicated)
 {
-       const vk::VkPhysicalDeviceExternalImageFormatInfo       externalInfo    =
+       const vk::VkPhysicalDeviceExternalImageFormatInfo       externalInfo            =
        {
                vk::VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_IMAGE_FORMAT_INFO,
                DE_NULL,
                externalType
        };
-       const vk::VkPhysicalDeviceImageFormatInfo2                      info                    =
+       const vk::VkPhysicalDeviceImageFormatInfo2                      info                            =
        {
                vk::VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2,
                &externalInfo,
@@ -630,13 +630,13 @@ tcu::TestStatus testSemaphoreWin32Create (Context&                                        context,
                        DXGI_SHARED_RESOURCE_READ | DXGI_SHARED_RESOURCE_WRITE,
                        DE_NULL
                };
-               const vk::VkExportSemaphoreCreateInfo           exportCreateInfo=
+               const vk::VkExportSemaphoreCreateInfo                   exportCreateInfo=
                {
                        vk::VK_STRUCTURE_TYPE_EXPORT_SEMAPHORE_CREATE_INFO,
                        &win32ExportInfo,
                        (vk::VkExternalMemoryHandleTypeFlags)config.externalType
                };
-               const vk::VkSemaphoreCreateInfo                         createInfo              =
+               const vk::VkSemaphoreCreateInfo                                 createInfo              =
                {
                        vk::VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO,
                        &exportCreateInfo,
@@ -647,12 +647,12 @@ tcu::TestStatus testSemaphoreWin32Create (Context&                                        context,
                if (transference == TRANSFERENCE_COPY)
                        submitDummySignal(vkd, queue, *semaphore);
 
-               NativeHandle                                            handleA;
+               NativeHandle                                                                    handleA;
                getSemaphoreNative(vkd, *device, *semaphore, config.externalType, handleA);
 
                {
-                       const vk::VkSemaphoreImportFlags        flags           = config.permanence == PERMANENCE_TEMPORARY ? vk::VK_SEMAPHORE_IMPORT_TEMPORARY_BIT : (vk::VkSemaphoreImportFlagBits)0u;
-                       const vk::Unique<vk::VkSemaphore>       semaphoreA      (createAndImportSemaphore(vkd, *device, config.externalType, handleA, flags));
+                       const vk::VkSemaphoreImportFlags                        flags                   = config.permanence == PERMANENCE_TEMPORARY ? vk::VK_SEMAPHORE_IMPORT_TEMPORARY_BIT : (vk::VkSemaphoreImportFlagBits)0u;
+                       const vk::Unique<vk::VkSemaphore>                       semaphoreA              (createAndImportSemaphore(vkd, *device, config.externalType, handleA, flags));
 
                        if (transference == TRANSFERENCE_COPY)
                                submitDummyWait(vkd, queue, *semaphoreA);
@@ -1490,20 +1490,20 @@ tcu::TestStatus testSemaphoreFdSendOverSocket (Context&                                         context,
 
 tcu::TestStatus testFenceQueries (Context& context, vk::VkExternalFenceHandleTypeFlagBits externalType)
 {
-       const vk::PlatformInterface&            vkp                             (context.getPlatformInterface());
-       const vk::Unique<vk::VkInstance>        instance                (createInstance(vkp, 0u, 0u, externalType));
-       const vk::InstanceDriver                        vki                             (vkp, *instance);
-       const vk::VkPhysicalDevice                      device                  (vk::chooseDevice(vki, *instance, context.getTestContext().getCommandLine()));
+       const vk::PlatformInterface&                                    vkp                     (context.getPlatformInterface());
+       const vk::Unique<vk::VkInstance>                                instance        (createInstance(vkp, 0u, 0u, externalType));
+       const vk::InstanceDriver                                                vki                     (vkp, *instance);
+       const vk::VkPhysicalDevice                                              device          (vk::chooseDevice(vki, *instance, context.getTestContext().getCommandLine()));
 
-       TestLog&                                                        log                             = context.getTestContext().getLog();
+       TestLog&                                                                                log                     = context.getTestContext().getLog();
 
-       const vk::VkPhysicalDeviceExternalFenceInfo     info                    =
+       const vk::VkPhysicalDeviceExternalFenceInfo             info            =
        {
                vk::VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_FENCE_INFO,
                DE_NULL,
                externalType
        };
-       vk::VkExternalFenceProperties                           properties      =
+       vk::VkExternalFenceProperties                                   properties      =
        {
                vk::VK_STRUCTURE_TYPE_EXTERNAL_FENCE_PROPERTIES,
                DE_NULL,
@@ -1561,7 +1561,7 @@ tcu::TestStatus testFenceWin32Create (Context&                            context,
                        DXGI_SHARED_RESOURCE_READ | DXGI_SHARED_RESOURCE_WRITE,
                        DE_NULL
                };
-               const vk::VkExportFenceCreateInfo               exportCreateInfo=
+               const vk::VkExportFenceCreateInfo                       exportCreateInfo=
                {
                        vk::VK_STRUCTURE_TYPE_EXPORT_FENCE_CREATE_INFO,
                        &win32ExportInfo,
@@ -1573,17 +1573,17 @@ tcu::TestStatus testFenceWin32Create (Context&                          context,
                        &exportCreateInfo,
                        0u
                };
-               const vk::Unique<vk::VkFence>                           fence           (vk::createFence(vkd, *device, &createInfo));
+               const vk::Unique<vk::VkFence>                           fence                   (vk::createFence(vkd, *device, &createInfo));
 
                if (transference == TRANSFERENCE_COPY)
                        submitDummySignal(vkd, queue, *fence);
 
-               NativeHandle                                            handleA;
+               NativeHandle                                                            handleA;
                getFenceNative(vkd, *device, *fence, config.externalType, handleA);
 
                {
-                       const vk::VkFenceImportFlags    flags   = config.permanence == PERMANENCE_TEMPORARY ? vk::VK_FENCE_IMPORT_TEMPORARY_BIT : (vk::VkFenceImportFlagBits)0u;
-                       const vk::Unique<vk::VkFence>   fenceA  (createAndImportFence(vkd, *device, config.externalType, handleA, flags));
+                       const vk::VkFenceImportFlags                    flags                   = config.permanence == PERMANENCE_TEMPORARY ? vk::VK_FENCE_IMPORT_TEMPORARY_BIT : (vk::VkFenceImportFlagBits)0u;
+                       const vk::Unique<vk::VkFence>                   fenceA                  (createAndImportFence(vkd, *device, config.externalType, handleA, flags));
 
                        if (transference == TRANSFERENCE_COPY)
                                VK_CHECK(vkd.waitForFences(*device, 1u, &*fenceA, VK_TRUE, ~0ull));
@@ -2453,7 +2453,7 @@ tcu::TestStatus testFenceFdSendOverSocket (Context&                                       context,
                                        }
                                        else
                                        {
-                                               const vk::VkFenceImportFlags    flags   = config.permanence == PERMANENCE_TEMPORARY ? vk::VK_FENCE_IMPORT_TEMPORARY_BIT : (vk::VkFenceImportFlagBits)0u;
+                                               const vk::VkFenceImportFlags            flags   = config.permanence == PERMANENCE_TEMPORARY ? vk::VK_FENCE_IMPORT_TEMPORARY_BIT : (vk::VkFenceImportFlagBits)0u;
                                                const cmsghdr* const                            cmsg    = CMSG_FIRSTHDR(&msg);
                                                int                                                                     newFd_;
                                                deMemcpy(&newFd_, CMSG_DATA(cmsg), sizeof(int));
@@ -2542,7 +2542,7 @@ tcu::TestStatus testBufferQueries (Context& context, vk::VkExternalMemoryHandleT
                        usageFlag,
                        externalType
                };
-               vk::VkExternalBufferProperties                          properties              =
+               vk::VkExternalBufferProperties                                  properties              =
                {
                        vk::VK_STRUCTURE_TYPE_EXTERNAL_BUFFER_PROPERTIES,
                        DE_NULL,
@@ -2598,7 +2598,7 @@ tcu::TestStatus testBufferQueries (Context& context, vk::VkExternalMemoryHandleT
                        if (deviceHasDedicated)
                        {
                                const vk::Unique<vk::VkBuffer>                          buffer                                          (createExternalBuffer(*vkd, *device, queueFamilyIndex, externalType, 1024u, createFlag, usageFlag));
-                               const vk::VkMemoryDedicatedRequirements reqs                                            (getMemoryDedicatedRequirements(*vkd, *device, *buffer));
+                               const vk::VkMemoryDedicatedRequirements         reqs                                            (getMemoryDedicatedRequirements(*vkd, *device, *buffer));
                                const bool                                                                      propertiesRequiresDedicated     = (properties.externalMemoryProperties.externalMemoryFeatures & vk::VK_EXTERNAL_MEMORY_FEATURE_DEDICATED_ONLY_BIT) != 0;
                                const bool                                                                      objectRequiresDedicated         = (reqs.requiresDedicatedAllocation != VK_FALSE);
 
@@ -3172,8 +3172,8 @@ tcu::TestStatus testMemoryFdSendOverSocket (Context& context, MemoryTestConfig c
 
 struct BufferTestConfig
 {
-                                                                                               BufferTestConfig        (vk::VkExternalMemoryHandleTypeFlagBits externalType_,
-                                                                                                                                        bool                                                                           dedicated_)
+                                                                                       BufferTestConfig        (vk::VkExternalMemoryHandleTypeFlagBits         externalType_,
+                                                                                                                                bool                                                                           dedicated_)
                : externalType  (externalType_)
                , dedicated             (dedicated_)
        {
@@ -3334,13 +3334,13 @@ tcu::TestStatus testImageQueries (Context& context, vk::VkExternalMemoryHandleTy
                const vk::VkFormat                                                                              format                  = vk::VK_FORMAT_R8G8B8A8_UNORM;
                const vk::VkImageType                                                                   type                    = vk::VK_IMAGE_TYPE_2D;
                const vk::VkImageTiling                                                                 tiling                  = vk::VK_IMAGE_TILING_OPTIMAL;
-               const vk::VkPhysicalDeviceExternalImageFormatInfo       externalInfo    =
+               const vk::VkPhysicalDeviceExternalImageFormatInfo               externalInfo    =
                {
                        vk::VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_IMAGE_FORMAT_INFO,
                        DE_NULL,
                        externalType
                };
-               const vk::VkPhysicalDeviceImageFormatInfo2                      info                    =
+               const vk::VkPhysicalDeviceImageFormatInfo2                              info                    =
                {
                        vk::VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2,
                        &externalInfo,
@@ -3351,13 +3351,13 @@ tcu::TestStatus testImageQueries (Context& context, vk::VkExternalMemoryHandleTy
                        usageFlag,
                        createFlag,
                };
-               vk::VkExternalImageFormatProperties                                     externalProperties      =
+               vk::VkExternalImageFormatProperties                                             externalProperties      =
                {
                        vk::VK_STRUCTURE_TYPE_EXTERNAL_IMAGE_FORMAT_PROPERTIES,
                        DE_NULL,
                        { 0u, 0u, 0u }
                };
-               vk::VkImageFormatProperties2                                            properties                      =
+               vk::VkImageFormatProperties2                                                    properties                      =
                {
                        vk::VK_STRUCTURE_TYPE_IMAGE_FORMAT_PROPERTIES_2,
                        &externalProperties,
@@ -3418,7 +3418,7 @@ tcu::TestStatus testImageQueries (Context& context, vk::VkExternalMemoryHandleTy
                        if (deviceHasDedicated)
                        {
                                const vk::Unique<vk::VkImage>                           image                                           (createExternalImage(*vkd, *device, queueFamilyIndex, externalType, format, 16u, 16u, tiling, createFlag, usageFlag));
-                               const vk::VkMemoryDedicatedRequirements reqs                                            (getMemoryDedicatedRequirements(*vkd, *device, *image));
+                               const vk::VkMemoryDedicatedRequirements         reqs                                            (getMemoryDedicatedRequirements(*vkd, *device, *image));
                                const bool                                                                      propertiesRequiresDedicated     = (externalProperties.externalMemoryProperties.externalMemoryFeatures & vk::VK_EXTERNAL_MEMORY_FEATURE_DEDICATED_ONLY_BIT) != 0;
                                const bool                                                                      objectRequiresDedicated         = (reqs.requiresDedicatedAllocation != VK_FALSE);
 
@@ -3441,15 +3441,15 @@ tcu::TestStatus testImageQueries (Context& context, vk::VkExternalMemoryHandleTy
 
 struct ImageTestConfig
 {
-                                                                                               ImageTestConfig (vk::VkExternalMemoryHandleTypeFlagBits externalType_,
-                                                                                                                                bool                                                                           dedicated_)
+                                                                                       ImageTestConfig (vk::VkExternalMemoryHandleTypeFlagBits         externalType_,
+                                                                                                                        bool                                                                           dedicated_)
                : externalType  (externalType_)
                , dedicated             (dedicated_)
        {
        }
 
        vk::VkExternalMemoryHandleTypeFlagBits  externalType;
-       bool                                                                            dedicated;
+       bool                                                                    dedicated;
 };
 
 tcu::TestStatus testImageBindExportImportBind (Context&                                        context,
index 63389e5..94fea3c 100644 (file)
@@ -2559,7 +2559,7 @@ tcu::TestStatus deviceFeatures2 (Context& context)
        for (size_t deviceNdx = 0; deviceNdx < devices.size(); ++deviceNdx)
        {
                VkPhysicalDeviceFeatures                coreFeatures;
-               VkPhysicalDeviceFeatures2       extFeatures;
+               VkPhysicalDeviceFeatures2               extFeatures;
 
                deMemset(&coreFeatures, 0xcd, sizeof(coreFeatures));
                deMemset(&extFeatures.features, 0xcd, sizeof(extFeatures.features));
@@ -2589,7 +2589,7 @@ tcu::TestStatus deviceProperties2 (Context& context)
 
        for (size_t deviceNdx = 0; deviceNdx < devices.size(); ++deviceNdx)
        {
-               VkPhysicalDeviceProperties              coreProperties;
+               VkPhysicalDeviceProperties      coreProperties;
                VkPhysicalDeviceProperties2     extProperties;
 
                extProperties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2;
@@ -2635,7 +2635,7 @@ tcu::TestStatus deviceFormatProperties2 (Context& context)
                {
                        const VkFormat                  format                  = (VkFormat)formatNdx;
                        VkFormatProperties              coreProperties;
-                       VkFormatProperties2     extProperties;
+                       VkFormatProperties2             extProperties;
 
                        deMemset(&coreProperties, 0xcd, sizeof(VkFormatProperties));
                        deMemset(&extProperties, 0xcd, sizeof(VkFormatProperties2));
index 3ec9f16..a138d18 100644 (file)
@@ -579,7 +579,7 @@ tcu::TestStatus testLargePoints (Context& context)
                {
                        case VK_POINT_CLIPPING_BEHAVIOR_ALL_CLIP_PLANES:                pointClippingOutside = true;                            break;
                        case VK_POINT_CLIPPING_BEHAVIOR_USER_CLIP_PLANES_ONLY:  pointClippingOutside = false;                           break;
-                       case invalidClippingBehavior:                                                           TCU_FAIL("Clipping behavior read failure");     break;
+                       case invalidClippingBehavior:                                                   TCU_FAIL("Clipping behavior read failure");     break;
                        default:
                        {
                                TCU_FAIL("Unexpected clipping behavior reported");
index 47e1e29..5b25575 100644 (file)
@@ -2413,7 +2413,7 @@ void ComputeTestInstance::createDeviceGroup (void)
                deviceExtensions.push_back("VK_KHR_device_group");
        deviceExtensions.push_back("VK_KHR_swapchain");
 
-       VkDeviceGroupDeviceCreateInfo                           deviceGroupInfo =
+       VkDeviceGroupDeviceCreateInfo                                   deviceGroupInfo                 =
        {
                VK_STRUCTURE_TYPE_DEVICE_GROUP_DEVICE_CREATE_INFO_KHR,                                                          //stype
                DE_NULL,                                                                                                                                                        //pNext
@@ -2421,8 +2421,8 @@ void ComputeTestInstance::createDeviceGroup (void)
                devGroupProperties[devGroupIdx].physicalDevices                                                                         //physicalDevices
        };
        InstanceDriver                                                                  instance                                (m_context.getPlatformInterface(), m_deviceGroupInstance.get());
-       const VkPhysicalDeviceFeatures                                  deviceFeatures  =               getPhysicalDeviceFeatures(instance, deviceGroupInfo.pPhysicalDevices[physDeviceIdx]);
-       const std::vector<VkQueueFamilyProperties>              queueProps              =               getPhysicalDeviceQueueFamilyProperties(instance, devGroupProperties[devGroupIdx].physicalDevices[physDeviceIdx]);
+       const VkPhysicalDeviceFeatures                                  deviceFeatures                  = getPhysicalDeviceFeatures(instance, deviceGroupInfo.pPhysicalDevices[physDeviceIdx]);
+       const std::vector<VkQueueFamilyProperties>              queueProps                              = getPhysicalDeviceQueueFamilyProperties(instance, devGroupProperties[devGroupIdx].physicalDevices[physDeviceIdx]);
 
        m_physicalDevices.resize(m_numPhysDevices);
        for (deUint32 physDevIdx = 0; physDevIdx < m_numPhysDevices; physDevIdx++)
@@ -2434,7 +2434,7 @@ void ComputeTestInstance::createDeviceGroup (void)
                        m_queueFamilyIndex = (deUint32)queueNdx;
        }
 
-       VkDeviceQueueCreateInfo                                                 queueInfo               =
+       VkDeviceQueueCreateInfo                                                 queueInfo                               =
        {
                VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO,             // VkStructureType                                      sType;
                DE_NULL,                                                                                // const void*                                          pNext;
@@ -2444,7 +2444,7 @@ void ComputeTestInstance::createDeviceGroup (void)
                &queuePriority                                                                  // const float*                                         pQueuePriorities;
        };
 
-       const VkDeviceCreateInfo                                                deviceInfo              =
+       const VkDeviceCreateInfo                                                deviceInfo                              =
        {
                VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO,                   // VkStructureType                                      sType;
                &deviceGroupInfo,                                                               // const void*                                          pNext;
index 91510f7..0586b15 100644 (file)
@@ -1161,7 +1161,8 @@ void UploadDownloadExecutor::uploadClear(Context& context)
 
 void UploadDownloadExecutor::uploadStore(Context& context)
 {
-       const vk::VkImageViewUsageCreateInfo viewUsageCreateInfo = {
+       const vk::VkImageViewUsageCreateInfo viewUsageCreateInfo =
+       {
                VK_STRUCTURE_TYPE_IMAGE_VIEW_USAGE_CREATE_INFO_KHR,     // VkStructureType              sType
                DE_NULL,                                                                                        // const void*                  pNext
                VK_IMAGE_USAGE_STORAGE_BIT,                                                     // VkImageUsageFlags    usage;
@@ -1338,7 +1339,8 @@ void UploadDownloadExecutor::uploadDraw(Context& context)
 
        for (deUint32 subpassNdx = 0; subpassNdx < m_caseDef.numLayers; ++subpassNdx)
        {
-               const vk::VkImageViewUsageCreateInfo viewUsageCreateInfo = {
+               const vk::VkImageViewUsageCreateInfo viewUsageCreateInfo =
+               {
                        VK_STRUCTURE_TYPE_IMAGE_VIEW_USAGE_CREATE_INFO_KHR,     // VkStructureType              sType
                        DE_NULL,                                                                                        // const void*                  pNext
                        VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT,                            // VkImageUsageFlags    usage;
@@ -1416,7 +1418,8 @@ void UploadDownloadExecutor::downloadTexture(Context& context, VkBuffer buffer)
        m_dTex.outImageAlloc                            = bindImage(m_vk, m_device, m_allocator, *m_dTex.outImage, MemoryRequirement::Any);
        m_dTex.outImageView                                     = makeImageView(m_vk, m_device, *m_dTex.outImage, getImageViewType(m_caseDef.imageType), m_caseDef.viewFormat, makeColorSubresourceRange(0, m_caseDef.numLayers));
 
-       const vk::VkImageViewUsageCreateInfo viewUsageCreateInfo = {
+       const vk::VkImageViewUsageCreateInfo viewUsageCreateInfo =
+       {
                VK_STRUCTURE_TYPE_IMAGE_VIEW_USAGE_CREATE_INFO_KHR,     // VkStructureType              sType
                DE_NULL,                                                                                        // const void*                  pNext
                VK_IMAGE_USAGE_SAMPLED_BIT,                                                     // VkImageUsageFlags    usage;
@@ -1497,7 +1500,8 @@ void UploadDownloadExecutor::downloadLoad(Context& context, VkBuffer buffer)
        m_dLoad.outImageAlloc                           = bindImage(m_vk, m_device, m_allocator, *m_dLoad.outImage, MemoryRequirement::Any);
        m_dLoad.outImageView                            = makeImageView(m_vk, m_device, *m_dLoad.outImage, getImageViewType(m_caseDef.imageType), m_caseDef.viewFormat, makeColorSubresourceRange(0, m_caseDef.numLayers));
 
-       const vk::VkImageViewUsageCreateInfo viewUsageCreateInfo = {
+       const vk::VkImageViewUsageCreateInfo viewUsageCreateInfo =
+       {
                VK_STRUCTURE_TYPE_IMAGE_VIEW_USAGE_CREATE_INFO_KHR,     // VkStructureType              sType
                DE_NULL,                                                                                        // const void*                  pNext
                VK_IMAGE_USAGE_STORAGE_BIT,                                                     // VkImageUsageFlags    usage;
index 6117c0e..6bf1a89 100644 (file)
@@ -156,7 +156,7 @@ vk::Move<vk::VkImageView>                   makeImageView                                   (const vk::DeviceInterface&                                     vk
                                                                                                                                         const vk::VkImageViewType                                      imageViewType,
                                                                                                                                         const vk::VkFormat                                                     format,
                                                                                                                                         const vk::VkImageSubresourceRange                      subresourceRange,
-                                                                                                                                        const vk::VkImageViewUsageCreateInfo*  ImageUsageCreateInfoKHR = DE_NULL);
+                                                                                                                                        const vk::VkImageViewUsageCreateInfo*          ImageUsageCreateInfoKHR = DE_NULL);
 
 vk::Move<vk::VkDescriptorSet>          makeDescriptorSet                               (const vk::DeviceInterface&                                     vk,
                                                                                                                                         const vk::VkDevice                                                     device,
index 9a912f7..106a587 100644 (file)
@@ -190,12 +190,12 @@ void BaseAllocateTestInstance::createDeviceGroup (void)
 
        VkDeviceQueueCreateInfo                                                 queueInfo               =
        {
-               VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO,             // VkStructureType                                      sType;
-               DE_NULL,                                                                                // const void*                                          pNext;
-               (VkDeviceQueueCreateFlags)0u,                                   // VkDeviceQueueCreateFlags                     flags;
-               queueFamilyIndex,                                                               // deUint32                                                     queueFamilyIndex;
-               1u,                                                                                             // deUint32                                                     queueCount;
-               &queuePriority                                                                  // const float*                                         pQueuePriorities;
+               VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO,                                     // VkStructureType                                      sType;
+               DE_NULL,                                                                                                        // const void*                                          pNext;
+               (VkDeviceQueueCreateFlags)0u,                                                           // VkDeviceQueueCreateFlags                     flags;
+               queueFamilyIndex,                                                                                       // deUint32                                                     queueFamilyIndex;
+               1u,                                                                                                                     // deUint32                                                     queueCount;
+               &queuePriority                                                                                          // const float*                                         pQueuePriorities;
        };
 
        const VkDeviceCreateInfo                                                deviceInfo              =
@@ -208,7 +208,7 @@ void BaseAllocateTestInstance::createDeviceGroup (void)
                0u,                                                                                                                     // uint32_t                                                     enabledLayerCount;
                DE_NULL,                                                                                                        // const char* const*                           ppEnabledLayerNames;
                deUint32(deviceExtensions.size()),                                                      // uint32_t                                                     enabledExtensionCount;
-               deviceExtensions.empty() ? DE_NULL : &deviceExtensions[0],      // const char* const*                           ppEnabledExtensionNames;
+               deviceExtensions.empty() ? DE_NULL : &deviceExtensions[0],      // const char* const*   ppEnabledExtensionNames;
                &deviceFeatures,                                                                                        // const VkPhysicalDeviceFeatures*      pEnabledFeatures;
        };
        m_logicalDevice         = createDevice(instance, deviceGroupInfo.pPhysicalDevices[physDeviceIdx], &deviceInfo);
index 167a4b7..8e5e572 100644 (file)
@@ -351,24 +351,24 @@ Move<VkBuffer> makeBuffer(const DeviceInterface& vk, VkDevice device, VkDeviceSi
 
 VkMemoryRequirements getImageMemoryRequirements(const DeviceInterface& vk, VkDevice device, Move<VkImage>& image)
 {
-       VkImageMemoryRequirementsInfo2  info                                                    =
+       VkImageMemoryRequirementsInfo2  info                                                            =
        {
-               VK_STRUCTURE_TYPE_IMAGE_MEMORY_REQUIREMENTS_INFO_2,                     // VkStructureType                      sType
-               DE_NULL,                                                                                                        // const void*                          pNext
-               *image                                                                                                          // VkImage                                      image
+               VK_STRUCTURE_TYPE_IMAGE_MEMORY_REQUIREMENTS_INFO_2,                             // VkStructureType                      sType
+               DE_NULL,                                                                                                                // const void*                          pNext
+               *image                                                                                                                  // VkImage                                      image
        };
-       VkMemoryDedicatedRequirements   dedicatedRequirements                   =
+       VkMemoryDedicatedRequirements   dedicatedRequirements                           =
        {
-               VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS,                        // VkStructureType                      sType
-               DE_NULL,                                                                                                        // const void*                          pNext
-               VK_FALSE,                                                                                                       // VkBool32                                     prefersDedicatedAllocation
-               VK_FALSE                                                                                                        // VkBool32                                     requiresDedicatedAllocation
+               VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS,                                // VkStructureType                      sType
+               DE_NULL,                                                                                                                // const void*                          pNext
+               VK_FALSE,                                                                                                               // VkBool32                                     prefersDedicatedAllocation
+               VK_FALSE                                                                                                                // VkBool32                                     requiresDedicatedAllocation
        };
-       VkMemoryRequirements2                   req2                                                    =
+       VkMemoryRequirements2                   req2                                                            =
        {
-               VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2,                                        // VkStructureType                      sType
-               &dedicatedRequirements,                                                                         // void*                                        pNext
-               {0, 0, 0}                                                                                                       // VkMemoryRequirements         memoryRequirements
+               VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2,                                                // VkStructureType                      sType
+               &dedicatedRequirements,                                                                                 // void*                                        pNext
+               {0, 0, 0}                                                                                                               // VkMemoryRequirements         memoryRequirements
        };
 
        vk.getImageMemoryRequirements2(device, &info, &req2);
@@ -378,24 +378,24 @@ VkMemoryRequirements getImageMemoryRequirements(const DeviceInterface& vk, VkDev
 
 VkMemoryRequirements getBufferMemoryRequirements(const DeviceInterface& vk, VkDevice device, Move<VkBuffer>& buffer)
 {
-       VkBufferMemoryRequirementsInfo2 info                                                    =
+       VkBufferMemoryRequirementsInfo2 info                                                            =
        {
-               VK_STRUCTURE_TYPE_BUFFER_MEMORY_REQUIREMENTS_INFO_2,            // VkStructureType                      sType
-               DE_NULL,                                                                                                        // const void*                          pNext
-               *buffer                                                                                                         // VkImage                                      image
+               VK_STRUCTURE_TYPE_BUFFER_MEMORY_REQUIREMENTS_INFO_2,                    // VkStructureType                      sType
+               DE_NULL,                                                                                                                // const void*                          pNext
+               *buffer                                                                                                                 // VkImage                                      image
        };
-       VkMemoryDedicatedRequirements   dedicatedRequirements                   =
+       VkMemoryDedicatedRequirements   dedicatedRequirements                           =
        {
-               VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS,                        // VkStructureType                      sType
-               DE_NULL,                                                                                                        // const void*                          pNext
-               VK_FALSE,                                                                                                       // VkBool32                                     prefersDedicatedAllocation
-               VK_FALSE                                                                                                        // VkBool32                                     requiresDedicatedAllocation
+               VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS,                                // VkStructureType                      sType
+               DE_NULL,                                                                                                                // const void*                          pNext
+               VK_FALSE,                                                                                                               // VkBool32                                     prefersDedicatedAllocation
+               VK_FALSE                                                                                                                // VkBool32                                     requiresDedicatedAllocation
        };
-       VkMemoryRequirements2                   req2                                                    =
+       VkMemoryRequirements2                   req2                                                            =
        {
-               VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2,                                        // VkStructureType              sType
-               &dedicatedRequirements,                                                                         // void*                                pNext
-               {0, 0, 0}                                                                                                       // VkMemoryRequirements memoryRequirements
+               VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2,                                                // VkStructureType              sType
+               &dedicatedRequirements,                                                                                 // void*                                pNext
+               {0, 0, 0}                                                                                                               // VkMemoryRequirements memoryRequirements
        };
 
        vk.getBufferMemoryRequirements2(device, &info, &req2);
index 567ee34..c3ef658 100644 (file)
@@ -343,8 +343,8 @@ TestParameters MultiViewRenderTestInstance::fillMissingParameters (const TestPar
                if (!isDeviceExtensionSupported(m_context.getUsedApiVersion(), m_context.getDeviceExtensions(), "VK_KHR_multiview"))
                        throw tcu::NotSupportedError("VK_KHR_multiview is not supported");
 
-               const InstanceInterface&        instance                = m_context.getInstanceInterface();
-               const VkPhysicalDevice          physicalDevice  = m_context.getPhysicalDevice();
+               const InstanceInterface&                        instance                        = m_context.getInstanceInterface();
+               const VkPhysicalDevice                          physicalDevice          = m_context.getPhysicalDevice();
 
                VkPhysicalDeviceMultiviewProperties multiviewProperties =
                {
@@ -374,9 +374,9 @@ TestParameters MultiViewRenderTestInstance::fillMissingParameters (const TestPar
 
 void MultiViewRenderTestInstance::createVertexBuffer (void)
 {
-       const VkDeviceSize                                              vertexDataSize  = static_cast<VkDeviceSize>(deAlignSize(static_cast<size_t>( m_data.size() * sizeof(VertexData)),
-                                                                                                                       static_cast<size_t>(m_context.getDeviceProperties().limits.nonCoherentAtomSize)));
-       const VkBufferCreateInfo                                bufferInfo              = makeBufferCreateInfo(vertexDataSize, VK_BUFFER_USAGE_VERTEX_BUFFER_BIT);
+       const VkDeviceSize                                              vertexDataSize                  = static_cast<VkDeviceSize>(deAlignSize(static_cast<size_t>( m_data.size() * sizeof(VertexData)),
+                                                                                                                                       static_cast<size_t>(m_context.getDeviceProperties().limits.nonCoherentAtomSize)));
+       const VkBufferCreateInfo                                bufferInfo                              = makeBufferCreateInfo(vertexDataSize, VK_BUFFER_USAGE_VERTEX_BUFFER_BIT);
 
        m_vertexBuffer          = createBuffer(*m_device, *m_logicalDevice, &bufferInfo);
        m_allocationBuffer      = m_allocator->allocate(getBufferMemoryRequirements(*m_device, *m_logicalDevice, *m_vertexBuffer),  MemoryRequirement::HostVisible);
@@ -402,26 +402,26 @@ void MultiViewRenderTestInstance::createMultiViewDevices (void)
        const float                                                             queuePriorities                 = 1.0f;
        const VkDeviceQueueCreateInfo                   queueInfo                               =
        {
-               VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO,     //VkStructureType                       sType;
-               DE_NULL,                                                                        //const void*                           pNext;
-               (VkDeviceQueueCreateFlags)0u,                           //VkDeviceQueueCreateFlags      flags;
-               m_queueFamilyIndex,                                                     //deUint32                                      queueFamilyIndex;
-               1u,                                                                                     //deUint32                                      queueCount;
-               &queuePriorities                                                        //const float*                          pQueuePriorities;
+               VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO,                                     //VkStructureType                       sType;
+               DE_NULL,                                                                                                        //const void*                           pNext;
+               (VkDeviceQueueCreateFlags)0u,                                                           //VkDeviceQueueCreateFlags      flags;
+               m_queueFamilyIndex,                                                                                     //deUint32                                      queueFamilyIndex;
+               1u,                                                                                                                     //deUint32                                      queueCount;
+               &queuePriorities                                                                                        //const float*                          pQueuePriorities;
        };
 
-       VkPhysicalDeviceMultiviewFeatures       multiviewFeatures               =
+       VkPhysicalDeviceMultiviewFeatures               multiviewFeatures               =
        {
-               VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES_KHR,       // VkStructureType      sType;
-               DE_NULL,                                                                                                        // void*                        pNext;
-               DE_FALSE,                                                                                                       // VkBool32                     multiview;
-               DE_FALSE,                                                                                                       // VkBool32                     multiviewGeometryShader;
-               DE_FALSE,                                                                                                       // VkBool32                     multiviewTessellationShader;
+               VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES_KHR,       // VkStructureType                      sType;
+               DE_NULL,                                                                                                        // void*                                        pNext;
+               DE_FALSE,                                                                                                       // VkBool32                                     multiview;
+               DE_FALSE,                                                                                                       // VkBool32                                     multiviewGeometryShader;
+               DE_FALSE,                                                                                                       // VkBool32                                     multiviewTessellationShader;
        };
 
-       VkPhysicalDeviceFeatures2                       enabledFeatures;
-       enabledFeatures.sType                           = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2;
-       enabledFeatures.pNext                           = &multiviewFeatures;
+       VkPhysicalDeviceFeatures2                               enabledFeatures;
+       enabledFeatures.sType                                   = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2;
+       enabledFeatures.pNext                                   = &multiviewFeatures;
 
        instance.getPhysicalDeviceFeatures2(physicalDevice, &enabledFeatures);
 
@@ -439,7 +439,7 @@ void MultiViewRenderTestInstance::createMultiViewDevices (void)
        if (TEST_TYPE_VIEW_INDEX_IN_TESELLATION == m_parameters.viewIndex && !multiviewFeatures.multiviewTessellationShader)
                TCU_THROW(NotSupportedError, "Tessellation shader is not supported");
 
-       VkPhysicalDeviceMultiviewProperties     multiviewProperties             =
+       VkPhysicalDeviceMultiviewProperties     multiviewProperties                     =
        {
                VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES_KHR,     //VkStructureType       sType;
                DE_NULL,                                                                                                        //void*                         pNext;
@@ -510,11 +510,11 @@ void MultiViewRenderTestInstance::createCommandBuffer (void)
        {
                const VkCommandBufferAllocateInfo cmdBufferAllocateInfo =
                {
-                       VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType                      sType;
-                       DE_NULL,                                                                                // const void*                          pNext;
-                       *m_cmdPool,                                                                             // VkCommandPool                        commandPool;
-                       VK_COMMAND_BUFFER_LEVEL_PRIMARY,                                // VkCommandBufferLevel         level;
-                       1u,                                                                                             // deUint32                                     bufferCount;
+                       VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO,         // VkStructureType              sType;
+                       DE_NULL,                                                                                        // const void*                  pNext;
+                       *m_cmdPool,                                                                                     // VkCommandPool                commandPool;
+                       VK_COMMAND_BUFFER_LEVEL_PRIMARY,                                        // VkCommandBufferLevel level;
+                       1u,                                                                                                     // deUint32                             bufferCount;
                };
                m_cmdBuffer     = allocateCommandBuffer(*m_device, *m_logicalDevice, &cmdBufferAllocateInfo);
        }
@@ -623,7 +623,7 @@ Move<VkPipeline> MultiViewRenderTestInstance::makeGraphicsPipeline (const VkRend
                VK_FALSE,                                                                                                                                                                                                                                                                       // VkBool32                                                                     primitiveRestartEnable;
        };
 
-       const VkViewport                                                                viewport                                                =
+       const VkViewport                                                                viewport                                                        =
        {
                0.0f,                                                           // float        originX;
                0.0f,                                                           // float        originY;
@@ -633,7 +633,7 @@ Move<VkPipeline> MultiViewRenderTestInstance::makeGraphicsPipeline (const VkRend
                1.0f                                                            // float        maxDepth;
        };
 
-       const VkRect2D                                                                  scissor                                                 =
+       const VkRect2D                                                                  scissor                                                         =
        {
                { 0, 0 },                                                                                                       // VkOffset2D   offset;
                { m_parameters.extent.width, m_parameters.extent.height }       // VkExtent2D   extent;
index 6c85f4f..00581b1 100644 (file)
@@ -184,68 +184,68 @@ Move<VkDescriptorSetLayout> makeDescriptorSetLayout (const DeviceInterface&               vk,
        return vk::createDescriptorSetLayout(vk, device, &createInfo);
 }
 
-Move<VkRenderPass> makeRenderPass (const DeviceInterface&      vk,
-                                                                  const VkDevice                       device,
-                                                                  const VkFormat                       colorFormat,
-                                                                  const vector<deUint32>&      viewMasks)
+Move<VkRenderPass> makeRenderPass (const DeviceInterface&              vk,
+                                                                  const VkDevice                               device,
+                                                                  const VkFormat                               colorFormat,
+                                                                  const vector<deUint32>&              viewMasks)
 {
        const deUint32                                                          subpassCount                            = static_cast<deUint32>(viewMasks.size());
        const VkAttachmentDescription                           colorAttachmentDescription      =
        {
-               (VkAttachmentDescriptionFlags)0,                        // VkAttachmentDescriptionFlags         flags;
-               colorFormat,                                                            // VkFormat                                                     format;
-               VK_SAMPLE_COUNT_1_BIT,                                          // VkSampleCountFlagBits                        samples;
-               VK_ATTACHMENT_LOAD_OP_CLEAR,                            // VkAttachmentLoadOp                           loadOp;
-               VK_ATTACHMENT_STORE_OP_STORE,                           // VkAttachmentStoreOp                          storeOp;
-               VK_ATTACHMENT_LOAD_OP_DONT_CARE,                        // VkAttachmentLoadOp                           stencilLoadOp;
-               VK_ATTACHMENT_STORE_OP_DONT_CARE,                       // VkAttachmentStoreOp                          stencilStoreOp;
-               VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL,       // VkImageLayout                                        initialLayout;
-               VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL        // VkImageLayout                                        finalLayout;
+               (VkAttachmentDescriptionFlags)0,                                                                        // VkAttachmentDescriptionFlags flags;
+               colorFormat,                                                                                                            // VkFormat                                             format;
+               VK_SAMPLE_COUNT_1_BIT,                                                                                          // VkSampleCountFlagBits                samples;
+               VK_ATTACHMENT_LOAD_OP_CLEAR,                                                                            // VkAttachmentLoadOp                   loadOp;
+               VK_ATTACHMENT_STORE_OP_STORE,                                                                           // VkAttachmentStoreOp                  storeOp;
+               VK_ATTACHMENT_LOAD_OP_DONT_CARE,                                                                        // VkAttachmentLoadOp                   stencilLoadOp;
+               VK_ATTACHMENT_STORE_OP_DONT_CARE,                                                                       // VkAttachmentStoreOp                  stencilStoreOp;
+               VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL,                                                       // VkImageLayout                                initialLayout;
+               VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL                                                        // VkImageLayout                                finalLayout;
        };
 
        const VkAttachmentReference                                     colorAttachmentReference        =
        {
-               0u,                                                                                     // deUint32                     attachment;
-               VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL        // VkImageLayout        layout;
+               0u,                                                                                                                                     // deUint32                     attachment;
+               VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL                                                        // VkImageLayout        layout;
        };
 
        const VkAttachmentReference                                     depthAttachmentReference        =
        {
-               VK_ATTACHMENT_UNUSED,           // deUint32                     attachment;
-               VK_IMAGE_LAYOUT_UNDEFINED       // VkImageLayout        layout;
+               VK_ATTACHMENT_UNUSED,                                                                                           // deUint32                     attachment;
+               VK_IMAGE_LAYOUT_UNDEFINED                                                                                       // VkImageLayout        layout;
        };
 
        const VkSubpassDescription                                      subpassDescription                      =
        {
-               (VkSubpassDescriptionFlags)0,           // VkSubpassDescriptionFlags            flags;
-               VK_PIPELINE_BIND_POINT_GRAPHICS,        // VkPipelineBindPoint                          pipelineBindPoint;
-               0u,                                                                     // deUint32                                                     inputAttachmentCount;
-               DE_NULL,                                                        // const VkAttachmentReference*         pInputAttachments;
-               1u,                                                                     // deUint32                                                     colorAttachmentCount;
-               &colorAttachmentReference,                      // const VkAttachmentReference*         pColorAttachments;
-               DE_NULL,                                                        // const VkAttachmentReference*         pResolveAttachments;
-               &depthAttachmentReference,                      // const VkAttachmentReference*         pDepthStencilAttachment;
-               0u,                                                                     // deUint32                                                     preserveAttachmentCount;
-               DE_NULL                                                         // const deUint32*                                      pPreserveAttachments;
+               (VkSubpassDescriptionFlags)0,                                                                           // VkSubpassDescriptionFlags    flags;
+               VK_PIPELINE_BIND_POINT_GRAPHICS,                                                                        // VkPipelineBindPoint                  pipelineBindPoint;
+               0u,                                                                                                                                     // deUint32                                             inputAttachmentCount;
+               DE_NULL,                                                                                                                        // const VkAttachmentReference* pInputAttachments;
+               1u,                                                                                                                                     // deUint32                                             colorAttachmentCount;
+               &colorAttachmentReference,                                                                                      // const VkAttachmentReference* pColorAttachments;
+               DE_NULL,                                                                                                                        // const VkAttachmentReference* pResolveAttachments;
+               &depthAttachmentReference,                                                                                      // const VkAttachmentReference* pDepthStencilAttachment;
+               0u,                                                                                                                                     // deUint32                                             preserveAttachmentCount;
+               DE_NULL                                                                                                                         // const deUint32*                              pPreserveAttachments;
        };
        vector <VkSubpassDescription>                           subpassDescriptions                     (subpassCount, subpassDescription);
 
-       const VkRenderPassMultiviewCreateInfo   renderPassMultiviewInfo         =
+       const VkRenderPassMultiviewCreateInfo           renderPassMultiviewInfo         =
        {
-               VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO_KHR,        //VkStructureType       sType;
-               DE_NULL,                                                                                                        //const void*           pNext;
-               subpassCount,                                                                                           //uint32_t                      subpassCount;
-               &viewMasks[0],                                                                                          //const uint32_t*       pViewMasks;
-               0u,                                                                                                                     //uint32_t                      dependencyCount;
-               DE_NULL,                                                                                                        //const int32_t*        pViewOffsets;
-               0u,                                                                                                                     //uint32_t                      correlationMaskCount;
-               DE_NULL,                                                                                                        //const uint32_t*       pCorrelationMasks;
+               VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO_KHR,                        //VkStructureType       sType;
+               DE_NULL,                                                                                                                        //const void*           pNext;
+               subpassCount,                                                                                                           //uint32_t                      subpassCount;
+               &viewMasks[0],                                                                                                          //const uint32_t*       pViewMasks;
+               0u,                                                                                                                                     //uint32_t                      dependencyCount;
+               DE_NULL,                                                                                                                        //const int32_t*        pViewOffsets;
+               0u,                                                                                                                                     //uint32_t                      correlationMaskCount;
+               DE_NULL,                                                                                                                        //const uint32_t*       pCorrelationMasks;
        };
 
        vector <VkSubpassDependency>                            subpassDependencies;
        for(deUint32 subpassNdx = 0u; subpassNdx < subpassCount; ++subpassNdx)
        {
-               const VkSubpassDependency subpassDependency =
+               const VkSubpassDependency                               subpassDependency                       =
                {
                        subpassNdx,                                                                                                             // deUint32                             srcSubpass;
                        (subpassNdx ==subpassCount - 1u) ? subpassNdx : subpassNdx+1u,  // deUint32                             dstSubpass;
@@ -258,17 +258,17 @@ Move<VkRenderPass> makeRenderPass (const DeviceInterface& vk,
                subpassDependencies.push_back(subpassDependency);
        }
 
-       const VkRenderPassCreateInfo                            renderPassInfo          =
+       const VkRenderPassCreateInfo                            renderPassInfo                          =
        {
-               VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO,      // VkStructureType                                      sType;
-               &renderPassMultiviewInfo,                                       // const void*                                          pNext;
-               (VkRenderPassCreateFlags)0,                                     // VkRenderPassCreateFlags                      flags;
-               1u,                                                                                     // deUint32                                                     attachmentCount;
-               &colorAttachmentDescription,                            // const VkAttachmentDescription*       pAttachments;
-               subpassCount,                                                           // deUint32                                                     subpassCount;
-               &subpassDescriptions[0],                                        // const VkSubpassDescription*          pSubpasses;
-               subpassCount,                                                           // deUint32                                                     dependencyCount;
-               &subpassDependencies[0]                                         // const VkSubpassDependency*           pDependencies;
+               VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO,                                                      // VkStructureType                                      sType;
+               &renderPassMultiviewInfo,                                                                                       // const void*                                          pNext;
+               (VkRenderPassCreateFlags)0,                                                                                     // VkRenderPassCreateFlags                      flags;
+               1u,                                                                                                                                     // deUint32                                                     attachmentCount;
+               &colorAttachmentDescription,                                                                            // const VkAttachmentDescription*       pAttachments;
+               subpassCount,                                                                                                           // deUint32                                                     subpassCount;
+               &subpassDescriptions[0],                                                                                        // const VkSubpassDescription*          pSubpasses;
+               subpassCount,                                                                                                           // deUint32                                                     dependencyCount;
+               &subpassDependencies[0]                                                                                         // const VkSubpassDependency*           pDependencies;
        };
 
        return createRenderPass(vk, device, &renderPassInfo);
index 766f91d..9770767 100644 (file)
@@ -556,28 +556,28 @@ void submitCommandsAndWait (const DeviceInterface&                vk,
                                                        const bool                                      useDeviceGroups,
                                                        const deUint32                          physicalDeviceID)
 {
-       const VkFenceCreateInfo fenceParams =
+       const VkFenceCreateInfo fenceParams                             =
        {
-               VK_STRUCTURE_TYPE_FENCE_CREATE_INFO,    // VkStructureType              sType;
-               DE_NULL,                                                                // const void*                  pNext;
-               0u,                                                                             // VkFenceCreateFlags   flags;
+               VK_STRUCTURE_TYPE_FENCE_CREATE_INFO,                            // VkStructureType              sType;
+               DE_NULL,                                                                                        // const void*                  pNext;
+               0u,                                                                                                     // VkFenceCreateFlags   flags;
        };
-       const Unique<VkFence> fence(createFence(vk, device, &fenceParams));
+       const Unique<VkFence>   fence(createFence               (vk, device, &fenceParams));
 
-       const deUint32 deviceMask                                                       = 1 << physicalDeviceID;
-       std::vector<deUint32> deviceIndices                                     (waitSemaphoreCount, physicalDeviceID);
+       const deUint32                  deviceMask                              = 1 << physicalDeviceID;
+       std::vector<deUint32>   deviceIndices                   (waitSemaphoreCount, physicalDeviceID);
        VkDeviceGroupSubmitInfo deviceGroupSubmitInfo   =
        {
-               VK_STRUCTURE_TYPE_DEVICE_GROUP_SUBMIT_INFO_KHR,         //VkStructureType       sType
-               DE_NULL,                                                                                        // const void*          pNext
-               waitSemaphoreCount,                                                                     // uint32_t                     waitSemaphoreCount
-               deviceIndices.size() ? &deviceIndices[0] : DE_NULL,     // const uint32_t*      pWaitSemaphoreDeviceIndices
-               1u,                                                                                                     // uint32_t                     commandBufferCount
-               &deviceMask,                                                                            // const uint32_t*      pCommandBufferDeviceMasks
-               0u,                                                                                                     // uint32_t                     signalSemaphoreCount
-               DE_NULL,                                                                                        // const uint32_t*      pSignalSemaphoreDeviceIndices
+               VK_STRUCTURE_TYPE_DEVICE_GROUP_SUBMIT_INFO_KHR,         //VkStructureType               sType
+               DE_NULL,                                                                                        // const void*                  pNext
+               waitSemaphoreCount,                                                                     // uint32_t                             waitSemaphoreCount
+               deviceIndices.size() ? &deviceIndices[0] : DE_NULL,     // const uint32_t*              pWaitSemaphoreDeviceIndices
+               1u,                                                                                                     // uint32_t                             commandBufferCount
+               &deviceMask,                                                                            // const uint32_t*              pCommandBufferDeviceMasks
+               0u,                                                                                                     // uint32_t                             signalSemaphoreCount
+               DE_NULL,                                                                                        // const uint32_t*              pSignalSemaphoreDeviceIndices
        };
-       const VkSubmitInfo submitInfo =
+       const VkSubmitInfo              submitInfo                              =
        {
                VK_STRUCTURE_TYPE_SUBMIT_INFO,                                          // VkStructureType                              sType;
                useDeviceGroups ? &deviceGroupSubmitInfo : DE_NULL,     // const void*                                  pNext;
index 4563667..bbf7d86 100644 (file)
@@ -51,8 +51,8 @@ struct TestConfig
                                                                TestConfig              (const ResourceDescription&                                             resource_,
                                                                                                 OperationName                                                                  writeOp_,
                                                                                                 OperationName                                                                  readOp_,
-                                                                                                vk::VkExternalMemoryHandleTypeFlagBits         memoryHandleType_,
-                                                                                                vk::VkExternalSemaphoreHandleTypeFlagBits      semaphoreHandleType_,
+                                                                                                vk::VkExternalMemoryHandleTypeFlagBits                 memoryHandleType_,
+                                                                                                vk::VkExternalSemaphoreHandleTypeFlagBits              semaphoreHandleType_,
                                                                                                 bool                                                                                   dedicated_)
                : resource                              (resource_)
                , writeOp                               (writeOp_)
@@ -1210,7 +1210,7 @@ tcu::TestCaseGroup* createCrossInstanceSharingTest (tcu::TestContext& testCtx)
        {
                vk::VkExternalMemoryHandleTypeFlagBits          memoryType;
                vk::VkExternalSemaphoreHandleTypeFlagBits       semaphoreType;
-               const char*                                                                             nameSuffix;
+               const char*                                                                     nameSuffix;
        } cases[] =
        {
                {
index 6c78833..69946b7 100644 (file)
@@ -85,9 +85,9 @@ static const ResourceDescription s_resourcesWin32KeyedMutex[] =
 
 struct TestConfig
 {
-                                                               TestConfig              (const ResourceDescription&                                             resource_,
-                                                                                                OperationName                                                                  writeOp_,
-                                                                                                OperationName                                                                  readOp_,
+                                                               TestConfig              (const ResourceDescription&                                     resource_,
+                                                                                                OperationName                                                          writeOp_,
+                                                                                                OperationName                                                          readOp_,
                                                                                                 vk::VkExternalMemoryHandleTypeFlagBits         memoryHandleTypeBuffer_,
                                                                                                 vk::VkExternalMemoryHandleTypeFlagBits         memoryHandleTypeImage_)
                : resource                                      (resource_)
@@ -249,14 +249,14 @@ deUint32 chooseMemoryType (deUint32 bits)
        return -1;
 }
 
-vk::Move<vk::VkDeviceMemory> importMemory (const vk::DeviceInterface&                                  vkd,
-                                                                                  vk::VkDevice                                                                 device,
-                                                                                  const vk::VkMemoryRequirements&                              requirements,
+vk::Move<vk::VkDeviceMemory> importMemory (const vk::DeviceInterface&                          vkd,
+                                                                                  vk::VkDevice                                                         device,
+                                                                                  const vk::VkMemoryRequirements&                      requirements,
                                                                                   vk::VkExternalMemoryHandleTypeFlagBits       externalType,
-                                                                                  NativeHandle&                                                                handle,
-                                                                                  bool                                                                                 requiresDedicated,
-                                                                                  vk::VkBuffer                                                                 buffer,
-                                                                                  vk::VkImage                                                                  image)
+                                                                                  NativeHandle&                                                        handle,
+                                                                                  bool                                                                         requiresDedicated,
+                                                                                  vk::VkBuffer                                                         buffer,
+                                                                                  vk::VkImage                                                          image)
 {
        const vk::VkMemoryDedicatedAllocateInfo dedicatedInfo   =
        {
@@ -293,7 +293,7 @@ de::MovePtr<vk::Allocation> importAndBindMemory (const vk::DeviceInterface&
                                                                                                 vk::VkDevice                                                           device,
                                                                                                 vk::VkBuffer                                                           buffer,
                                                                                                 NativeHandle&                                                          nativeHandle,
-                                                                                                vk::VkExternalMemoryHandleTypeFlagBits externalType)
+                                                                                                vk::VkExternalMemoryHandleTypeFlagBits         externalType)
 {
        const vk::VkBufferMemoryRequirementsInfo2       requirementsInfo                =
        {
@@ -323,12 +323,12 @@ de::MovePtr<vk::Allocation> importAndBindMemory (const vk::DeviceInterface&
 }
 
 de::MovePtr<vk::Allocation> importAndBindMemory (const vk::DeviceInterface&                                            vkd,
-                                                                                                  vk::VkDevice                                                                 device,
-                                                                                                  vk::VkImage                                                                  image,
-                                                                                                  NativeHandle&                                                                nativeHandle,
-                                                                                                  vk::VkExternalMemoryHandleTypeFlagBits       externalType)
+                                                                                                vk::VkDevice                                                                   device,
+                                                                                                vk::VkImage                                                                    image,
+                                                                                                NativeHandle&                                                                  nativeHandle,
+                                                                                                vk::VkExternalMemoryHandleTypeFlagBits                 externalType)
 {
-       const vk::VkImageMemoryRequirementsInfo2                requirementsInfo                =
+       const vk::VkImageMemoryRequirementsInfo2        requirementsInfo                =
        {
                vk::VK_STRUCTURE_TYPE_IMAGE_MEMORY_REQUIREMENTS_INFO_2,
                DE_NULL,
@@ -387,13 +387,13 @@ de::MovePtr<Resource> importResource (const vk::DeviceInterface&                          vkd,
                        0u,
                        1u
                };
-               const vk::VkExternalMemoryImageCreateInfo               externalInfo                    =
+               const vk::VkExternalMemoryImageCreateInfo                       externalInfo                    =
                {
                        vk::VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO,
                        DE_NULL,
                        (vk::VkExternalMemoryHandleTypeFlags)externalType
                };
-               const vk::VkImageCreateInfo                     createInfo                              =
+               const vk::VkImageCreateInfo                                                     createInfo                              =
                {
                        vk::VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO,
                        &externalInfo,
@@ -414,23 +414,23 @@ de::MovePtr<Resource> importResource (const vk::DeviceInterface&                          vkd,
                        vk::VK_IMAGE_LAYOUT_UNDEFINED
                };
 
-               vk::Move<vk::VkImage>                   image           = vk::createImage(vkd, device, &createInfo);
-               de::MovePtr<vk::Allocation>             allocation      = importAndBindMemory(vkd, device, *image, nativeHandle, externalType);
+               vk::Move<vk::VkImage>                                                           image                                   = vk::createImage(vkd, device, &createInfo);
+               de::MovePtr<vk::Allocation>                                                     allocation                              = importAndBindMemory(vkd, device, *image, nativeHandle, externalType);
 
                return de::MovePtr<Resource>(new Resource(image, allocation, extent, resourceDesc.imageType, resourceDesc.imageFormat, subresourceRange, subresourceLayers));
        }
        else
        {
-               const vk::VkDeviceSize                                                  offset                  = 0u;
-               const vk::VkDeviceSize                                                  size                    = static_cast<vk::VkDeviceSize>(resourceDesc.size.x());
-               const vk::VkBufferUsageFlags                                    usage                   = readOp.getResourceUsageFlags() | writeOp.getResourceUsageFlags();
-               const vk::VkExternalMemoryBufferCreateInfo      externalInfo    =
+               const vk::VkDeviceSize                                                          offset                                  = 0u;
+               const vk::VkDeviceSize                                                          size                                    = static_cast<vk::VkDeviceSize>(resourceDesc.size.x());
+               const vk::VkBufferUsageFlags                                            usage                                   = readOp.getResourceUsageFlags() | writeOp.getResourceUsageFlags();
+               const vk::VkExternalMemoryBufferCreateInfo                      externalInfo                    =
                {
                        vk::VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_BUFFER_CREATE_INFO,
                        DE_NULL,
                        (vk::VkExternalMemoryHandleTypeFlags)externalType
                };
-               const vk::VkBufferCreateInfo                                    createInfo              =
+               const vk::VkBufferCreateInfo                                            createInfo                              =
                {
                        vk::VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO,
                        &externalInfo,
@@ -442,8 +442,8 @@ de::MovePtr<Resource> importResource (const vk::DeviceInterface&                            vkd,
                        (deUint32)queueFamilyIndices.size(),
                        &queueFamilyIndices[0]
                };
-               vk::Move<vk::VkBuffer>          buffer          = vk::createBuffer(vkd, device, &createInfo);
-               de::MovePtr<vk::Allocation>     allocation      = importAndBindMemory(vkd, device, *buffer, nativeHandle, externalType);
+               vk::Move<vk::VkBuffer>                                                          buffer                                  = vk::createBuffer(vkd, device, &createInfo);
+               de::MovePtr<vk::Allocation>                                                     allocation                              = importAndBindMemory(vkd, device, *buffer, nativeHandle, externalType);
 
                return de::MovePtr<Resource>(new Resource(resourceDesc.type, buffer, allocation, offset, size));
        }
@@ -456,13 +456,13 @@ void recordWriteBarrier (const vk::DeviceInterface&       vkd,
                                                 deUint32                                       writeQueueFamilyIndex,
                                                 const SyncInfo&                        readSync)
 {
-       const vk::VkPipelineStageFlags  srcStageMask            = writeSync.stageMask;
-       const vk::VkAccessFlags                 srcAccessMask           = writeSync.accessMask;
+       const vk::VkPipelineStageFlags          srcStageMask            = writeSync.stageMask;
+       const vk::VkAccessFlags                         srcAccessMask           = writeSync.accessMask;
 
-       const vk::VkPipelineStageFlags  dstStageMask            = readSync.stageMask;
-       const vk::VkAccessFlags                 dstAccessMask           = readSync.accessMask;
+       const vk::VkPipelineStageFlags          dstStageMask            = readSync.stageMask;
+       const vk::VkAccessFlags                         dstAccessMask           = readSync.accessMask;
 
-       const vk::VkDependencyFlags             dependencyFlags         = 0;
+       const vk::VkDependencyFlags                     dependencyFlags         = 0;
 
        if (resource.getType() == RESOURCE_TYPE_IMAGE)
        {
@@ -515,13 +515,13 @@ void recordReadBarrier (const vk::DeviceInterface&        vkd,
                                                const SyncInfo&                         readSync,
                                                deUint32                                        readQueueFamilyIndex)
 {
-       const vk::VkPipelineStageFlags  srcStageMask            = readSync.stageMask;
-       const vk::VkAccessFlags                 srcAccessMask           = readSync.accessMask;
+       const vk::VkPipelineStageFlags          srcStageMask            = readSync.stageMask;
+       const vk::VkAccessFlags                         srcAccessMask           = readSync.accessMask;
 
-       const vk::VkPipelineStageFlags  dstStageMask            = readSync.stageMask;
-       const vk::VkAccessFlags                 dstAccessMask           = readSync.accessMask;
+       const vk::VkPipelineStageFlags          dstStageMask            = readSync.stageMask;
+       const vk::VkAccessFlags                         dstAccessMask           = readSync.accessMask;
 
-       const vk::VkDependencyFlags             dependencyFlags         = 0;
+       const vk::VkDependencyFlags                     dependencyFlags         = 0;
 
        if (resource.getType() == RESOURCE_TYPE_IMAGE)
        {
@@ -1764,8 +1764,8 @@ tcu::TestCaseGroup* createWin32KeyedMutexTest (tcu::TestContext& testCtx)
 {
        const struct
        {
-               vk::VkExternalMemoryHandleTypeFlagBits          memoryHandleTypeBuffer;
-               vk::VkExternalMemoryHandleTypeFlagBits          memoryHandleTypeImage;
+               vk::VkExternalMemoryHandleTypeFlagBits                  memoryHandleTypeBuffer;
+               vk::VkExternalMemoryHandleTypeFlagBits                  memoryHandleTypeImage;
                const char*                                                                             nameSuffix;
        } cases[] =
        {
index 994b4f5..0929aa5 100644 (file)
@@ -370,7 +370,7 @@ Transference getHandelTypeTransferences (vk::VkExternalFenceHandleTypeFlagBits t
 int getMemoryFd (const vk::DeviceInterface&                                    vkd,
                                 vk::VkDevice                                                           device,
                                 vk::VkDeviceMemory                                                     memory,
-                                vk::VkExternalMemoryHandleTypeFlagBits externalType)
+                                vk::VkExternalMemoryHandleTypeFlagBits         externalType)
 {
        const vk::VkMemoryGetFdInfoKHR  info    =
        {
@@ -391,7 +391,7 @@ int getMemoryFd (const vk::DeviceInterface&                                 vkd,
 void getMemoryNative (const vk::DeviceInterface&                                       vkd,
                                                 vk::VkDevice                                                           device,
                                                 vk::VkDeviceMemory                                                     memory,
-                                                vk::VkExternalMemoryHandleTypeFlagBits externalType,
+                                                vk::VkExternalMemoryHandleTypeFlagBits         externalType,
                                                 NativeHandle&                                                          nativeHandle)
 {
        if (externalType == vk::VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT)
@@ -445,7 +445,7 @@ void getMemoryNative (const vk::DeviceInterface&                                    vkd,
 
 vk::Move<vk::VkFence> createExportableFence (const vk::DeviceInterface&                                        vkd,
                                                                                         vk::VkDevice                                                           device,
-                                                                                        vk::VkExternalFenceHandleTypeFlagBits  externalType)
+                                                                                        vk::VkExternalFenceHandleTypeFlagBits          externalType)
 {
        const vk::VkExportFenceCreateInfo       exportCreateInfo        =
        {
@@ -466,7 +466,7 @@ vk::Move<vk::VkFence> createExportableFence (const vk::DeviceInterface&                                     vkd,
 int getFenceFd (const vk::DeviceInterface&                                     vkd,
                                vk::VkDevice                                                            device,
                                vk::VkFence                                                                     fence,
-                               vk::VkExternalFenceHandleTypeFlagBits   externalType)
+                               vk::VkExternalFenceHandleTypeFlagBits           externalType)
 {
        const vk::VkFenceGetFdInfoKHR   info    =
        {
@@ -487,7 +487,7 @@ int getFenceFd (const vk::DeviceInterface&                                  vkd,
 void getFenceNative (const vk::DeviceInterface&                                        vkd,
                                         vk::VkDevice                                                           device,
                                         vk::VkFence                                                            fence,
-                                        vk::VkExternalFenceHandleTypeFlagBits  externalType,
+                                        vk::VkExternalFenceHandleTypeFlagBits          externalType,
                                         NativeHandle&                                                          nativeHandle)
 {
        if (externalType == vk::VK_EXTERNAL_FENCE_HANDLE_TYPE_SYNC_FD_BIT
@@ -543,7 +543,7 @@ void getFenceNative (const vk::DeviceInterface&                                     vkd,
 void importFence (const vk::DeviceInterface&                           vkd,
                                  const vk::VkDevice                                            device,
                                  const vk::VkFence                                                     fence,
-                                 vk::VkExternalFenceHandleTypeFlagBits externalType,
+                                 vk::VkExternalFenceHandleTypeFlagBits         externalType,
                                  NativeHandle&                                                         handle,
                                  vk::VkFenceImportFlags                                        flags)
 {
@@ -698,7 +698,7 @@ void getSemaphoreNative (const vk::DeviceInterface&                                 vkd,
 void importSemaphore (const vk::DeviceInterface&                                       vkd,
                                          const vk::VkDevice                                                    device,
                                          const vk::VkSemaphore                                                 semaphore,
-                                         vk::VkExternalSemaphoreHandleTypeFlagBits     externalType,
+                                         vk::VkExternalSemaphoreHandleTypeFlagBits             externalType,
                                          NativeHandle&                                                                 handle,
                                          vk::VkSemaphoreImportFlags                                    flags)
 {
@@ -742,9 +742,9 @@ void importSemaphore (const vk::DeviceInterface&                                    vkd,
 
 vk::Move<vk::VkSemaphore> createAndImportSemaphore (const vk::DeviceInterface&                                         vkd,
                                                                                                        const vk::VkDevice                                                              device,
-                                                                                                       vk::VkExternalSemaphoreHandleTypeFlagBits       externalType,
+                                                                                                       vk::VkExternalSemaphoreHandleTypeFlagBits               externalType,
                                                                                                        NativeHandle&                                                                   handle,
-                                                                                                       vk::VkSemaphoreImportFlags                                      flags)
+                                                                                                       vk::VkSemaphoreImportFlags                                              flags)
 {
        vk::Move<vk::VkSemaphore>       semaphore       (createSemaphore(vkd, device));
 
@@ -756,9 +756,9 @@ vk::Move<vk::VkSemaphore> createAndImportSemaphore (const vk::DeviceInterface&
 vk::Move<vk::VkDeviceMemory> allocateExportableMemory (const vk::DeviceInterface&                                      vkd,
                                                                                                           vk::VkDevice                                                                 device,
                                                                                                           const vk::VkMemoryRequirements&                              requirements,
-                                                                                                          vk::VkExternalMemoryHandleTypeFlagBits       externalType,
+                                                                                                          vk::VkExternalMemoryHandleTypeFlagBits               externalType,
                                                                                                           vk::VkBuffer                                                                 buffer,
-                                                                                                          deUint32&                                    exportedMemoryTypeIndex)
+                                                                                                          deUint32&                                                                    exportedMemoryTypeIndex)
 {
        exportedMemoryTypeIndex = chooseMemoryType(requirements.memoryTypeBits);
        const vk::VkMemoryDedicatedAllocateInfo dedicatedInfo   =
@@ -788,9 +788,9 @@ vk::Move<vk::VkDeviceMemory> allocateExportableMemory (const vk::DeviceInterface
 vk::Move<vk::VkDeviceMemory> allocateExportableMemory (const vk::DeviceInterface&                                      vkd,
                                                                                                           vk::VkDevice                                                                 device,
                                                                                                           const vk::VkMemoryRequirements&                              requirements,
-                                                                                                          vk::VkExternalMemoryHandleTypeFlagBits       externalType,
+                                                                                                          vk::VkExternalMemoryHandleTypeFlagBits               externalType,
                                                                                                           vk::VkImage                                                                  image,
-                                                                                                          deUint32&                                    exportedMemoryTypeIndex)
+                                                                                                          deUint32&                                                                    exportedMemoryTypeIndex)
 {
        exportedMemoryTypeIndex = chooseMemoryType(requirements.memoryTypeBits);
        const vk::VkMemoryDedicatedAllocateInfo dedicatedInfo   =
@@ -822,7 +822,7 @@ vk::Move<vk::VkDeviceMemory> allocateExportableMemory (const vk::InstanceInterfa
                                                                                                           const vk::DeviceInterface&                                   vkd,
                                                                                                           vk::VkDevice                                                                 device,
                                                                                                           const vk::VkMemoryRequirements&                              requirements,
-                                                                                                          vk::VkExternalMemoryHandleTypeFlagBits       externalType,
+                                                                                                          vk::VkExternalMemoryHandleTypeFlagBits               externalType,
                                                                                                           bool                                                                                 hostVisible,
                                                                                                           vk::VkBuffer                                                                 buffer,
                                                                                                           deUint32&                                                                    exportedMemoryTypeIndex)
@@ -886,7 +886,7 @@ static vk::Move<vk::VkDeviceMemory> importMemory (const vk::DeviceInterface&
                        externalType,
                        handle.getFd()
                };
-               const vk::VkMemoryDedicatedAllocateInfo dedicatedInfo   =
+               const vk::VkMemoryDedicatedAllocateInfo         dedicatedInfo   =
                {
                        vk::VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO,
                        &importInfo,
@@ -909,7 +909,7 @@ static vk::Move<vk::VkDeviceMemory> importMemory (const vk::DeviceInterface&
        else if (externalType == vk::VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT
                        || externalType == vk::VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT)
        {
-               const vk::VkImportMemoryWin32HandleInfoKHR      importInfo =
+               const vk::VkImportMemoryWin32HandleInfoKHR      importInfo              =
                {
                        vk::VK_STRUCTURE_TYPE_IMPORT_MEMORY_WIN32_HANDLE_INFO_KHR,
                        DE_NULL,
@@ -917,7 +917,7 @@ static vk::Move<vk::VkDeviceMemory> importMemory (const vk::DeviceInterface&
                        handle.getWin32Handle(),
                        DE_NULL
                };
-               const vk::VkMemoryDedicatedAllocateInfo dedicatedInfo   =
+               const vk::VkMemoryDedicatedAllocateInfo         dedicatedInfo   =
                {
                        vk::VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO,
                        &importInfo,
@@ -947,7 +947,7 @@ static vk::Move<vk::VkDeviceMemory> importMemory (const vk::DeviceInterface&
 vk::Move<vk::VkDeviceMemory> importMemory (const vk::DeviceInterface&                                  vkd,
                                                                                   vk::VkDevice                                                                 device,
                                                                                   const vk::VkMemoryRequirements&                              requirements,
-                                                                                  vk::VkExternalMemoryHandleTypeFlagBits       externalType,
+                                                                                  vk::VkExternalMemoryHandleTypeFlagBits               externalType,
                                                                                   deUint32                                                                             memoryTypeIndex,
                                                                                   NativeHandle&                                                                handle)
 {
@@ -958,7 +958,7 @@ vk::Move<vk::VkDeviceMemory> importDedicatedMemory (const vk::DeviceInterface&
                                                                                                        vk::VkDevice                                                            device,
                                                                                                        vk::VkBuffer                                                            buffer,
                                                                                                        const vk::VkMemoryRequirements&                         requirements,
-                                                                                                       vk::VkExternalMemoryHandleTypeFlagBits  externalType,
+                                                                                                       vk::VkExternalMemoryHandleTypeFlagBits          externalType,
                                                                                                        deUint32                                                                        memoryTypeIndex,
                                                                                                        NativeHandle&                                                           handle)
 {
@@ -969,7 +969,7 @@ vk::Move<vk::VkDeviceMemory> importDedicatedMemory (const vk::DeviceInterface&
                                                                                                        vk::VkDevice                                                            device,
                                                                                                        vk::VkImage                                                                     image,
                                                                                                        const vk::VkMemoryRequirements&                         requirements,
-                                                                                                       vk::VkExternalMemoryHandleTypeFlagBits  externalType,
+                                                                                                       vk::VkExternalMemoryHandleTypeFlagBits          externalType,
                                                                                                        deUint32                                                                        memoryTypeIndex,
                                                                                                        NativeHandle&                                                           handle)
 {
@@ -979,12 +979,12 @@ vk::Move<vk::VkDeviceMemory> importDedicatedMemory (const vk::DeviceInterface&
 vk::Move<vk::VkBuffer> createExternalBuffer (const vk::DeviceInterface&                                        vkd,
                                                                                         vk::VkDevice                                                           device,
                                                                                         deUint32                                                                       queueFamilyIndex,
-                                                                                        vk::VkExternalMemoryHandleTypeFlagBits externalType,
+                                                                                        vk::VkExternalMemoryHandleTypeFlagBits         externalType,
                                                                                         vk::VkDeviceSize                                                       size,
                                                                                         vk::VkBufferCreateFlags                                        createFlags,
                                                                                         vk::VkBufferUsageFlags                                         usageFlags)
 {
-       const vk::VkExternalMemoryBufferCreateInfo              externalCreateInfo      =
+       const vk::VkExternalMemoryBufferCreateInfo                      externalCreateInfo      =
        {
                vk::VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_BUFFER_CREATE_INFO,
                DE_NULL,
@@ -1008,7 +1008,7 @@ vk::Move<vk::VkBuffer> createExternalBuffer (const vk::DeviceInterface&                                   vkd,
 vk::Move<vk::VkImage> createExternalImage (const vk::DeviceInterface&                                  vkd,
                                                                                   vk::VkDevice                                                                 device,
                                                                                   deUint32                                                                             queueFamilyIndex,
-                                                                                  vk::VkExternalMemoryHandleTypeFlagBits       externalType,
+                                                                                  vk::VkExternalMemoryHandleTypeFlagBits               externalType,
                                                                                   vk::VkFormat                                                                 format,
                                                                                   deUint32                                                                             width,
                                                                                   deUint32                                                                             height,
index 064a0f8..cb7f655 100644 (file)
@@ -66,9 +66,9 @@ private:
        NativeHandle&           operator=               (const NativeHandle&);
 };
 
-const char*                                            externalSemaphoreTypeToName     (vk::VkExternalSemaphoreHandleTypeFlagBits type);
-const char*                                            externalFenceTypeToName         (vk::VkExternalFenceHandleTypeFlagBits type);
-const char*                                            externalMemoryTypeToName        (vk::VkExternalMemoryHandleTypeFlagBits type);
+const char*                                            externalSemaphoreTypeToName     (vk::VkExternalSemaphoreHandleTypeFlagBits      type);
+const char*                                            externalFenceTypeToName         (vk::VkExternalFenceHandleTypeFlagBits          type);
+const char*                                            externalMemoryTypeToName        (vk::VkExternalMemoryHandleTypeFlagBits         type);
 
 enum Permanence
 {
@@ -83,91 +83,91 @@ enum Transference
 };
 
 bool                                                   isSupportedPermanence                           (vk::VkExternalSemaphoreHandleTypeFlagBits      type,
-                                                                                                                                        Permanence                                                                             permanence);
+                                                                                                                                        Permanence                                                                     permanence);
 Transference                                   getHandelTypeTransferences                      (vk::VkExternalSemaphoreHandleTypeFlagBits      type);
 
 bool                                                   isSupportedPermanence                           (vk::VkExternalFenceHandleTypeFlagBits          type,
-                                                                                                                                        Permanence                                                                             permanence);
+                                                                                                                                        Permanence                                                                     permanence);
 Transference                                   getHandelTypeTransferences                      (vk::VkExternalFenceHandleTypeFlagBits          type);
 
 int                                                            getMemoryFd                                                     (const vk::DeviceInterface&                                     vkd,
                                                                                                                                         vk::VkDevice                                                           device,
                                                                                                                                         vk::VkDeviceMemory                                                     memory,
-                                                                                                                                        vk::VkExternalMemoryHandleTypeFlagBits externalType);
+                                                                                                                                        vk::VkExternalMemoryHandleTypeFlagBits         externalType);
 
 void                                                   getMemoryNative                                         (const vk::DeviceInterface&                                     vkd,
                                                                                                                                         vk::VkDevice                                                           device,
                                                                                                                                         vk::VkDeviceMemory                                                     memory,
-                                                                                                                                        vk::VkExternalMemoryHandleTypeFlagBits externalType,
+                                                                                                                                        vk::VkExternalMemoryHandleTypeFlagBits         externalType,
                                                                                                                                         NativeHandle&                                                          nativeHandle);
 
-vk::Move<vk::VkSemaphore>              createExportableSemaphore                       (const vk::DeviceInterface&                                             vkd,
-                                                                                                                                        vk::VkDevice                                                                   device,
+vk::Move<vk::VkSemaphore>              createExportableSemaphore                       (const vk::DeviceInterface&                                     vkd,
+                                                                                                                                        vk::VkDevice                                                           device,
                                                                                                                                         vk::VkExternalSemaphoreHandleTypeFlagBits      externalType);
 
-int                                                            getSemaphoreFd                                          (const vk::DeviceInterface&                                             vkd,
-                                                                                                                                        vk::VkDevice                                                                   device,
-                                                                                                                                        vk::VkSemaphore                                                                semaphore,
+int                                                            getSemaphoreFd                                          (const vk::DeviceInterface&                                     vkd,
+                                                                                                                                        vk::VkDevice                                                           device,
+                                                                                                                                        vk::VkSemaphore                                                        semaphore,
                                                                                                                                         vk::VkExternalSemaphoreHandleTypeFlagBits      externalType);
 
-void                                                   getSemaphoreNative                                      (const vk::DeviceInterface&                                             vkd,
-                                                                                                                                        vk::VkDevice                                                                   device,
-                                                                                                                                        vk::VkSemaphore                                                                semaphore,
+void                                                   getSemaphoreNative                                      (const vk::DeviceInterface&                                     vkd,
+                                                                                                                                        vk::VkDevice                                                           device,
+                                                                                                                                        vk::VkSemaphore                                                        semaphore,
                                                                                                                                         vk::VkExternalSemaphoreHandleTypeFlagBits      externalType,
-                                                                                                                                        NativeHandle&                                                                  nativeHandle);
+                                                                                                                                        NativeHandle&                                                          nativeHandle);
 
-void                                                   importSemaphore                                         (const vk::DeviceInterface&                                             vkd,
-                                                                                                                                        const vk::VkDevice                                                             device,
-                                                                                                                                        const vk::VkSemaphore                                                  semaphore,
+void                                                   importSemaphore                                         (const vk::DeviceInterface&                                     vkd,
+                                                                                                                                        const vk::VkDevice                                                     device,
+                                                                                                                                        const vk::VkSemaphore                                          semaphore,
                                                                                                                                         vk::VkExternalSemaphoreHandleTypeFlagBits      externalType,
-                                                                                                                                        NativeHandle&                                                                  handle,
+                                                                                                                                        NativeHandle&                                                          handle,
                                                                                                                                         vk::VkSemaphoreImportFlags                                     flags);
 
-vk::Move<vk::VkSemaphore>              createAndImportSemaphore                        (const vk::DeviceInterface&                                             vkd,
-                                                                                                                                        const vk::VkDevice                                                             device,
+vk::Move<vk::VkSemaphore>              createAndImportSemaphore                        (const vk::DeviceInterface&                                     vkd,
+                                                                                                                                        const vk::VkDevice                                                     device,
                                                                                                                                         vk::VkExternalSemaphoreHandleTypeFlagBits      externalType,
-                                                                                                                                        NativeHandle&                                                                  handle,
+                                                                                                                                        NativeHandle&                                                          handle,
                                                                                                                                         vk::VkSemaphoreImportFlags                                     flags);
 
-vk::Move<vk::VkFence>                  createExportableFence                           (const vk::DeviceInterface&                                             vkd,
-                                                                                                                                        vk::VkDevice                                                                   device,
+vk::Move<vk::VkFence>                  createExportableFence                           (const vk::DeviceInterface&                                     vkd,
+                                                                                                                                        vk::VkDevice                                                           device,
                                                                                                                                         vk::VkExternalFenceHandleTypeFlagBits          externalType);
 
-int                                                            getFenceFd                                                      (const vk::DeviceInterface&                                             vkd,
-                                                                                                                                        vk::VkDevice                                                                   device,
-                                                                                                                                        vk::VkFence                                                                    fence,
+int                                                            getFenceFd                                                      (const vk::DeviceInterface&                                     vkd,
+                                                                                                                                        vk::VkDevice                                                           device,
+                                                                                                                                        vk::VkFence                                                            fence,
                                                                                                                                         vk::VkExternalFenceHandleTypeFlagBits          externalType);
 
-void                                                   getFenceNative                                          (const vk::DeviceInterface&                                             vkd,
-                                                                                                                                        vk::VkDevice                                                                   device,
-                                                                                                                                        vk::VkFence                                                                    fence,
+void                                                   getFenceNative                                          (const vk::DeviceInterface&                                     vkd,
+                                                                                                                                        vk::VkDevice                                                           device,
+                                                                                                                                        vk::VkFence                                                            fence,
                                                                                                                                         vk::VkExternalFenceHandleTypeFlagBits          externalType,
-                                                                                                                                        NativeHandle&                                                                  nativeHandle);
+                                                                                                                                        NativeHandle&                                                          nativeHandle);
 
-void                                                   importFence                                                     (const vk::DeviceInterface&                                             vkd,
-                                                                                                                                        const vk::VkDevice                                                             device,
-                                                                                                                                        const vk::VkFence                                                              fence,
+void                                                   importFence                                                     (const vk::DeviceInterface&                                     vkd,
+                                                                                                                                        const vk::VkDevice                                                     device,
+                                                                                                                                        const vk::VkFence                                                      fence,
                                                                                                                                         vk::VkExternalFenceHandleTypeFlagBits          externalType,
-                                                                                                                                        NativeHandle&                                                                  handle,
+                                                                                                                                        NativeHandle&                                                          handle,
                                                                                                                                         vk::VkFenceImportFlags                                         flags);
 
-vk::Move<vk::VkFence>                  createAndImportFence                            (const vk::DeviceInterface&                                             vkd,
-                                                                                                                                        const vk::VkDevice                                                             device,
+vk::Move<vk::VkFence>                  createAndImportFence                            (const vk::DeviceInterface&                                     vkd,
+                                                                                                                                        const vk::VkDevice                                                     device,
                                                                                                                                         vk::VkExternalFenceHandleTypeFlagBits          externalType,
-                                                                                                                                        NativeHandle&                                                                  handle,
+                                                                                                                                        NativeHandle&                                                          handle,
                                                                                                                                         vk::VkFenceImportFlags                                         flags);
 
 vk::Move<vk::VkDeviceMemory>   allocateExportableMemory                        (const vk::DeviceInterface&                                     vkd,
                                                                                                                                         vk::VkDevice                                                           device,
                                                                                                                                         const vk::VkMemoryRequirements&                        requirements,
-                                                                                                                                        vk::VkExternalMemoryHandleTypeFlagBits externalType,
+                                                                                                                                        vk::VkExternalMemoryHandleTypeFlagBits         externalType,
                                                                                                                                         deUint32&                                                                      exportedMemoryTypeIndex);
 
 // If buffer is not null use dedicated allocation
 vk::Move<vk::VkDeviceMemory>   allocateExportableMemory                        (const vk::DeviceInterface&                                     vkd,
                                                                                                                                         vk::VkDevice                                                           device,
                                                                                                                                         const vk::VkMemoryRequirements&                        requirements,
-                                                                                                                                        vk::VkExternalMemoryHandleTypeFlagBits externalType,
+                                                                                                                                        vk::VkExternalMemoryHandleTypeFlagBits         externalType,
                                                                                                                                         vk::VkBuffer                                                           buffer,
                                                                                                                                         deUint32&                                                                      exportedMemoryTypeIndex);
 
@@ -175,7 +175,7 @@ vk::Move<vk::VkDeviceMemory>        allocateExportableMemory                        (const vk::DeviceInterfa
 vk::Move<vk::VkDeviceMemory>   allocateExportableMemory                        (const vk::DeviceInterface&                                     vkd,
                                                                                                                                         vk::VkDevice                                                           device,
                                                                                                                                         const vk::VkMemoryRequirements&                        requirements,
-                                                                                                                                        vk::VkExternalMemoryHandleTypeFlagBits externalType,
+                                                                                                                                        vk::VkExternalMemoryHandleTypeFlagBits         externalType,
                                                                                                                                         vk::VkImage                                                            image,
                                                                                                                                         deUint32&                                                                      exportedMemoryTypeIndex);
 
@@ -186,7 +186,7 @@ vk::Move<vk::VkDeviceMemory>        allocateExportableMemory                        (const vk::InstanceInter
                                                                                                                                         const vk::DeviceInterface&                                     vkd,
                                                                                                                                         vk::VkDevice                                                           device,
                                                                                                                                         const vk::VkMemoryRequirements&                        requirements,
-                                                                                                                                        vk::VkExternalMemoryHandleTypeFlagBits externalType,
+                                                                                                                                        vk::VkExternalMemoryHandleTypeFlagBits         externalType,
                                                                                                                                         bool                                                                           hostVisible,
                                                                                                                                         vk::VkBuffer                                                           buffer,
                                                                                                                                         deUint32&                                                                      exportedMemoryTypeIndex);
@@ -194,7 +194,7 @@ vk::Move<vk::VkDeviceMemory>        allocateExportableMemory                        (const vk::InstanceInter
 vk::Move<vk::VkDeviceMemory>   importMemory                                            (const vk::DeviceInterface&                                     vkd,
                                                                                                                                         vk::VkDevice                                                           device,
                                                                                                                                         const vk::VkMemoryRequirements&                        requirements,
-                                                                                                                                        vk::VkExternalMemoryHandleTypeFlagBits externalType,
+                                                                                                                                        vk::VkExternalMemoryHandleTypeFlagBits         externalType,
                                                                                                                                         deUint32                                                                       memoryTypeIndex,
                                                                                                                                         NativeHandle&                                                          handle);
 
@@ -202,7 +202,7 @@ vk::Move<vk::VkDeviceMemory>        importDedicatedMemory                           (const vk::DeviceInterface
                                                                                                                                         vk::VkDevice                                                           device,
                                                                                                                                         vk::VkBuffer                                                           buffer,
                                                                                                                                         const vk::VkMemoryRequirements&                        requirements,
-                                                                                                                                        vk::VkExternalMemoryHandleTypeFlagBits externalType,
+                                                                                                                                        vk::VkExternalMemoryHandleTypeFlagBits         externalType,
                                                                                                                                         deUint32                                                                       memoryTypeIndex,
                                                                                                                                         NativeHandle&                                                          handle);
 
@@ -210,14 +210,14 @@ vk::Move<vk::VkDeviceMemory>      importDedicatedMemory                           (const vk::DeviceInterface
                                                                                                                                         vk::VkDevice                                                           device,
                                                                                                                                         vk::VkImage                                                            image,
                                                                                                                                         const vk::VkMemoryRequirements&                        requirements,
-                                                                                                                                        vk::VkExternalMemoryHandleTypeFlagBits externalType,
+                                                                                                                                        vk::VkExternalMemoryHandleTypeFlagBits         externalType,
                                                                                                                                         deUint32                                                                       memoryTypeIndex,
                                                                                                                                         NativeHandle&                                                          handle);
 
 vk::Move<vk::VkBuffer>                 createExternalBuffer                            (const vk::DeviceInterface&                                     vkd,
                                                                                                                                         vk::VkDevice                                                           device,
                                                                                                                                         deUint32                                                                       queueFamilyIndex,
-                                                                                                                                        vk::VkExternalMemoryHandleTypeFlagBits externalType,
+                                                                                                                                        vk::VkExternalMemoryHandleTypeFlagBits         externalType,
                                                                                                                                         vk::VkDeviceSize                                                       size,
                                                                                                                                         vk::VkBufferCreateFlags                                        createFlags,
                                                                                                                                         vk::VkBufferUsageFlags                                         usageFlags);
@@ -225,7 +225,7 @@ vk::Move<vk::VkBuffer>                      createExternalBuffer                            (const vk::DeviceInterface&
 vk::Move<vk::VkImage>                  createExternalImage                                     (const vk::DeviceInterface&                                     vkd,
                                                                                                                                         vk::VkDevice                                                           device,
                                                                                                                                         deUint32                                                                       queueFamilyIndex,
-                                                                                                                                        vk::VkExternalMemoryHandleTypeFlagBits externalType,
+                                                                                                                                        vk::VkExternalMemoryHandleTypeFlagBits         externalType,
                                                                                                                                         vk::VkFormat                                                           format,
                                                                                                                                         deUint32                                                                       width,
                                                                                                                                         deUint32                                                                       height,
index a36e1f6..de164f3 100644 (file)
@@ -759,33 +759,33 @@ tcu::TestStatus querySurfacePresentModesTest (Context& context, Type wsiType)
 
 tcu::TestStatus queryDevGroupSurfacePresentCapabilitiesTest (Context& context, Type wsiType)
 {
-       tcu::TestLog&                                                   log                                     = context.getTestContext().getLog();
-       const InstanceHelper                                    instHelper                      (context, wsiType, vector<string>(1, string("VK_KHR_device_group_creation")));
-       const float                                                             queuePriority           = 1.0f;
-       const tcu::CommandLine&                                 cmdLine                         = context.getTestContext().getCommandLine();
-       const deUint32                                                  devGroupIdx                     = cmdLine.getVKDeviceGroupId() - 1;
-       const deUint32                                                  deviceIdx                       = context.getTestContext().getCommandLine().getVKDeviceId() - 1u;
-       const VkDeviceGroupPresentModeFlagsKHR  requiredFlag            = VK_DEVICE_GROUP_PRESENT_MODE_LOCAL_BIT_KHR;
-       const VkDeviceGroupPresentModeFlagsKHR  maxValidFlag            = VK_DEVICE_GROUP_PRESENT_MODE_LOCAL_BIT_KHR|VK_DEVICE_GROUP_PRESENT_MODE_REMOTE_BIT_KHR |
-                                                                                                                                       VK_DEVICE_GROUP_PRESENT_MODE_SUM_BIT_KHR|VK_DEVICE_GROUP_PRESENT_MODE_LOCAL_MULTI_DEVICE_BIT_KHR;
-       deUint8                                                                 buffer                          [sizeof(VkDeviceGroupPresentCapabilitiesKHR) + GUARD_SIZE];
-       deUint32                                                                queueFamilyIndex        = 0;
-       VkDeviceGroupPresentCapabilitiesKHR*    presentCapabilities;
-       std::vector<const char*>                                deviceExtensions;
+       tcu::TestLog&                                                                   log                                             = context.getTestContext().getLog();
+       const InstanceHelper                                                    instHelper                              (context, wsiType, vector<string>(1, string("VK_KHR_device_group_creation")));
+       const float                                                                             queuePriority                   = 1.0f;
+       const tcu::CommandLine&                                                 cmdLine                                 = context.getTestContext().getCommandLine();
+       const deUint32                                                                  devGroupIdx                             = cmdLine.getVKDeviceGroupId() - 1;
+       const deUint32                                                                  deviceIdx                               = context.getTestContext().getCommandLine().getVKDeviceId() - 1u;
+       const VkDeviceGroupPresentModeFlagsKHR                  requiredFlag                    = VK_DEVICE_GROUP_PRESENT_MODE_LOCAL_BIT_KHR;
+       const VkDeviceGroupPresentModeFlagsKHR                  maxValidFlag                    = VK_DEVICE_GROUP_PRESENT_MODE_LOCAL_BIT_KHR|VK_DEVICE_GROUP_PRESENT_MODE_REMOTE_BIT_KHR |
+                                                                                                                                                               VK_DEVICE_GROUP_PRESENT_MODE_SUM_BIT_KHR|VK_DEVICE_GROUP_PRESENT_MODE_LOCAL_MULTI_DEVICE_BIT_KHR;
+       deUint8                                                                                 buffer                                  [sizeof(VkDeviceGroupPresentCapabilitiesKHR) + GUARD_SIZE];
+       deUint32                                                                                queueFamilyIndex                = 0;
+       VkDeviceGroupPresentCapabilitiesKHR*                    presentCapabilities;
+       std::vector<const char*>                                                deviceExtensions;
 
        if (!isCoreDeviceExtension(context.getUsedApiVersion(), "VK_KHR_device_group"))
                deviceExtensions.push_back("VK_KHR_device_group");
        deviceExtensions.push_back("VK_KHR_swapchain");
 
-       const vector<VkPhysicalDeviceGroupProperties>   deviceGroupProps = enumeratePhysicalDeviceGroups(instHelper.vki, *instHelper.instance);
+       const vector<VkPhysicalDeviceGroupProperties>   deviceGroupProps                = enumeratePhysicalDeviceGroups(instHelper.vki, *instHelper.instance);
 
-       const std::vector<VkQueueFamilyProperties>      queueProps              = getPhysicalDeviceQueueFamilyProperties(instHelper.vki, deviceGroupProps[devGroupIdx].physicalDevices[deviceIdx]);
+       const std::vector<VkQueueFamilyProperties>              queueProps                              = getPhysicalDeviceQueueFamilyProperties(instHelper.vki, deviceGroupProps[devGroupIdx].physicalDevices[deviceIdx]);
        for (size_t queueNdx = 0; queueNdx < queueProps.size(); queueNdx++)
        {
                if (queueProps[queueNdx].queueFlags & VK_QUEUE_GRAPHICS_BIT)
                        queueFamilyIndex = (deUint32)queueNdx;
        }
-       const VkDeviceQueueCreateInfo                   deviceQueueCreateInfo =
+       const VkDeviceQueueCreateInfo                                   deviceQueueCreateInfo   =
        {
                VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO,                             //type
                DE_NULL,                                                                                                //pNext
@@ -794,14 +794,14 @@ tcu::TestStatus queryDevGroupSurfacePresentCapabilitiesTest (Context& context, T
                1u,                                                                                                             //queueCount;
                &queuePriority,                                                                                 //pQueuePriorities;
        };
-       const VkDeviceGroupDeviceCreateInfo                             deviceGroupInfo =
+       const VkDeviceGroupDeviceCreateInfo                             deviceGroupInfo                 =
        {
                VK_STRUCTURE_TYPE_DEVICE_GROUP_DEVICE_CREATE_INFO_KHR,  //stype
                DE_NULL,                                                                                                //pNext
                deviceGroupProps[devGroupIdx].physicalDeviceCount,              //physicalDeviceCount
                deviceGroupProps[devGroupIdx].physicalDevices                   //physicalDevices
        };
-       const VkDeviceCreateInfo                                                        deviceCreateInfo =
+       const VkDeviceCreateInfo                                                deviceCreateInfo                =
        {
                VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO,                                   //sType;
                &deviceGroupInfo,                                                                               //pNext;
index 28d94f8..0fd1128 100644 (file)
@@ -626,7 +626,7 @@ void genTexCoords (std::vector<Vec2>&       coords,
        }
 }
 
-Interval rangeExpandChroma (vk::VkSamplerYcbcrRange    range,
+Interval rangeExpandChroma (vk::VkSamplerYcbcrRange            range,
                                                        const FloatFormat&                      conversionFormat,
                                                        const deUint32                          bits,
                                                        const Interval&                         sample)
@@ -654,7 +654,7 @@ Interval rangeExpandChroma (vk::VkSamplerYcbcrRange range,
        }
 }
 
-Interval rangeExpandLuma (vk::VkSamplerYcbcrRange      range,
+Interval rangeExpandLuma (vk::VkSamplerYcbcrRange              range,
                                                  const FloatFormat&                    conversionFormat,
                                                  const deUint32                                bits,
                                                  const Interval&                               sample)
@@ -945,7 +945,7 @@ int divFloor (int a, int b)
 
 Interval reconstructLinearXChromaSample (const FloatFormat&                    filteringFormat,
                                                                                 const FloatFormat&                     conversionFormat,
-                                                                                vk::VkChromaLocation   offset,
+                                                                                vk::VkChromaLocation           offset,
                                                                                 vk::VkSamplerAddressMode       addressModeU,
                                                                                 vk::VkSamplerAddressMode       addressModeV,
                                                                                 const ChannelAccess&           access,
@@ -2420,14 +2420,14 @@ deUint32 getFormatChannelCount (vk::VkFormat format)
 struct RangeNamePair
 {
        const char*                                     name;
-       vk::VkSamplerYcbcrRange value;
+       vk::VkSamplerYcbcrRange         value;
 };
 
 
 struct ChromaLocationNamePair
 {
-       const char*                             name;
-       vk::VkChromaLocation    value;
+       const char*                                     name;
+       vk::VkChromaLocation            value;
 };
 
 void initTests (tcu::TestCaseGroup* testGroup)
@@ -2524,8 +2524,8 @@ void initTests (tcu::TestCaseGroup* testGroup)
                { "nearest",            vk::VK_FILTER_NEAREST   }
        };
        // Used by the chroma reconstruction tests
-       const vk::VkSamplerYcbcrModelConversion defaultColorModel               (vk::VK_SAMPLER_YCBCR_MODEL_CONVERSION_RGB_IDENTITY);
-       const vk::VkSamplerYcbcrRange                   defaultColorRange               (vk::VK_SAMPLER_YCBCR_RANGE_ITU_FULL);
+       const vk::VkSamplerYcbcrModelConversion         defaultColorModel               (vk::VK_SAMPLER_YCBCR_MODEL_CONVERSION_RGB_IDENTITY);
+       const vk::VkSamplerYcbcrRange                           defaultColorRange               (vk::VK_SAMPLER_YCBCR_RANGE_ITU_FULL);
        const vk::VkComponentMapping                            identitySwizzle                 =
        {
                vk::VK_COMPONENT_SWIZZLE_IDENTITY,
@@ -2561,19 +2561,19 @@ void initTests (tcu::TestCaseGroup* testGroup)
        // Test formats without chroma reconstruction
        for (size_t formatNdx = 0; formatNdx < DE_LENGTH_OF_ARRAY(noChromaSubsampledFormats); formatNdx++)
        {
-               const vk::VkFormat                              format          (noChromaSubsampledFormats[formatNdx]);
-               const std::string                               formatName      (de::toLower(std::string(getFormatName(format)).substr(10)));
-               de::MovePtr<tcu::TestCaseGroup> formatGroup     (new tcu::TestCaseGroup(testCtx, formatName.c_str(), ("Tests for color conversion using format " + formatName).c_str()));
+               const vk::VkFormat                                              format                                  (noChromaSubsampledFormats[formatNdx]);
+               const std::string                                               formatName                              (de::toLower(std::string(getFormatName(format)).substr(10)));
+               de::MovePtr<tcu::TestCaseGroup>                 formatGroup                             (new tcu::TestCaseGroup(testCtx, formatName.c_str(), ("Tests for color conversion using format " + formatName).c_str()));
 
                for (size_t modelNdx = 0; modelNdx < DE_LENGTH_OF_ARRAY(colorModels); modelNdx++)
                {
-                       const char* const                                                       colorModelName  (colorModels[modelNdx].name);
-                       const vk::VkSamplerYcbcrModelConversion colorModel              (colorModels[modelNdx].value);
+                       const char* const                                               colorModelName          (colorModels[modelNdx].name);
+                       const vk::VkSamplerYcbcrModelConversion colorModel                      (colorModels[modelNdx].value);
 
                        if (colorModel != vk::VK_SAMPLER_YCBCR_MODEL_CONVERSION_RGB_IDENTITY && getFormatChannelCount(format) < 3)
                                continue;
 
-                       de::MovePtr<tcu::TestCaseGroup>                         colorModelGroup (new tcu::TestCaseGroup(testCtx, colorModelName, ("Tests for color model " + string(colorModelName)).c_str()));
+                       de::MovePtr<tcu::TestCaseGroup>                 colorModelGroup         (new tcu::TestCaseGroup(testCtx, colorModelName, ("Tests for color model " + string(colorModelName)).c_str()));
 
                        if (colorModel == vk::VK_SAMPLER_YCBCR_MODEL_CONVERSION_RGB_IDENTITY)
                        {
@@ -2584,15 +2584,15 @@ void initTests (tcu::TestCaseGroup* testGroup)
 
                                        for (size_t tilingNdx = 0; tilingNdx < DE_LENGTH_OF_ARRAY(imageTilings); tilingNdx++)
                                        {
-                                               const vk::VkImageTiling                         tiling                          (imageTilings[tilingNdx].value);
-                                               const char* const                                       tilingName                      (imageTilings[tilingNdx].name);
-                                               const glu::ShaderType                           shaderType                      (rng.choose<glu::ShaderType>(DE_ARRAY_BEGIN(shaderTypes), DE_ARRAY_END(shaderTypes)));
+                                               const vk::VkImageTiling                 tiling                          (imageTilings[tilingNdx].value);
+                                               const char* const                               tilingName                      (imageTilings[tilingNdx].name);
+                                               const glu::ShaderType                   shaderType                      (rng.choose<glu::ShaderType>(DE_ARRAY_BEGIN(shaderTypes), DE_ARRAY_END(shaderTypes)));
                                                const vk::VkSamplerYcbcrRange   colorRange                      (rng.choose<RangeNamePair, const RangeNamePair*>(DE_ARRAY_BEGIN(colorRanges), DE_ARRAY_END(colorRanges)).value);
                                                const vk::VkChromaLocation              chromaLocation          (rng.choose<ChromaLocationNamePair, const ChromaLocationNamePair*>(DE_ARRAY_BEGIN(chromaLocations), DE_ARRAY_END(chromaLocations)).value);
 
-                                               const TestConfig                                        config                          (shaderType, format, tiling, textureFilter, vk::VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE, vk::VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE,
-                                                                                                                                                                       textureFilter, chromaLocation, chromaLocation, false, false,
-                                                                                                                                                                       colorRange, colorModel, identitySwizzle);
+                                               const TestConfig                                config                          (shaderType, format, tiling, textureFilter, vk::VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE, vk::VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE,
+                                                                                                                                                               textureFilter, chromaLocation, chromaLocation, false, false,
+                                                                                                                                                               colorRange, colorModel, identitySwizzle);
 
                                                addFunctionCaseWithPrograms(colorModelGroup.get(), std::string(textureFilterName) + "_" + tilingName, "", createTestShaders, textureConversionTest, config);
                                        }
@@ -2602,13 +2602,13 @@ void initTests (tcu::TestCaseGroup* testGroup)
                        {
                                for (size_t rangeNdx = 0; rangeNdx < DE_LENGTH_OF_ARRAY(colorRanges); rangeNdx++)
                                {
-                                       const char* const                                       colorRangeName  (colorRanges[rangeNdx].name);
+                                       const char* const                               colorRangeName  (colorRanges[rangeNdx].name);
                                        const vk::VkSamplerYcbcrRange   colorRange              (colorRanges[rangeNdx].value);
 
                                        // Narrow range doesn't really work with formats that have less than 8 bits
                                        if (colorRange == vk::VK_SAMPLER_YCBCR_RANGE_ITU_NARROW)
                                        {
-                                               const UVec4     bitDepth        (getBitDepth(format));
+                                               const UVec4                                     bitDepth                (getBitDepth(format));
 
                                                if (bitDepth[0] < 8 || bitDepth[1] < 8 || bitDepth[2] < 8)
                                                        continue;
@@ -2623,13 +2623,13 @@ void initTests (tcu::TestCaseGroup* testGroup)
 
                                                for (size_t tilingNdx = 0; tilingNdx < DE_LENGTH_OF_ARRAY(imageTilings); tilingNdx++)
                                                {
-                                                       const vk::VkImageTiling                 tiling                          (imageTilings[tilingNdx].value);
-                                                       const char* const                               tilingName                      (imageTilings[tilingNdx].name);
-                                                       const glu::ShaderType                   shaderType                      (rng.choose<glu::ShaderType>(DE_ARRAY_BEGIN(shaderTypes), DE_ARRAY_END(shaderTypes)));
+                                                       const vk::VkImageTiling         tiling                          (imageTilings[tilingNdx].value);
+                                                       const char* const                       tilingName                      (imageTilings[tilingNdx].name);
+                                                       const glu::ShaderType           shaderType                      (rng.choose<glu::ShaderType>(DE_ARRAY_BEGIN(shaderTypes), DE_ARRAY_END(shaderTypes)));
                                                        const vk::VkChromaLocation      chromaLocation          (rng.choose<ChromaLocationNamePair, const ChromaLocationNamePair*>(DE_ARRAY_BEGIN(chromaLocations), DE_ARRAY_END(chromaLocations)).value);
-                                                       const TestConfig                                config                          (shaderType, format, tiling, textureFilter, vk::VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE, vk::VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE,
-                                                                                                                                                                       textureFilter, chromaLocation, chromaLocation, false, false,
-                                                                                                                                                                       colorRange, colorModel, identitySwizzle);
+                                                       const TestConfig                        config                          (shaderType, format, tiling, textureFilter, vk::VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE, vk::VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE,
+                                                                                                                                                               textureFilter, chromaLocation, chromaLocation, false, false,
+                                                                                                                                                               colorRange, colorModel, identitySwizzle);
 
                                                        addFunctionCaseWithPrograms(colorRangeGroup.get(), std::string(textureFilterName) + "_" + tilingName, "", createTestShaders, textureConversionTest, config);
                                                }
@@ -2658,12 +2658,12 @@ void initTests (tcu::TestCaseGroup* testGroup)
 
                        for (size_t xChromaOffsetNdx = 0; xChromaOffsetNdx < DE_LENGTH_OF_ARRAY(chromaLocations); xChromaOffsetNdx++)
                        {
-                               const char* const                               xChromaOffsetName       (chromaLocations[xChromaOffsetNdx].name);
+                               const char* const                       xChromaOffsetName       (chromaLocations[xChromaOffsetNdx].name);
                                const vk::VkChromaLocation      xChromaOffset           (chromaLocations[xChromaOffsetNdx].value);
 
                                for (size_t modelNdx = 0; modelNdx < DE_LENGTH_OF_ARRAY(colorModels); modelNdx++)
                                {
-                                       const char* const                                                       colorModelName  (colorModels[modelNdx].name);
+                                       const char* const                                               colorModelName  (colorModels[modelNdx].name);
                                        const vk::VkSamplerYcbcrModelConversion colorModel              (colorModels[modelNdx].value);
 
                                        if (colorModel != vk::VK_SAMPLER_YCBCR_MODEL_CONVERSION_RGB_IDENTITY && getFormatChannelCount(format) < 3)
@@ -2674,14 +2674,14 @@ void initTests (tcu::TestCaseGroup* testGroup)
                                        {
                                                for (size_t tilingNdx = 0; tilingNdx < DE_LENGTH_OF_ARRAY(imageTilings); tilingNdx++)
                                                {
-                                                       const vk::VkImageTiling                         tiling                  (imageTilings[tilingNdx].value);
-                                                       const char* const                                       tilingName              (imageTilings[tilingNdx].name);
+                                                       const vk::VkImageTiling                 tiling                  (imageTilings[tilingNdx].value);
+                                                       const char* const                               tilingName              (imageTilings[tilingNdx].name);
                                                        const vk::VkSamplerYcbcrRange   colorRange              (rng.choose<RangeNamePair, const RangeNamePair*>(DE_ARRAY_BEGIN(colorRanges), DE_ARRAY_END(colorRanges)).value);
-                                                       const glu::ShaderType                           shaderType              (rng.choose<glu::ShaderType>(DE_ARRAY_BEGIN(shaderTypes), DE_ARRAY_END(shaderTypes)));
+                                                       const glu::ShaderType                   shaderType              (rng.choose<glu::ShaderType>(DE_ARRAY_BEGIN(shaderTypes), DE_ARRAY_END(shaderTypes)));
                                                        const vk::VkChromaLocation              yChromaOffset   (rng.choose<ChromaLocationNamePair, const ChromaLocationNamePair*>(DE_ARRAY_BEGIN(chromaLocations), DE_ARRAY_END(chromaLocations)).value);
-                                                       const TestConfig                                        config                  (shaderType, format, tiling, vk::VK_FILTER_NEAREST, vk::VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE, vk::VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE,
-                                                                                                                                                                vk::VK_FILTER_NEAREST, xChromaOffset, yChromaOffset, false, false,
-                                                                                                                                                                colorRange, colorModel, identitySwizzle);
+                                                       const TestConfig                                config                  (shaderType, format, tiling, vk::VK_FILTER_NEAREST, vk::VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE, vk::VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE,
+                                                                                                                                                        vk::VK_FILTER_NEAREST, xChromaOffset, yChromaOffset, false, false,
+                                                                                                                                                        colorRange, colorModel, identitySwizzle);
 
                                                        addFunctionCaseWithPrograms(conversionGroup.get(), std::string(colorModelName) + "_" + tilingName + "_" + xChromaOffsetName, "", createTestShaders, textureConversionTest, config);
                                                }
@@ -2690,13 +2690,13 @@ void initTests (tcu::TestCaseGroup* testGroup)
                                        {
                                                for (size_t rangeNdx = 0; rangeNdx < DE_LENGTH_OF_ARRAY(colorRanges); rangeNdx++)
                                                {
-                                                       const char* const                                       colorRangeName  (colorRanges[rangeNdx].name);
+                                                       const char* const                               colorRangeName  (colorRanges[rangeNdx].name);
                                                        const vk::VkSamplerYcbcrRange   colorRange              (colorRanges[rangeNdx].value);
 
                                                        // Narrow range doesn't really work with formats that have less than 8 bits
                                                        if (colorRange == vk::VK_SAMPLER_YCBCR_RANGE_ITU_NARROW)
                                                        {
-                                                               const UVec4     bitDepth        (getBitDepth(format));
+                                                               const UVec4                                     bitDepth                (getBitDepth(format));
 
                                                                if (bitDepth[0] < 8 || bitDepth[1] < 8 || bitDepth[2] < 8)
                                                                        continue;
@@ -2704,13 +2704,13 @@ void initTests (tcu::TestCaseGroup* testGroup)
 
                                                        for (size_t tilingNdx = 0; tilingNdx < DE_LENGTH_OF_ARRAY(imageTilings); tilingNdx++)
                                                        {
-                                                               const vk::VkImageTiling                 tiling                  (imageTilings[tilingNdx].value);
-                                                               const char* const                               tilingName              (imageTilings[tilingNdx].name);
-                                                               const glu::ShaderType                   shaderType              (rng.choose<glu::ShaderType>(DE_ARRAY_BEGIN(shaderTypes), DE_ARRAY_END(shaderTypes)));
+                                                               const vk::VkImageTiling         tiling                  (imageTilings[tilingNdx].value);
+                                                               const char* const                       tilingName              (imageTilings[tilingNdx].name);
+                                                               const glu::ShaderType           shaderType              (rng.choose<glu::ShaderType>(DE_ARRAY_BEGIN(shaderTypes), DE_ARRAY_END(shaderTypes)));
                                                                const vk::VkChromaLocation      yChromaOffset   (rng.choose<ChromaLocationNamePair, const ChromaLocationNamePair*>(DE_ARRAY_BEGIN(chromaLocations), DE_ARRAY_END(chromaLocations)).value);
-                                                               const TestConfig                                config                  (shaderType, format, tiling, vk::VK_FILTER_NEAREST, vk::VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE, vk::VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE,
-                                                                                                                                                               vk::VK_FILTER_NEAREST, xChromaOffset, yChromaOffset, false, false,
-                                                                                                                                                               colorRange, colorModel, identitySwizzle);
+                                                               const TestConfig                        config                  (shaderType, format, tiling, vk::VK_FILTER_NEAREST, vk::VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE, vk::VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE,
+                                                                                                                                                       vk::VK_FILTER_NEAREST, xChromaOffset, yChromaOffset, false, false,
+                                                                                                                                                       colorRange, colorModel, identitySwizzle);
 
                                                                addFunctionCaseWithPrograms(conversionGroup.get(), (string(colorModelName) + "_" + colorRangeName + "_" + tilingName + "_" + xChromaOffsetName).c_str(), "", createTestShaders, textureConversionTest, config);
                                                        }
@@ -2747,8 +2747,8 @@ void initTests (tcu::TestCaseGroup* testGroup)
 
                                                        for (size_t tilingNdx = 0; tilingNdx < DE_LENGTH_OF_ARRAY(imageTilings); tilingNdx++)
                                                        {
-                                                               const vk::VkImageTiling tiling          (imageTilings[tilingNdx].value);
-                                                               const char* const               tilingName      (imageTilings[tilingNdx].name);
+                                                               const vk::VkImageTiling         tiling                          (imageTilings[tilingNdx].value);
+                                                               const char* const                       tilingName                      (imageTilings[tilingNdx].name);
 
                                                                {
                                                                        const glu::ShaderType                   shaderType              (rng.choose<glu::ShaderType>(DE_ARRAY_BEGIN(shaderTypes), DE_ARRAY_END(shaderTypes)));
@@ -2847,7 +2847,7 @@ void initTests (tcu::TestCaseGroup* testGroup)
 
                        for (size_t chromaOffsetNdx = 0; chromaOffsetNdx < DE_LENGTH_OF_ARRAY(chromaLocations); chromaOffsetNdx++)
                        {
-                               const char* const                               chromaOffsetName        (chromaLocations[chromaOffsetNdx].name);
+                               const char* const                       chromaOffsetName        (chromaLocations[chromaOffsetNdx].name);
                                const vk::VkChromaLocation      chromaOffset            (chromaLocations[chromaOffsetNdx].value);
 
                                for (size_t modelNdx = 0; modelNdx < DE_LENGTH_OF_ARRAY(colorModels); modelNdx++)
index e1def3a..7f33a04 100644 (file)
@@ -104,9 +104,9 @@ Move<VkImageView> createImageView (const DeviceInterface&           vkd,
                                                                   VkDevice                                             device,
                                                                   VkImage                                              image,
                                                                   VkFormat                                             format,
-                                                                  VkSamplerYcbcrConversion     conversion)
+                                                                  VkSamplerYcbcrConversion             conversion)
 {
-       const VkSamplerYcbcrConversionInfo      conversionInfo  =
+       const VkSamplerYcbcrConversionInfo              conversionInfo  =
        {
                VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_INFO,
                DE_NULL,
@@ -134,11 +134,11 @@ Move<VkImageView> createImageView (const DeviceInterface&         vkd,
 
 Move<VkDescriptorSetLayout> createDescriptorSetLayout (const DeviceInterface& vkd, VkDevice device, VkSampler sampler)
 {
-       const VkDescriptorSetLayoutBinding              binding         =
+       const VkDescriptorSetLayoutBinding              binding                 =
        {
-               0u,                                                                                             // binding
+               0u,                                                                                                     // binding
                VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
-               1u,                                                                                             // descriptorCount
+               1u,                                                                                                     // descriptorCount
                VK_SHADER_STAGE_ALL,
                &sampler
        };
@@ -180,10 +180,10 @@ Move<VkDescriptorSet> createDescriptorSet (const DeviceInterface& vkd,
                                                                                   VkImageView                          imageView,
                                                                                   VkSampler                            sampler)
 {
-       Move<VkDescriptorSet>   descSet;
+       Move<VkDescriptorSet>                                   descSet;
 
        {
-               const VkDescriptorSetAllocateInfo       allocInfo       =
+               const VkDescriptorSetAllocateInfo       allocInfo                       =
                {
                        VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO,
                        DE_NULL,
@@ -196,13 +196,13 @@ Move<VkDescriptorSet> createDescriptorSet (const DeviceInterface& vkd,
        }
 
        {
-               const VkDescriptorImageInfo             imageInfo                       =
+               const VkDescriptorImageInfo                     imageInfo                       =
                {
                        sampler,
                        imageView,
                        VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL
                };
-               const VkWriteDescriptorSet              descriptorWrite         =
+               const VkWriteDescriptorSet                      descriptorWrite         =
                {
                        VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET,
                        DE_NULL,
@@ -295,20 +295,21 @@ tcu::TestStatus testFormat (Context& context, TestParameters params)
 {
        checkSupport(context, params);
 
-       const DeviceInterface&                          vkd                             = context.getDeviceInterface();
-       const VkDevice                                          device                  = context.getDevice();
+       const DeviceInterface&                                  vkd                                             = context.getDeviceInterface();
+       const VkDevice                                                  device                                  = context.getDevice();
 
-       const VkFormat                                          format                  = params.format;
-       const PlanarFormatDescription           formatInfo              = getPlanarFormatDescription(format);
-       const UVec2                                                     size                    = params.size;
-       const VkImageCreateFlags                        createFlags             = params.flags;
-       const VkImageTiling                                     tiling                  = params.tiling;
-       const bool                                                      mappedMemory    = params.useMappedMemory;
+       const VkFormat                                                  format                                  = params.format;
+       const PlanarFormatDescription                   formatInfo                              = getPlanarFormatDescription(format);
+       const UVec2                                                             size                                    = params.size;
+       const VkImageCreateFlags                                createFlags                             = params.flags;
+       const VkImageTiling                                             tiling                                  = params.tiling;
+       const bool                                                              mappedMemory                    = params.useMappedMemory;
 
-       const Unique<VkImage>                           image                   (createTestImage(vkd, device, format, size, createFlags, tiling, mappedMemory ? VK_IMAGE_LAYOUT_PREINITIALIZED : VK_IMAGE_LAYOUT_UNDEFINED));
-       const vector<AllocationSp>                      allocations             (allocateAndBindImageMemory(vkd, device, context.getDefaultAllocator(), *image, format, createFlags, mappedMemory ? MemoryRequirement::HostVisible : MemoryRequirement::Any));
+       const Unique<VkImage>                                   image                                   (createTestImage(vkd, device, format, size, createFlags, tiling, mappedMemory ? VK_IMAGE_LAYOUT_PREINITIALIZED : VK_IMAGE_LAYOUT_UNDEFINED));
+       const vector<AllocationSp>                              allocations                             (allocateAndBindImageMemory(vkd, device, context.getDefaultAllocator(), *image, format, createFlags, mappedMemory ? MemoryRequirement::HostVisible : MemoryRequirement::Any));
 
-       const VkSamplerYcbcrConversionCreateInfo                        conversionInfo                  =
+       const VkSamplerYcbcrConversionCreateInfo
+                                                                                       conversionInfo                  =
        {
                VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_CREATE_INFO,
                DE_NULL,
@@ -326,10 +327,10 @@ tcu::TestStatus testFormat (Context& context, TestParameters params)
                VK_FILTER_NEAREST,
                VK_FALSE,                                                                       // forceExplicitReconstruction
        };
-       const Unique<VkSamplerYcbcrConversion>                          conversion                              (createSamplerYcbcrConversion(vkd, device, &conversionInfo));
-       const Unique<VkImageView>                                                       imageView                               (createImageView(vkd, device, *image, format, *conversion));
+       const Unique<VkSamplerYcbcrConversion>  conversion                              (createSamplerYcbcrConversion(vkd, device, &conversionInfo));
+       const Unique<VkImageView>                               imageView                               (createImageView(vkd, device, *image, format, *conversion));
 
-       const VkSamplerYcbcrConversionInfo      samplerConversionInfo   =
+       const VkSamplerYcbcrConversionInfo              samplerConversionInfo   =
        {
                VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_INFO,
                DE_NULL,
@@ -358,13 +359,13 @@ tcu::TestStatus testFormat (Context& context, TestParameters params)
                VK_FALSE,                                                                       // unnormalizedCoords
        };
 
-       const Unique<VkSampler>                         sampler         (createSampler(vkd, device, &samplerInfo));
+       const Unique<VkSampler>                                 sampler                                 (createSampler(vkd, device, &samplerInfo));
 
-       const Unique<VkDescriptorSetLayout>     descLayout      (createDescriptorSetLayout(vkd, device, *sampler));
-       const Unique<VkDescriptorPool>          descPool        (createDescriptorPool(vkd, device));
-       const Unique<VkDescriptorSet>           descSet         (createDescriptorSet(vkd, device, *descPool, *descLayout, *imageView, *sampler));
+       const Unique<VkDescriptorSetLayout>             descLayout                              (createDescriptorSetLayout(vkd, device, *sampler));
+       const Unique<VkDescriptorPool>                  descPool                                (createDescriptorPool(vkd, device));
+       const Unique<VkDescriptorSet>                   descSet                                 (createDescriptorSet(vkd, device, *descPool, *descLayout, *imageView, *sampler));
 
-       MultiPlaneImageData                                     imageData       (format, size);
+       MultiPlaneImageData                                             imageData                               (format, size);
 
        // Prepare texture data
        fillGradient(&imageData, Vec4(0.0f), Vec4(1.0f));
index 6176666..4a72175 100644 (file)
@@ -335,7 +335,7 @@ tcu::TestStatus testImageQuery (Context& context, TestParameters params)
        const DeviceInterface&                          vkd                             = context.getDeviceInterface();
        const VkDevice                                          device                  = context.getDevice();
 
-       const VkSamplerYcbcrConversionCreateInfo                        conversionInfo                  =
+       const VkSamplerYcbcrConversionCreateInfo                conversionInfo                  =
        {
                VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_CREATE_INFO,
                DE_NULL,
@@ -354,8 +354,8 @@ tcu::TestStatus testImageQuery (Context& context, TestParameters params)
                VK_FALSE,                                                                       // forceExplicitReconstruction
        };
        const Unique<VkSamplerYcbcrConversion>                  conversion                              (isYCbCrImage
-                                                                                                                                                                ? createSamplerYcbcrConversion(vkd, device, &conversionInfo)
-                                                                                                                                                                : Move<VkSamplerYcbcrConversion>());
+                                                                                                                                                        ? createSamplerYcbcrConversion(vkd, device, &conversionInfo)
+                                                                                                                                                        : Move<VkSamplerYcbcrConversion>());
 
        const VkSamplerYcbcrConversionInfo                              samplerConversionInfo   =
        {
@@ -364,7 +364,7 @@ tcu::TestStatus testImageQuery (Context& context, TestParameters params)
                *conversion,
        };
 
-       const VkSamplerCreateInfo                                                       samplerInfo                             =
+       const VkSamplerCreateInfo                                               samplerInfo                             =
        {
                VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO,
                isYCbCrImage ? &samplerConversionInfo : DE_NULL,
@@ -395,9 +395,9 @@ tcu::TestStatus testImageQuery (Context& context, TestParameters params)
 
        if (params.query == QUERY_TYPE_IMAGE_SIZE_LOD)
        {
-               const PlanarFormatDescription&          formatDesc      = getPlanarFormatDescription(params.format);
-               const UVec2                                                     maxDivisor      = getMaxPlaneDivisor(formatDesc);
-               vector<UVec2>                                           testSizes;
+               const PlanarFormatDescription&  formatDesc      = getPlanarFormatDescription(params.format);
+               const UVec2                                             maxDivisor      = getMaxPlaneDivisor(formatDesc);
+               vector<UVec2>                                   testSizes;
 
                testSizes.push_back(maxDivisor);
                testSizes.push_back(maxDivisor * UVec2(2u, 1u));
@@ -512,7 +512,7 @@ tcu::TestStatus testImageQueryLod (Context& context, TestParameters params)
                *conversion,
        };
 
-       const VkSamplerCreateInfo                                                       samplerInfo                             =
+       const VkSamplerCreateInfo                                               samplerInfo                             =
        {
                VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO,
                isYCbCrImage ? &samplerConversionInfo : DE_NULL,
index 87f3b85..0ac0aa1 100644 (file)
@@ -161,7 +161,7 @@ Move<VkImageView> createImageView (const DeviceInterface&           vkd,
                                                                   VkImage                                              image,
                                                                   VkFormat                                             format,
                                                                   VkImageAspectFlagBits                imageAspect,
-                                                                  VkSamplerYcbcrConversion     conversion)
+                                                                  VkSamplerYcbcrConversion             conversion)
 {
        const VkSamplerYcbcrConversionInfo      samplerConversionInfo   =
        {