diff options
author | Laszlo Agocs <laszlo.agocs@qt.io> | 2021-05-21 18:56:22 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2021-05-31 17:16:49 +0200 |
commit | bbc6b5c3a7b5ac086099556c0d3299a89c956dbe (patch) | |
tree | c82f3474a441af4503a87dd2f59b48e89986a735 /src/gui | |
parent | 0199640d44354a736a11241213380dcff8a850b7 (diff) |
vulkan: Update legacy tests and examples to the modern validation layer
Fixes: QTBUG-88388
Change-Id: Ib072f203ada5d692dea8d35da2b24db0deac0297
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/doc/snippets/code/src_gui_vulkan_qvulkaninstance.cpp | 6 | ||||
-rw-r--r-- | src/gui/doc/snippets/code/src_gui_vulkan_qvulkanwindow.cpp | 2 | ||||
-rw-r--r-- | src/gui/vulkan/qvulkanwindow.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/doc/snippets/code/src_gui_vulkan_qvulkaninstance.cpp b/src/gui/doc/snippets/code/src_gui_vulkan_qvulkaninstance.cpp index 0ce6492b12..1dfd43ad10 100644 --- a/src/gui/doc/snippets/code/src_gui_vulkan_qvulkaninstance.cpp +++ b/src/gui/doc/snippets/code/src_gui_vulkan_qvulkaninstance.cpp @@ -85,14 +85,14 @@ void wrapper0() { QVulkanInstance inst; // Enable validation layer, if supported. Messages go to qDebug by default. - inst.setLayers(QByteArrayList() << "VK_LAYER_LUNARG_standard_validation"); + inst.setLayers({ "VK_LAYER_KHRONOS_validation" }); bool ok = inst.create(); if (!ok) { // ... Vulkan not available } - if (!inst.layers().contains("VK_LAYER_LUNARG_standard_validation")) { + if (!inst.layers().contains("VK_LAYER_KHRONOS_validation")) { // ... validation layer not available } //! [1] @@ -103,7 +103,7 @@ void wrapper1() { //! [2] QVulkanInstance inst; - if (inst.supportedLayers().contains("VK_LAYER_LUNARG_standard_validation")) { + if (inst.supportedLayers().contains("VK_LAYER_KHRONOS_validation")) { // ... } bool ok = inst.create(); diff --git a/src/gui/doc/snippets/code/src_gui_vulkan_qvulkanwindow.cpp b/src/gui/doc/snippets/code/src_gui_vulkan_qvulkanwindow.cpp index 535b99be75..1f4988ca35 100644 --- a/src/gui/doc/snippets/code/src_gui_vulkan_qvulkanwindow.cpp +++ b/src/gui/doc/snippets/code/src_gui_vulkan_qvulkanwindow.cpp @@ -98,7 +98,7 @@ int main(int argc, char *argv[]) QVulkanInstance inst; // enable the standard validation layers, when available - inst.setLayers(QByteArrayList() << "VK_LAYER_LUNARG_standard_validation"); + inst.setLayers({ "VK_LAYER_KHRONOS_validation" }); if (!inst.create()) qFatal("Failed to create Vulkan instance: %d", inst.errorCode()); diff --git a/src/gui/vulkan/qvulkanwindow.cpp b/src/gui/vulkan/qvulkanwindow.cpp index c4316d453b..32a1d76748 100644 --- a/src/gui/vulkan/qvulkanwindow.cpp +++ b/src/gui/vulkan/qvulkanwindow.cpp @@ -722,7 +722,7 @@ void QVulkanWindowPrivate::init() && VK_VERSION_PATCH(apiVersion) <= 13) { // Make standard validation work at least. - const QByteArray stdValName = QByteArrayLiteral("VK_LAYER_LUNARG_standard_validation"); + const QByteArray stdValName = QByteArrayLiteral("VK_LAYER_KHRONOS_validation"); const char *stdValNamePtr = stdValName.constData(); if (inst->layers().contains(stdValName)) { uint32_t count = 0; |