diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2021-05-21 19:05:19 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2021-05-31 17:16:53 +0200 |
| commit | 5eab5d62530f351307a01ca57af964e5c506079c (patch) | |
| tree | e4354b27609073004e325e31c40787f149926c1d /src/gui | |
| parent | bbc6b5c3a7b5ac086099556c0d3299a89c956dbe (diff) | |
rhi: vk: Switch to the modern validation layer internally
Task-number: QTBUG-88388
Change-Id: Ia30af6c4554594f094af7866ad6e10ed7929de27
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/rhi/qrhivulkan.cpp | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/src/gui/rhi/qrhivulkan.cpp b/src/gui/rhi/qrhivulkan.cpp index 73288cb4a1..fa1bf9160c 100644 --- a/src/gui/rhi/qrhivulkan.cpp +++ b/src/gui/rhi/qrhivulkan.cpp @@ -104,18 +104,7 @@ QT_BEGIN_NAMESPACE ... QVulkanInstance inst; - #ifndef Q_OS_ANDROID - inst.setLayers(QByteArrayList() << "VK_LAYER_LUNARG_standard_validation"); - #else - inst.setLayers(QByteArrayList() - << "VK_LAYER_GOOGLE_threading" - << "VK_LAYER_LUNARG_parameter_validation" - << "VK_LAYER_LUNARG_object_tracker" - << "VK_LAYER_LUNARG_core_validation" - << "VK_LAYER_LUNARG_image" - << "VK_LAYER_LUNARG_swapchain" - << "VK_LAYER_GOOGLE_unique_objects"); - #endif + inst.setLayers({ "VK_LAYER_KHRONOS_validation" }); // for debugging only, not for release builds inst.setExtensions(QRhiVulkanInitParams::preferredInstanceExtensions()); if (!inst.create()) qFatal("Vulkan not available"); @@ -549,8 +538,8 @@ bool QRhiVulkan::create(QRhi::Flags flags) queueInfo[0].pQueuePriorities = prio; QList<const char *> devLayers; - if (inst->layers().contains("VK_LAYER_LUNARG_standard_validation")) - devLayers.append("VK_LAYER_LUNARG_standard_validation"); + if (inst->layers().contains("VK_LAYER_KHRONOS_validation")) + devLayers.append("VK_LAYER_KHRONOS_validation"); QVulkanInfoVector<QVulkanExtension> devExts; uint32_t devExtCount = 0; |