[arch-commits] Commit in vulkan-tools/trunk (2 files)

[Laurent Carlier]

    Date: Saturday, May 9, 2020 @ 06:27:31
  Author: lcarlier
Revision: 382845

upgpkg: vulkan-tools 1.2.137-1: upstream update 1.2.137

Added:
  vulkan-tools/trunk/0001-cube-Remove-dependency-on-VK_DYNAMIC_STATE_RANGE_SIZ.patch
Modified:
  vulkan-tools/trunk/PKGBUILD

-----------------------------------------------------------------+
 0001-cube-Remove-dependency-on-VK_DYNAMIC_STATE_RANGE_SIZ.patch |   36 ++++++++++
 PKGBUILD                                                        |   19 ++---
 2 files changed, 46 insertions(+), 9 deletions(-)

Added: 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:31 UTC (rev 382845)
@@ -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
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-09 06:17:28 UTC (rev 382844)
+++ PKGBUILD	2020-05-09 06:27:31 UTC (rev 382845)
@@ -1,7 +1,7 @@
 # Maintainer: Laurent Carlier <lordheavym at gmail.com>
 
 pkgname=vulkan-tools
-pkgver=1.2.135
+pkgver=1.2.137
 pkgrel=1
 arch=(x86_64)
 url="https://www.khronos.org/vulkan/"
@@ -9,16 +9,17 @@
 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')
+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')
 
-#pkgver() {
-#  cd "${srcdir}"/Vulkan-Tools*
-#
-#  echo 1.1.97.0+$(git rev-list --count HEAD)+$(git rev-parse --short HEAD)
-#}
+prepare() {
+  cd "${srcdir}"/Vulkan-Tools*
 
+  patch -Np1 -i ../0001-cube-Remove-dependency-on-VK_DYNAMIC_STATE_RANGE_SIZ.patch
+}
+
 build() {
   cd "${srcdir}"/Vulkan-Tools*