vkcube runtime selection support

This reverts commit f6016379d2.

.gitignore

@@ -30,10 +30,3 @@
 /Vulkan-Tools-sdk-1.3.283.0.tar.gz
 /Vulkan-Tools-sdk-1.3.290.0.tar.gz
 /Vulkan-Tools-sdk-1.3.296.0.tar.gz
-/Vulkan-Tools-sdk-1.4.304.0.tar.gz
-/Vulkan-Tools-sdk-1.4.309.0.tar.gz
-/Vulkan-Tools-sdk-1.4.313.0.tar.gz
-/Vulkan-Tools-sdk-1.4.321.0.tar.gz
-/Vulkan-Tools-sdk-1.4.328.1.tar.gz
-/Vulkan-Tools-sdk-1.4.341.0.tar.gz
-/Vulkan-Tools-sdk-1.4.350.0.tar.gz

.packit.yaml

@@ -1,13 +0,0 @@
-# packit config for vulkan-tools
-# Build Stage 4 - depends on glslang, vulkan-volk
-
-jobs:
-  - job: koji_build
-    trigger: commit | koji_build
-    allowed_committers: [all_admins]
-    dist_git_branches:
-      - fedora-all
-    sidetag_group: vulkan-sdk-releases
-    dependencies:
-      - glslang
-      - vulkan-volk

0001-vkcube-Remove-unused-command-line-option.patch

@@ -0,0 +1,46 @@
+From eb9b6043be165f06c7ec78fadbb1ff773c5fc19c Mon Sep 17 00:00:00 2001
+From: Charles Giessen <charles@lunarg.com>
+Date: Fri, 11 Oct 2024 12:26:50 -0500
+Subject: [PATCH] vkcube: Remove unused command line option
+
+The --validate-checks-disabled flag was unused, so will be removed.
+---
+ cube/cube.c | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/cube/cube.c b/cube/cube.c
+index 78d0bb55..4879317c 100644
+--- a/cube/cube.c
++++ b/cube/cube.c
+@@ -437,7 +437,6 @@ struct demo {
+     int32_t curFrame;
+     int32_t frameCount;
+     bool validate;
+-    bool validate_checks_disabled;
+     bool use_break;
+     bool suppress_popups;
+     bool force_errors;
+@@ -4223,11 +4222,6 @@ static void demo_init(struct demo *demo, int argc, char **argv) {
+             demo->validate = true;
+             continue;
+         }
+-        if (strcmp(argv[i], "--validate-checks-disabled") == 0) {
+-            demo->validate = true;
+-            demo->validate_checks_disabled = true;
+-            continue;
+-        }
+         if (strcmp(argv[i], "--xlib") == 0) {
+             fprintf(stderr, "--xlib is deprecated and no longer does anything");
+             continue;
+@@ -4286,7 +4280,7 @@ static void demo_init(struct demo *demo, int argc, char **argv) {
+         ERR_EXIT("Usage: vkcube [--validate]\n", "Usage");
+ #else
+         char *message =
+-            "Usage:\n  %s\t[--use_staging] [--validate] [--validate-checks-disabled]\n"
++            "Usage:\n  %s\t[--use_staging] [--validate]\n"
+             "\t[--break] [--c <framecount>] [--suppress_popups]\n"
+             "\t[--incremental_present] [--display_timing]\n"
+             "\t[--gpu_number <index of physical device>]\n"
+-- 
+2.47.0
+

sources

@@ -1 +1 @@
-SHA512 (Vulkan-Tools-sdk-1.4.350.0.tar.gz) = 2d2afbcb06bb1ee08ffb3cbe133b531fe6341e90fa0dca4d5459dbdedf201521e798226768a7e307f8b6c08b388114a34a9a581a294f6226ca7a2fcd6f63f813
+SHA512 (Vulkan-Tools-sdk-1.3.296.0.tar.gz) = 66bc89272f150198cd52f2971ad67a2fd6c922ac4bafb420c0d54788ca6bab2246e8a153a09eccce15a87e1fe16fdeef16af1c6b6b13386bff79dd73858f3cae

vulkan-tools.spec

@@ -1,5 +1,5 @@
 Name:           vulkan-tools
-Version:        1.4.350.0
+Version:        1.3.296.0
 Release:        %autorelease
 Summary:        Vulkan tools
 
@@ -7,9 +7,13 @@ License:        Apache-2.0
 URL:            https://github.com/KhronosGroup/Vulkan-Tools
 Source0:        %url/archive/vulkan-sdk-%{version}.tar.gz#/Vulkan-Tools-sdk-%{version}.tar.gz       
 
+# vkcube runtime selection support
+Patch00:        0001-vkcube-Remove-unused-command-line-option.patch
+Patch01:        0001-cube-Support-runtime-selection-of-WSI-platform.patch
+
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
-BuildRequires:  cmake
+BuildRequires:  cmake3
 BuildRequires:  glslang
 BuildRequires:  ninja-build
 BuildRequires:  python%{python3_pkgversion}-devel
@@ -36,12 +40,12 @@ Vulkan tools
 
 
 %build
-%cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DGLSLANG_INSTALL_DIR=%{_prefix}
-%cmake_build
+%cmake3 -GNinja -DCMAKE_BUILD_TYPE=Release -DGLSLANG_INSTALL_DIR=%{_prefix}
+%cmake3_build
 
 
 %install
-%cmake_install
+%cmake3_install
 
 %files
 %license LICENSE.txt