[arch-commits] Commit in vulkan-tools/repos/extra-x86_64 (3 files)

[Laurent Carlier]

    Date: Saturday, May 9, 2020 @ 06:27:36
  Author: lcarlier
Revision: 382846

archrelease: copy trunk to extra-x86_64

Added:
  vulkan-tools/repos/extra-x86_64/0001-cube-Remove-dependency-on-VK_DYNAMIC_STATE_RANGE_SIZ.patch
    (from rev 382845, vulkan-tools/trunk/0001-cube-Remove-dependency-on-VK_DYNAMIC_STATE_RANGE_SIZ.patch)
  vulkan-tools/repos/extra-x86_64/PKGBUILD
    (from rev 382845, vulkan-tools/trunk/PKGBUILD)
Deleted:
  vulkan-tools/repos/extra-x86_64/PKGBUILD

-----------------------------------------------------------------+
 0001-cube-Remove-dependency-on-VK_DYNAMIC_STATE_RANGE_SIZ.patch |   36 +++
 PKGBUILD                                                        |  103 +++++-----
 2 files changed, 88 insertions(+), 51 deletions(-)

Copied: vulkan-tools/repos/extra-x86_64/0001-cube-Remove-dependency-on-VK_DYNAMIC_STATE_RANGE_SIZ.patch (from rev 382845, vulkan-tools/trunk/0001-cube-Remove-dependency-on-VK_DYNAMIC_STATE_RANGE_SIZ.patch)
===================================================================
--- 0001-cube-Remove-dependency-on-VK_DYNAMIC_STATE_RANGE_SIZ.patch	                        (rev 0)
+++ 0001-cube-Remove-dependency-on-VK_DYNAMIC_STATE_RANGE_SIZ.patch	2020-05-09 06:27:36 UTC (rev 382846)
@@ -0,0 +1,36 @@
+From 8ee48dc62f7c0fc7b4dab7befc2f601b1873d620 Mon Sep 17 00:00:00 2001
+From: Tony-LunarG <tony at lunarg.com>
+Date: Thu, 7 May 2020 10:02:58 -0600
+Subject: [PATCH] cube: Remove dependency on VK_DYNAMIC_STATE_RANGE_SIZE
+
+Change-Id: Id6b3906d2605c4742ad0af45747fc37c23cab03e
+Signed-off-by: Laurent Carlier <lordheavym at gmail.com>
+---
+ cube/cube.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/cube/cube.c b/cube/cube.c
+index 602b4bdc..8c87b5c8 100644
+--- a/cube/cube.c
++++ b/cube/cube.c
+@@ -1974,6 +1974,8 @@ static void demo_prepare_fs(struct demo *demo) {
+ }
+ 
+ static void demo_prepare_pipeline(struct demo *demo) {
++#define NUM_DYNAMIC_STATES 2 /*Viewport + Scissor*/
++
+     VkGraphicsPipelineCreateInfo pipeline;
+     VkPipelineCacheCreateInfo pipelineCache;
+     VkPipelineVertexInputStateCreateInfo vi;
+@@ -1983,7 +1985,7 @@ static void demo_prepare_pipeline(struct demo *demo) {
+     VkPipelineDepthStencilStateCreateInfo ds;
+     VkPipelineViewportStateCreateInfo vp;
+     VkPipelineMultisampleStateCreateInfo ms;
+-    VkDynamicState dynamicStateEnables[VK_DYNAMIC_STATE_RANGE_SIZE];
++    VkDynamicState dynamicStateEnables[NUM_DYNAMIC_STATES];
+     VkPipelineDynamicStateCreateInfo dynamicState;
+     VkResult U_ASSERT_ONLY err;
+ 
+-- 
+2.26.2
+

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-09 06:27:31 UTC (rev 382845)
+++ PKGBUILD	2020-05-09 06:27:36 UTC (rev 382846)
@@ -1,51 +0,0 @@
-# Maintainer: Laurent Carlier <lordheavym at gmail.com>
-
-pkgname=vulkan-tools
-pkgver=1.2.135
-pkgrel=1
-arch=(x86_64)
-url="https://www.khronos.org/vulkan/"
-pkgdesc="Vulkan Utilities and Tools"
-license=('custom')
-depends=(gcc-libs libxcb vulkan-icd-loader)
-makedepends=(git cmake python vulkan-headers libx11 wayland)
-source=("https://github.com/KhronosGroup/Vulkan-Tools/archive/v${pkgver}.tar.gz")
-#source=("git+https://github.com/KhronosGroup/Vulkan-Tools.git#commit=534747d770a84a18a20949430679aa1b7bf0f398")
-sha256sums=('6b497194fb2e06e41a9ab8c404ea3c82cca1fc1e0c540ffcd2905b9bebef5e84')
-
-#pkgver() {
-#  cd "${srcdir}"/Vulkan-Tools*
-#
-#  echo 1.1.97.0+$(git rev-list --count HEAD)+$(git rev-parse --short HEAD)
-#}
-
-build() {
-  cd "${srcdir}"/Vulkan-Tools*
-
-  rm -rf build ; mkdir build ; cd build
-  cmake \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_SYSCONFDIR=/etc \
-    -DCMAKE_INSTALL_DATADIR=/usr/share \
-    -DCMAKE_SKIP_RPATH=True \
-    -DBUILD_WSI_XCB_SUPPORT=On \
-    -DBUILD_WSI_XLIB_SUPPORT=On \
-    -DBUILD_WSI_WAYLAND_SUPPORT=On \
-    -DBUILD_CUBE=ON \
-    -DBUILD_VULKANINFO=ON \
-    -DBUILD_ICD=OFF \
-    -DCMAKE_BUILD_TYPE=Release \
-    ..
-  make
-}
-
-package() {
-  groups=('vulkan-devel')
-  
-  cd "${srcdir}"/Vulkan-Tools*/build
-  
-  make DESTDIR="${pkgdir}" install
-
-  install -dm755 ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 ../LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/
-}

Copied: vulkan-tools/repos/extra-x86_64/PKGBUILD (from rev 382845, vulkan-tools/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-05-09 06:27:36 UTC (rev 382846)
@@ -0,0 +1,52 @@
+# Maintainer: Laurent Carlier <lordheavym at gmail.com>
+
+pkgname=vulkan-tools
+pkgver=1.2.137
+pkgrel=1
+arch=(x86_64)
+url="https://www.khronos.org/vulkan/"
+pkgdesc="Vulkan Utilities and Tools"
+license=('custom')
+depends=(gcc-libs libxcb vulkan-icd-loader)
+makedepends=(git cmake python vulkan-headers libx11 wayland)
+source=("https://github.com/KhronosGroup/Vulkan-Tools/archive/v${pkgver}.tar.gz"
+        0001-cube-Remove-dependency-on-VK_DYNAMIC_STATE_RANGE_SIZ.patch)
+sha256sums=('4b9e0aab8e873282a7163b3e9966928188c06697002f8f1ce0c567a06a1b5fda'
+            '8da2ac049c5e7d1253e5b55fa9ef0c1f670d17b6a0785561de5edc12e9c9d7a6')
+
+prepare() {
+  cd "${srcdir}"/Vulkan-Tools*
+
+  patch -Np1 -i ../0001-cube-Remove-dependency-on-VK_DYNAMIC_STATE_RANGE_SIZ.patch
+}
+
+build() {
+  cd "${srcdir}"/Vulkan-Tools*
+
+  rm -rf build ; mkdir build ; cd build
+  cmake \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_SYSCONFDIR=/etc \
+    -DCMAKE_INSTALL_DATADIR=/usr/share \
+    -DCMAKE_SKIP_RPATH=True \
+    -DBUILD_WSI_XCB_SUPPORT=On \
+    -DBUILD_WSI_XLIB_SUPPORT=On \
+    -DBUILD_WSI_WAYLAND_SUPPORT=On \
+    -DBUILD_CUBE=ON \
+    -DBUILD_VULKANINFO=ON \
+    -DBUILD_ICD=OFF \
+    -DCMAKE_BUILD_TYPE=Release \
+    ..
+  make
+}
+
+package() {
+  groups=('vulkan-devel')
+  
+  cd "${srcdir}"/Vulkan-Tools*/build
+  
+  make DESTDIR="${pkgdir}" install
+
+  install -dm755 ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 ../LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/
+}