SPIRV-Tools: update to 2019.2.

srcpkgs/SPIRV-Tools/patches/spirv-tools-2019.1-Fix-vertex-instrumentation.patch

@@ -1,113 +0,0 @@
-From 8d2d66f30c5c25029ac029af2bc9c4aa6979e5bc Mon Sep 17 00:00:00 2001
-From: greg-lunarg <greg@lunarg.com>
-Date: Wed, 16 Jan 2019 16:02:07 -0700
-Subject: [PATCH] Fix vertex instrumentation to use VertexIndex and
- InstanceIndex (#2294)
-
-...instead of VertexId and InstanceId
----
- include/spirv-tools/instrument.hpp    |  4 ++--
- source/opt/instrument_pass.cpp        |  8 ++++----
- source/opt/ir_context.cpp             |  4 ++--
- test/opt/inst_bindless_check_test.cpp | 14 +++++++-------
- 4 files changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/include/spirv-tools/instrument.hpp b/include/spirv-tools/instrument.hpp
-index 69d1ad259..f8068099c 100644
---- include/spirv-tools/instrument.hpp
-+++ include/spirv-tools/instrument.hpp
-@@ -75,8 +75,8 @@ static const int kInstCommonOutCnt = 4;
- // error.
- //
- // Vertex Shader Output Record Offsets
--static const int kInstVertOutVertexId = kInstCommonOutCnt;
--static const int kInstVertOutInstanceId = kInstCommonOutCnt + 1;
-+static const int kInstVertOutVertexIndex = kInstCommonOutCnt;
-+static const int kInstVertOutInstanceIndex = kInstCommonOutCnt + 1;
- 
- // Frag Shader Output Record Offsets
- static const int kInstFragOutFragCoordX = kInstCommonOutCnt;
-diff --git a/source/opt/instrument_pass.cpp b/source/opt/instrument_pass.cpp
-index 8ba8ce504..6935a43dc 100644
---- source/opt/instrument_pass.cpp
-+++ source/opt/instrument_pass.cpp
-@@ -168,10 +168,10 @@ void InstrumentPass::GenStageStreamWriteCode(uint32_t stage_idx,
-   switch (stage_idx) {
-     case SpvExecutionModelVertex: {
-       // Load and store VertexId and InstanceId
--      GenBuiltinOutputCode(context()->GetBuiltinVarId(SpvBuiltInVertexId),
--                           kInstVertOutVertexId, base_offset_id, builder);
--      GenBuiltinOutputCode(context()->GetBuiltinVarId(SpvBuiltInInstanceId),
--                           kInstVertOutInstanceId, base_offset_id, builder);
-+      GenBuiltinOutputCode(context()->GetBuiltinVarId(SpvBuiltInVertexIndex),
-+                           kInstVertOutVertexIndex, base_offset_id, builder);
-+      GenBuiltinOutputCode(context()->GetBuiltinVarId(SpvBuiltInInstanceIndex),
-+                           kInstVertOutInstanceIndex, base_offset_id, builder);
-     } break;
-     case SpvExecutionModelGLCompute: {
-       // Load and store GlobalInvocationId. Second word is unused; store zero.
-diff --git a/source/opt/ir_context.cpp b/source/opt/ir_context.cpp
-index a2f207c0c..fe69027f8 100644
---- source/opt/ir_context.cpp
-+++ source/opt/ir_context.cpp
-@@ -669,8 +669,8 @@ uint32_t IRContext::GetBuiltinVarId(uint32_t builtin) {
-         reg_type = type_mgr->GetRegisteredType(&v4float_ty);
-         break;
-       }
--      case SpvBuiltInVertexId:
--      case SpvBuiltInInstanceId:
-+      case SpvBuiltInVertexIndex:
-+      case SpvBuiltInInstanceIndex:
-       case SpvBuiltInPrimitiveId:
-       case SpvBuiltInInvocationId:
-       case SpvBuiltInGlobalInvocationId: {
-diff --git a/test/opt/inst_bindless_check_test.cpp b/test/opt/inst_bindless_check_test.cpp
-index ddafb3dc2..a426ce04c 100644
---- test/opt/inst_bindless_check_test.cpp
-+++ test/opt/inst_bindless_check_test.cpp
-@@ -1650,7 +1650,7 @@ OpCapability Sampled1D
- OpExtension "SPV_KHR_storage_buffer_storage_class"
- %1 = OpExtInstImport "GLSL.std.450"
- OpMemoryModel Logical GLSL450
--OpEntryPoint Vertex %main "main" %_ %coords2D %gl_VertexID %gl_InstanceID
-+OpEntryPoint Vertex %main "main" %_ %coords2D %gl_VertexIndex %gl_InstanceIndex
- OpSource GLSL 450
- OpName %main "main"
- OpName %lod "lod"
-@@ -1684,8 +1684,8 @@ OpMemberDecorate %_struct_61 0 Offset 0
- OpMemberDecorate %_struct_61 1 Offset 4
- OpDecorate %63 DescriptorSet 7
- OpDecorate %63 Binding 0
--OpDecorate %gl_VertexID BuiltIn VertexId
--OpDecorate %gl_InstanceID BuiltIn InstanceId
-+OpDecorate %gl_VertexIndex BuiltIn VertexIndex
-+OpDecorate %gl_InstanceIndex BuiltIn InstanceIndex
- %void = OpTypeVoid
- %12 = OpTypeFunction %void
- %float = OpTypeFloat 32
-@@ -1730,8 +1730,8 @@ OpDecorate %gl_InstanceID BuiltIn InstanceId
- %uint_2 = OpConstant %uint 2
- %uint_3 = OpConstant %uint 3
- %_ptr_Input_uint = OpTypePointer Input %uint
--%gl_VertexID = OpVariable %_ptr_Input_uint Input
--%gl_InstanceID = OpVariable %_ptr_Input_uint Input
-+%gl_VertexIndex = OpVariable %_ptr_Input_uint Input
-+%gl_InstanceIndex = OpVariable %_ptr_Input_uint Input
- %uint_5 = OpConstant %uint 5
- %uint_6 = OpConstant %uint 6
- %uint_7 = OpConstant %uint 7
-@@ -1819,11 +1819,11 @@ OpStore %81 %55
- %83 = OpIAdd %uint %68 %uint_3
- %84 = OpAccessChain %_ptr_StorageBuffer_uint %63 %uint_1 %83
- OpStore %84 %uint_0
--%87 = OpLoad %uint %gl_VertexID
-+%87 = OpLoad %uint %gl_VertexIndex
- %88 = OpIAdd %uint %68 %uint_4
- %89 = OpAccessChain %_ptr_StorageBuffer_uint %63 %uint_1 %88
- OpStore %89 %87
--%91 = OpLoad %uint %gl_InstanceID
-+%91 = OpLoad %uint %gl_InstanceIndex
- %93 = OpIAdd %uint %68 %uint_5
- %94 = OpAccessChain %_ptr_StorageBuffer_uint %63 %uint_1 %93
- OpStore %94 %91
-

srcpkgs/SPIRV-Tools/template

@@ -1,7 +1,7 @@
 # Template file for 'SPIRV-Tools'
 pkgname=SPIRV-Tools
-version=2019.1
+version=2019.2
-revision=2
+revision=1
 build_style=cmake
 configure_args="-DSPIRV_SKIP_TESTS=ON -DSPIRV_WERROR=OFF
  -DSPIRV-Headers_SOURCE_DIR=${XBPS_CROSS_BASE}/usr
@@ -13,7 +13,7 @@ maintainer="maxice8 <thinkabit.ukim@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/KhronosGroup/SPIRV-Tools"
 distfiles="https://github.com/KhronosGroup/SPIRV-Tools/archive/v${version}.tar.gz"
-checksum=9f7dac47201c86cc2336252630f1471d52b9207a3b01c5411daefcfe827f410f
+checksum=1fde9d2a0df920a401441cd77253fc7b3b9ab0578eabda8caaaceaa6c7638440
 
 SPIRV-Tools-devel_package() {
 	depends="SPIRV-Tools-${version}_${revision}"