From 5eab5d62530f351307a01ca57af964e5c506079c Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Fri, 21 May 2021 19:05:19 +0200 Subject: rhi: vk: Switch to the modern validation layer internally Task-number: QTBUG-88388 Change-Id: Ia30af6c4554594f094af7866ad6e10ed7929de27 Reviewed-by: Andy Nichols --- tests/auto/gui/rhi/qrhi/tst_qrhi.cpp | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'tests/auto/gui/rhi/qrhi/tst_qrhi.cpp') diff --git a/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp b/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp index 18eebaae1e..bdcbc587fc 100644 --- a/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp +++ b/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp @@ -169,17 +169,7 @@ void tst_QRhi::initTestCase() #endif #ifdef TST_VK -#ifndef Q_OS_ANDROID - vulkanInstance.setLayers({ QByteArrayLiteral("VK_LAYER_LUNARG_standard_validation") }); -#else - vulkanInstance.setLayers({ QByteArrayLiteral("VK_LAYER_GOOGLE_threading"), - QByteArrayLiteral("VK_LAYER_LUNARG_parameter_validation"), - QByteArrayLiteral("VK_LAYER_LUNARG_object_tracker"), - QByteArrayLiteral("VK_LAYER_LUNARG_core_validation"), - QByteArrayLiteral("VK_LAYER_LUNARG_image"), - QByteArrayLiteral("VK_LAYER_LUNARG_swapchain"), - QByteArrayLiteral("VK_LAYER_GOOGLE_unique_objects") }); -#endif + vulkanInstance.setLayers({ "VK_LAYER_KHRONOS_validation" }); vulkanInstance.setExtensions(QRhiVulkanInitParams::preferredInstanceExtensions()); vulkanInstance.create(); initParams.vk.inst = &vulkanInstance; -- cgit v1.2.3