diff options
-rw-r--r-- | examples/vulkan/CMakeLists.txt | 1 | ||||
-rw-r--r-- | examples/vulkan/doc/images/hellovulkantexture.png | bin | 10259 -> 0 bytes | |||
-rw-r--r-- | examples/vulkan/doc/src/hellovulkantexture.qdoc | 18 | ||||
-rw-r--r-- | examples/vulkan/vulkan.pro | 3 | ||||
-rw-r--r-- | tests/manual/examples/vulkan/hellovulkantexture/CMakeLists.txt (renamed from examples/vulkan/hellovulkantexture/CMakeLists.txt) | 0 | ||||
-rw-r--r-- | tests/manual/examples/vulkan/hellovulkantexture/hellovulkantexture.cpp (renamed from examples/vulkan/hellovulkantexture/hellovulkantexture.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/examples/vulkan/hellovulkantexture/hellovulkantexture.h (renamed from examples/vulkan/hellovulkantexture/hellovulkantexture.h) | 0 | ||||
-rw-r--r-- | tests/manual/examples/vulkan/hellovulkantexture/hellovulkantexture.pro (renamed from examples/vulkan/hellovulkantexture/hellovulkantexture.pro) | 0 | ||||
-rw-r--r-- | tests/manual/examples/vulkan/hellovulkantexture/hellovulkantexture.qrc (renamed from examples/vulkan/hellovulkantexture/hellovulkantexture.qrc) | 0 | ||||
-rw-r--r-- | tests/manual/examples/vulkan/hellovulkantexture/main.cpp (renamed from examples/vulkan/hellovulkantexture/main.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/examples/vulkan/hellovulkantexture/qt256.png (renamed from examples/vulkan/hellovulkantexture/qt256.png) | bin | 6208 -> 6208 bytes | |||
-rw-r--r-- | tests/manual/examples/vulkan/hellovulkantexture/texture.frag (renamed from examples/vulkan/hellovulkantexture/texture.frag) | 0 | ||||
-rw-r--r-- | tests/manual/examples/vulkan/hellovulkantexture/texture.vert (renamed from examples/vulkan/hellovulkantexture/texture.vert) | 0 | ||||
-rw-r--r-- | tests/manual/examples/vulkan/hellovulkantexture/texture_frag.spv (renamed from examples/vulkan/hellovulkantexture/texture_frag.spv) | bin | 556 -> 556 bytes | |||
-rw-r--r-- | tests/manual/examples/vulkan/hellovulkantexture/texture_vert.spv (renamed from examples/vulkan/hellovulkantexture/texture_vert.spv) | bin | 968 -> 968 bytes |
15 files changed, 1 insertions, 21 deletions
diff --git a/examples/vulkan/CMakeLists.txt b/examples/vulkan/CMakeLists.txt index e4a1af8e26..b6f1dfc913 100644 --- a/examples/vulkan/CMakeLists.txt +++ b/examples/vulkan/CMakeLists.txt @@ -3,7 +3,6 @@ qt_internal_add_example(hellovulkanwindow) qt_internal_add_example(hellovulkantriangle) -qt_internal_add_example(hellovulkantexture) if(TARGET Qt6::Widgets) qt_internal_add_example(hellovulkanwidget) endif() diff --git a/examples/vulkan/doc/images/hellovulkantexture.png b/examples/vulkan/doc/images/hellovulkantexture.png Binary files differdeleted file mode 100644 index 0cb47a70be..0000000000 --- a/examples/vulkan/doc/images/hellovulkantexture.png +++ /dev/null diff --git a/examples/vulkan/doc/src/hellovulkantexture.qdoc b/examples/vulkan/doc/src/hellovulkantexture.qdoc deleted file mode 100644 index 4945000f88..0000000000 --- a/examples/vulkan/doc/src/hellovulkantexture.qdoc +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only - -/*! - \example hellovulkantexture - \meta installpath vulkan - \ingroup examples-vulkan - \title Hello Vulkan Texture Vulkan Example - \brief Shows the basics of rendering with textures in a QVulkanWindow. - - The \e{Hello Vulkan Texture Example} builds on \l hellovulkantriangle. Here - instead of drawing a single triangle, a triangle strip is drawn in order to - get a quad on the screen. This is then textured using a QImage loaded from - a .png image file. - - \image hellovulkantexture.png - \include examples-run.qdocinc -*/ diff --git a/examples/vulkan/vulkan.pro b/examples/vulkan/vulkan.pro index 920762cb9e..b810cb96fc 100644 --- a/examples/vulkan/vulkan.pro +++ b/examples/vulkan/vulkan.pro @@ -1,8 +1,7 @@ TEMPLATE = subdirs SUBDIRS = hellovulkanwindow \ - hellovulkantriangle \ - hellovulkantexture + hellovulkantriangle qtHaveModule(widgets) { SUBDIRS += hellovulkanwidget diff --git a/examples/vulkan/hellovulkantexture/CMakeLists.txt b/tests/manual/examples/vulkan/hellovulkantexture/CMakeLists.txt index e5e764dbfe..e5e764dbfe 100644 --- a/examples/vulkan/hellovulkantexture/CMakeLists.txt +++ b/tests/manual/examples/vulkan/hellovulkantexture/CMakeLists.txt diff --git a/examples/vulkan/hellovulkantexture/hellovulkantexture.cpp b/tests/manual/examples/vulkan/hellovulkantexture/hellovulkantexture.cpp index ed58c6caca..ed58c6caca 100644 --- a/examples/vulkan/hellovulkantexture/hellovulkantexture.cpp +++ b/tests/manual/examples/vulkan/hellovulkantexture/hellovulkantexture.cpp diff --git a/examples/vulkan/hellovulkantexture/hellovulkantexture.h b/tests/manual/examples/vulkan/hellovulkantexture/hellovulkantexture.h index 251bdfb2e2..251bdfb2e2 100644 --- a/examples/vulkan/hellovulkantexture/hellovulkantexture.h +++ b/tests/manual/examples/vulkan/hellovulkantexture/hellovulkantexture.h diff --git a/examples/vulkan/hellovulkantexture/hellovulkantexture.pro b/tests/manual/examples/vulkan/hellovulkantexture/hellovulkantexture.pro index 59bfcda715..59bfcda715 100644 --- a/examples/vulkan/hellovulkantexture/hellovulkantexture.pro +++ b/tests/manual/examples/vulkan/hellovulkantexture/hellovulkantexture.pro diff --git a/examples/vulkan/hellovulkantexture/hellovulkantexture.qrc b/tests/manual/examples/vulkan/hellovulkantexture/hellovulkantexture.qrc index 04e7cda859..04e7cda859 100644 --- a/examples/vulkan/hellovulkantexture/hellovulkantexture.qrc +++ b/tests/manual/examples/vulkan/hellovulkantexture/hellovulkantexture.qrc diff --git a/examples/vulkan/hellovulkantexture/main.cpp b/tests/manual/examples/vulkan/hellovulkantexture/main.cpp index 59a3273303..59a3273303 100644 --- a/examples/vulkan/hellovulkantexture/main.cpp +++ b/tests/manual/examples/vulkan/hellovulkantexture/main.cpp diff --git a/examples/vulkan/hellovulkantexture/qt256.png b/tests/manual/examples/vulkan/hellovulkantexture/qt256.png Binary files differindex 30c621c9c6..30c621c9c6 100644 --- a/examples/vulkan/hellovulkantexture/qt256.png +++ b/tests/manual/examples/vulkan/hellovulkantexture/qt256.png diff --git a/examples/vulkan/hellovulkantexture/texture.frag b/tests/manual/examples/vulkan/hellovulkantexture/texture.frag index e6021fe905..e6021fe905 100644 --- a/examples/vulkan/hellovulkantexture/texture.frag +++ b/tests/manual/examples/vulkan/hellovulkantexture/texture.frag diff --git a/examples/vulkan/hellovulkantexture/texture.vert b/tests/manual/examples/vulkan/hellovulkantexture/texture.vert index de486cb772..de486cb772 100644 --- a/examples/vulkan/hellovulkantexture/texture.vert +++ b/tests/manual/examples/vulkan/hellovulkantexture/texture.vert diff --git a/examples/vulkan/hellovulkantexture/texture_frag.spv b/tests/manual/examples/vulkan/hellovulkantexture/texture_frag.spv Binary files differindex 7521ef6eef..7521ef6eef 100644 --- a/examples/vulkan/hellovulkantexture/texture_frag.spv +++ b/tests/manual/examples/vulkan/hellovulkantexture/texture_frag.spv diff --git a/examples/vulkan/hellovulkantexture/texture_vert.spv b/tests/manual/examples/vulkan/hellovulkantexture/texture_vert.spv Binary files differindex 6292c0de31..6292c0de31 100644 --- a/examples/vulkan/hellovulkantexture/texture_vert.spv +++ b/tests/manual/examples/vulkan/hellovulkantexture/texture_vert.spv |