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 /examples | |
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 'examples')
-rw-r--r-- | examples/vulkan/hellovulkancubes/main.cpp | 14 | ||||
-rw-r--r-- | examples/vulkan/hellovulkantexture/main.cpp | 14 | ||||
-rw-r--r-- | examples/vulkan/hellovulkantriangle/main.cpp | 14 | ||||
-rw-r--r-- | examples/vulkan/hellovulkanwidget/main.cpp | 14 | ||||
-rw-r--r-- | examples/vulkan/hellovulkanwindow/main.cpp | 15 |
5 files changed, 5 insertions, 66 deletions
diff --git a/examples/vulkan/hellovulkancubes/main.cpp b/examples/vulkan/hellovulkancubes/main.cpp index 4ec4d48645..9c5244bbdf 100644 --- a/examples/vulkan/hellovulkancubes/main.cpp +++ b/examples/vulkan/hellovulkancubes/main.cpp @@ -63,19 +63,7 @@ int main(int argc, char **argv) if (dbg) { QLoggingCategory::setFilterRules(QStringLiteral("qt.vulkan=true")); - -#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" }); } if (!inst.create()) diff --git a/examples/vulkan/hellovulkantexture/main.cpp b/examples/vulkan/hellovulkantexture/main.cpp index bb6103e9cf..86414dd0a1 100644 --- a/examples/vulkan/hellovulkantexture/main.cpp +++ b/examples/vulkan/hellovulkantexture/main.cpp @@ -62,19 +62,7 @@ int main(int argc, char *argv[]) QLoggingCategory::setFilterRules(QStringLiteral("qt.vulkan=true")); 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" }); if (!inst.create()) qFatal("Failed to create Vulkan instance: %d", inst.errorCode()); diff --git a/examples/vulkan/hellovulkantriangle/main.cpp b/examples/vulkan/hellovulkantriangle/main.cpp index d3eef2e14a..ae56207f81 100644 --- a/examples/vulkan/hellovulkantriangle/main.cpp +++ b/examples/vulkan/hellovulkantriangle/main.cpp @@ -73,19 +73,7 @@ int main(int argc, char *argv[]) QLoggingCategory::setFilterRules(QStringLiteral("qt.vulkan=true")); 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" }); if (!inst.create()) qFatal("Failed to create Vulkan instance: %d", inst.errorCode()); diff --git a/examples/vulkan/hellovulkanwidget/main.cpp b/examples/vulkan/hellovulkanwidget/main.cpp index 5ddaf90224..999011db5f 100644 --- a/examples/vulkan/hellovulkanwidget/main.cpp +++ b/examples/vulkan/hellovulkanwidget/main.cpp @@ -81,19 +81,7 @@ int main(int argc, char *argv[]) QLoggingCategory::setFilterRules(QStringLiteral("qt.vulkan=true")); 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" }); if (!inst.create()) qFatal("Failed to create Vulkan instance: %d", inst.errorCode()); diff --git a/examples/vulkan/hellovulkanwindow/main.cpp b/examples/vulkan/hellovulkanwindow/main.cpp index 313c28f9e0..72e80cdd13 100644 --- a/examples/vulkan/hellovulkanwindow/main.cpp +++ b/examples/vulkan/hellovulkanwindow/main.cpp @@ -63,20 +63,7 @@ int main(int argc, char *argv[]) //! [0] 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" }); if (!inst.create()) qFatal("Failed to create Vulkan instance: %d", inst.errorCode()); //! [0] |