From: Slawomir Cygan Date: Mon, 28 Oct 2019 16:04:44 +0000 (+0100) Subject: Remove dead members from synchronization OperationContext X-Git-Tag: upstream/1.3.5~1719 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=75863ad53dab96df790db328e794a5fbabf8b858;p=platform%2Fupstream%2FVK-GL-CTS.git Remove dead members from synchronization OperationContext These are not used since the switch to `requireDeviceFunctionality` test case API. Components: Vulkan Affects: dEQP-VK.synchronization.* Change-Id: Ib6e0b817e5732e1be2e58b5b781a4f5af9d824a3 --- diff --git a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationCrossInstanceSharingTests.cpp b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationCrossInstanceSharingTests.cpp index a6e9dcb..74e3b4b 100644 --- a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationCrossInstanceSharingTests.cpp +++ b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationCrossInstanceSharingTests.cpp @@ -1061,8 +1061,7 @@ tcu::TestStatus SharingTestInstance::iterate (void) const vk::Unique commandPoolA (createCommandPool(m_vkdA, *m_deviceA, queueFamilyA)); const vk::Unique commandBufferA (createCommandBuffer(m_vkdA, *m_deviceA, *commandPoolA)); vk::SimpleAllocator allocatorA (m_vkdA, *m_deviceA, vk::getPhysicalDeviceMemoryProperties(m_vkiA, m_physicalDeviceA)); - const std::vector deviceExtensionsA; - OperationContext operationContextA (m_context, m_vkiA, m_vkdA, m_physicalDeviceA, *m_deviceA, allocatorA, deviceExtensionsA, m_context.getBinaryCollection(), m_pipelineCacheData); + OperationContext operationContextA (m_context, m_vkiA, m_vkdA, m_physicalDeviceA, *m_deviceA, allocatorA, m_context.getBinaryCollection(), m_pipelineCacheData); if (!checkQueueFlags(m_queueFamiliesA[m_queueANdx].queueFlags , m_supportWriteOp->getQueueFlags(operationContextA))) TCU_THROW(NotSupportedError, "Operation not supported by the source queue"); @@ -1071,8 +1070,7 @@ tcu::TestStatus SharingTestInstance::iterate (void) const vk::Unique commandPoolB (createCommandPool(m_vkdB, *m_deviceB, queueFamilyB)); const vk::Unique commandBufferB (createCommandBuffer(m_vkdB, *m_deviceB, *commandPoolB)); vk::SimpleAllocator allocatorB (m_vkdB, *m_deviceB, vk::getPhysicalDeviceMemoryProperties(m_vkiB, m_physicalDeviceB)); - const std::vector deviceExtensionsB; - OperationContext operationContextB (m_context, m_vkiB, m_vkdB, m_physicalDeviceB, *m_deviceB, allocatorB, deviceExtensionsB, m_context.getBinaryCollection(), m_pipelineCacheData); + OperationContext operationContextB (m_context, m_vkiB, m_vkdB, m_physicalDeviceB, *m_deviceB, allocatorB, m_context.getBinaryCollection(), m_pipelineCacheData); if (!checkQueueFlags(m_queueFamiliesB[m_queueBNdx].queueFlags , m_supportReadOp->getQueueFlags(operationContextB))) TCU_THROW(NotSupportedError, "Operation not supported by the destination queue"); diff --git a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperation.cpp b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperation.cpp index 8b552e8..5cfbc30 100644 --- a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperation.cpp +++ b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperation.cpp @@ -4625,8 +4625,6 @@ OperationContext::OperationContext (Context& context, PipelineCacheData& pipelin , m_allocator (context.getDefaultAllocator()) , m_progCollection (context.getBinaryCollection()) , m_pipelineCacheData (pipelineCacheData) - , m_deviceExtensions (context.getDeviceExtensions()) - , m_usedApiVersion (context.getUsedApiVersion()) { } @@ -4639,8 +4637,6 @@ OperationContext::OperationContext (Context& context, PipelineCacheData& pipelin , m_allocator (allocator) , m_progCollection (context.getBinaryCollection()) , m_pipelineCacheData (pipelineCacheData) - , m_deviceExtensions (context.getDeviceExtensions()) - , m_usedApiVersion (context.getUsedApiVersion()) { } @@ -4650,7 +4646,6 @@ OperationContext::OperationContext (Context& context, vk::VkPhysicalDevice physicalDevice, vk::VkDevice device, vk::Allocator& allocator, - const std::vector& deviceExtensions, vk::BinaryCollection& programCollection, PipelineCacheData& pipelineCacheData) : m_context (context) @@ -4661,8 +4656,6 @@ OperationContext::OperationContext (Context& context, , m_allocator (allocator) , m_progCollection (programCollection) , m_pipelineCacheData (pipelineCacheData) - , m_deviceExtensions (deviceExtensions) - , m_usedApiVersion (context.getUsedApiVersion()) { } diff --git a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperation.hpp b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperation.hpp index 7b9db4d..66422b4 100644 --- a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperation.hpp +++ b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperation.hpp @@ -144,7 +144,6 @@ public: vk::VkPhysicalDevice physicalDevice, vk::VkDevice device, vk::Allocator& allocator, - const std::vector& deviceExtensions, vk::BinaryCollection& programCollection, PipelineCacheData& pipelineCacheData); @@ -155,8 +154,6 @@ public: vk::Allocator& getAllocator (void) const { return m_allocator; } vk::BinaryCollection& getBinaryCollection (void) const { return m_progCollection; } PipelineCacheData& getPipelineCacheData (void) const { return m_pipelineCacheData; } - const std::vector& getDeviceExtensions (void) const { return m_deviceExtensions;} - deUint32 getUsedApiVersion (void) const { return m_usedApiVersion; } bool isDeviceFunctionalitySupported(const std::string& extension) const { @@ -172,8 +169,6 @@ private: vk::Allocator& m_allocator; vk::BinaryCollection& m_progCollection; PipelineCacheData& m_pipelineCacheData; - const std::vector& m_deviceExtensions; - const deUint32 m_usedApiVersion; // Disabled OperationContext (const OperationContext&); diff --git a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationWin32KeyedMutexTests.cpp b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationWin32KeyedMutexTests.cpp index 6aa5405..2271d48 100644 --- a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationWin32KeyedMutexTests.cpp +++ b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationWin32KeyedMutexTests.cpp @@ -1644,8 +1644,7 @@ tcu::TestStatus Win32KeyedMutexTestInstance::iterate (void) const vk::Unique commandBufferWrite (allocateCommandBuffer(m_vkd, *m_device, *commandPool, vk::VK_COMMAND_BUFFER_LEVEL_PRIMARY)); const vk::Unique commandBufferRead (allocateCommandBuffer(m_vkd, *m_device, *commandPool, vk::VK_COMMAND_BUFFER_LEVEL_PRIMARY)); vk::SimpleAllocator allocator (m_vkd, *m_device, vk::getPhysicalDeviceMemoryProperties(m_vki, m_physicalDevice)); - const std::vector deviceExtensions; - OperationContext operationContext (m_context, m_vki, m_vkd, m_physicalDevice, *m_device, allocator, deviceExtensions, m_context.getBinaryCollection(), m_pipelineCacheData); + OperationContext operationContext (m_context, m_vki, m_vkd, m_physicalDevice, *m_device, allocator, m_context.getBinaryCollection(), m_pipelineCacheData); if (!checkQueueFlags(m_queueFamilies[m_queueNdx].queueFlags, vk::VK_QUEUE_GRAPHICS_BIT)) TCU_THROW(NotSupportedError, "Operation not supported by the source queue");