summaryrefslogtreecommitdiffstats
path: root/tests/manual/qvulkaninstance/main.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/manual/qvulkaninstance/main.cpp')
-rw-r--r--tests/manual/qvulkaninstance/main.cpp35
1 files changed, 5 insertions, 30 deletions
diff --git a/tests/manual/qvulkaninstance/main.cpp b/tests/manual/qvulkaninstance/main.cpp
index f1bfa79669..48825b34f6 100644
--- a/tests/manual/qvulkaninstance/main.cpp
+++ b/tests/manual/qvulkaninstance/main.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2017 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
#include <QGuiApplication>
#include <QVulkanInstance>
@@ -222,8 +197,8 @@ void VWindow::init()
}
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");
QList<const char *> devExts;
devExts.append("VK_KHR_swapchain");
@@ -697,7 +672,7 @@ int main(int argc, char *argv[])
qDebug() << inst.supportedLayers() << inst.supportedExtensions();
// Enable validation layer, if supported.
- inst.setLayers(QByteArrayList() << "VK_LAYER_LUNARG_standard_validation");
+ inst.setLayers(QByteArrayList() << "VK_LAYER_KHRONOS_validation");
bool ok = inst.create();
qDebug("QVulkanInstance::create() returned %d", ok);