AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rhi: manual tests: Switch to VK_LAYER_KHRONOS_validation

Browse Source 
Task-number: QTBUG-88388
Change-Id: Ia6d7caf0357b017625d3245a72d21a3023d81035
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
This commit is contained in:
Laszlo Agocs 2021-05-21 18:48:35 +02:00
parent 82499a6a28
commit 0199640d44
5 changed files with 5 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/manual/rhi/hellominimalcrossgfxtriangle/main.cpp
View File

@ -126,18 +126,7 @@ int main(int argc, char **argv)
#if QT_CONFIG(vulkan)
QVulkanInstance inst;
if (graphicsApi == QRhi::Vulkan) {
#ifndef Q_OS_ANDROID
inst.setLayers({ "VK_LAYER_LUNARG_standard_validation" });
#else
inst.setLayers({
"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" });
inst.setExtensions(QRhiVulkanInitParams::preferredInstanceExtensions());
if (!inst.create()) {
qWarning("Failed to create Vulkan instance, switching to OpenGL");

13
tests/manual/rhi/multiwindow/multiwindow.cpp
View File

@ -561,18 +561,7 @@ int main(int argc, char **argv)
#if QT_CONFIG(vulkan)
r.instance = new QVulkanInstance;
if (graphicsApi == Vulkan) {
#ifndef Q_OS_ANDROID
r.instance->setLayers({ "VK_LAYER_LUNARG_standard_validation" });
#else
r.instance->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
r.instance->setLayers({ "VK_LAYER_KHRONOS_validation" });
if (!r.instance->create()) {
qWarning("Failed to create Vulkan instance, switching to OpenGL");
graphicsApi = OpenGL;

13
tests/manual/rhi/multiwindow_threaded/multiwindow_threaded.cpp
View File

@ -763,18 +763,7 @@ int main(int argc, char **argv)
#if QT_CONFIG(vulkan)
instance = new QVulkanInstance;
if (graphicsApi == Vulkan) {
#ifndef Q_OS_ANDROID
instance->setLayers({ "VK_LAYER_LUNARG_standard_validation" });
#else
instance->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
instance->setLayers({ "VK_LAYER_KHRONOS_validation" });
if (!instance->create()) {
qWarning("Failed to create Vulkan instance, switching to OpenGL");
graphicsApi = OpenGL;

13
tests/manual/rhi/offscreen/offscreen.cpp
View File

@ -175,18 +175,7 @@ int main(int argc, char **argv)
QVulkanInstance inst;
if (graphicsApi == Vulkan) {
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()) {
QRhiVulkanInitParams params;
params.inst = &inst;

13
tests/manual/rhi/shared/examplefw.h
View File

@ -536,18 +536,7 @@ int main(int argc, char **argv)
if (graphicsApi == Vulkan) {
if (debugLayer) {
qDebug("Enabling Vulkan validation layer (if available)");
#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" });
}
inst.setExtensions(QRhiVulkanInitParams::preferredInstanceExtensions());
if (!inst.create()) {