Use getDevice() instead of m_logicalDevice.get() so it works in both paths
authorPiers Daniell <pdaniell@nvidia.com>
Fri, 8 Apr 2022 22:05:43 +0000 (16:05 -0600)
committerMatthew Netsch <quic_mnetsch@quicinc.com>
Thu, 14 Apr 2022 20:53:08 +0000 (20:53 +0000)
This CL fixes a regression introduced with CL9062. For the non-dynamic
paths of the test the m_logicalDevice does not contain a valid
device handle. The newly added getDevice() already handles both
the dynamic and non-dynamic paths, so use that instead of
m_logicalDevice.get().

Affects:

dEQP-VK.memory.binding.*

Components: Vulkan

VK-GL-CTS Issue: 3627

Change-Id: I4ebf74a000553d70db86035ac50b2d4f3257d6ac

external/vulkancts/modules/vulkan/memory/vktMemoryBindingTests.cpp

index 35d6361..8a2e937 100644 (file)
@@ -502,8 +502,8 @@ public:
 
                        m_logicalDevice         = createCustomDevice(m_context.getTestContext().getCommandLine().isValidationEnabled(), m_context.getPlatformInterface(), instance, instanceDriver, m_context.getPhysicalDevice(), &deviceInfo);
                }
-               m_logicalDeviceInterface = de::MovePtr<DeviceDriver>(new DeviceDriver(m_context.getPlatformInterface(), m_context.getInstance(), m_logicalDevice.get()));
-               m_logicalDeviceInterface->getDeviceQueue(m_logicalDevice.get(), m_context.getUniversalQueueFamilyIndex(), 0, &m_logicalDeviceQueue);
+               m_logicalDeviceInterface = de::MovePtr<DeviceDriver>(new DeviceDriver(m_context.getPlatformInterface(), m_context.getInstance(), getDevice()));
+               m_logicalDeviceInterface->getDeviceQueue(getDevice(), m_context.getUniversalQueueFamilyIndex(), 0, &m_logicalDeviceQueue);
        };
 
 protected: