[packages/glslang] - updated to 8.13.3743 - removed obsolete vulkan1.2 patch
qboosh
qboosh at pld-linux.org
Sun Jul 5 21:16:41 CEST 2020
commit eeb92650c93d0cc9fa10d41a96e43baaabccee8d
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Jul 5 21:18:01 2020 +0200
- updated to 8.13.3743
- removed obsolete vulkan1.2 patch
glslang-vulkan1.2.patch | 126 ------------------------------------------------
glslang.spec | 9 ++--
2 files changed, 3 insertions(+), 132 deletions(-)
---
diff --git a/glslang.spec b/glslang.spec
index f1f972e..6a0ebd2 100644
--- a/glslang.spec
+++ b/glslang.spec
@@ -6,16 +6,14 @@
Summary: Khronos reference front-end for GLSL and ESSL
Summary(pl.UTF-8): Wzorcowy frontend GLSL i ESSL z projektu Khronos
Name: glslang
-Version: 8.13.3559
+Version: 8.13.3743
Release: 1
License: BSD-like
Group: Applications/Graphics
#Source0Download: https://github.com/KhronosGroup/glslang/releases
Source0: https://github.com/KhronosGroup/glslang/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: cb32322377cee2bc1cee5b60ebe46133
-# https://github.com/KhronosGroup/glslang/commit/273d3a50931951b52c5b1f46ea583c786f1be6c8.patch
-Patch0: %{name}-vulkan1.2.patch
-Patch1: %{name}-system-spirv.patch
+# Source0-md5: 93dca40a44fc88b6710348458d06b54f
+Patch0: %{name}-system-spirv.patch
URL: https://github.com/KhronosGroup/glslang
BuildRequires: bison
BuildRequires: cmake >= 2.8.12
@@ -51,7 +49,6 @@ AST.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%build
install -d build
diff --git a/glslang-vulkan1.2.patch b/glslang-vulkan1.2.patch
deleted file mode 100644
index 077494e..0000000
--- a/glslang-vulkan1.2.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From 273d3a50931951b52c5b1f46ea583c786f1be6c8 Mon Sep 17 00:00:00 2001
-From: John Kessenich <cepheus at frii.com>
-Date: Wed, 15 Jan 2020 00:10:41 -0700
-Subject: [PATCH] SPV/Vulkan: Add support for Vulkan 1.2, which defaults to
- SPIR-V 1.5.
-
----
- SPIRV/SpvTools.cpp | 2 ++
- StandAlone/StandAlone.cpp | 28 ++++++++++++-------
- Test/runtests | 1 +
- .../MachineIndependent/localintermediate.h | 3 ++
- glslang/Public/ShaderLang.h | 1 +
- 5 files changed, 25 insertions(+), 10 deletions(-)
-
-diff --git a/SPIRV/SpvTools.cpp b/SPIRV/SpvTools.cpp
-index 7c3b03919..8db58c5f8 100644
---- a/SPIRV/SpvTools.cpp
-+++ b/SPIRV/SpvTools.cpp
-@@ -67,6 +67,8 @@ spv_target_env MapToSpirvToolsEnv(const SpvVersion& spvVersion, spv::SpvBuildLog
- logger->missingFunctionality("Target version for SPIRV-Tools validator");
- return spv_target_env::SPV_ENV_VULKAN_1_1;
- }
-+ case glslang::EShTargetVulkan_1_2:
-+ return spv_target_env::SPV_ENV_UNIVERSAL_1_5; //?? should change to SPV_ENV_VULKAN_1_2, when available
- default:
- break;
- }
-diff --git a/StandAlone/StandAlone.cpp b/StandAlone/StandAlone.cpp
-index 28c5e1509..6e4c8d30d 100644
---- a/StandAlone/StandAlone.cpp
-+++ b/StandAlone/StandAlone.cpp
-@@ -608,6 +608,9 @@ void ProcessArguments(std::vector<std::unique_ptr<glslang::TWorkItem>>& workItem
- } else if (strcmp(argv[1], "vulkan1.1") == 0) {
- setVulkanSpv();
- ClientVersion = glslang::EShTargetVulkan_1_1;
-+ } else if (strcmp(argv[1], "vulkan1.2") == 0) {
-+ setVulkanSpv();
-+ ClientVersion = glslang::EShTargetVulkan_1_2;
- } else if (strcmp(argv[1], "opengl") == 0) {
- setOpenGlSpv();
- ClientVersion = glslang::EShTargetOpenGL_450;
-@@ -630,7 +633,7 @@ void ProcessArguments(std::vector<std::unique_ptr<glslang::TWorkItem>>& workItem
- TargetLanguage = glslang::EShTargetSpv;
- TargetVersion = glslang::EShTargetSpv_1_5;
- } else
-- Error("--target-env expected one of: vulkan1.0, vulkan1.1, opengl,\n"
-+ Error("--target-env expected one of: vulkan1.0, vulkan1.1, vulkan1.2, opengl,\n"
- "spirv1.0, spirv1.1, spirv1.2, spirv1.3, spirv1.4, or spirv1.5");
- }
- bumpArg();
-@@ -825,6 +828,10 @@ void ProcessArguments(std::vector<std::unique_ptr<glslang::TWorkItem>>& workItem
- TargetLanguage = glslang::EShTargetSpv;
- TargetVersion = glslang::EShTargetSpv_1_3;
- break;
-+ case glslang::EShTargetVulkan_1_2:
-+ TargetLanguage = glslang::EShTargetSpv;
-+ TargetVersion = glslang::EShTargetSpv_1_5;
-+ break;
- case glslang::EShTargetOpenGL_450:
- TargetLanguage = glslang::EShTargetSpv;
- TargetVersion = glslang::EShTargetSpv_1_0;
-@@ -1640,16 +1647,17 @@ void usage()
- " --sep synonym for --source-entrypoint\n"
- " --stdin read from stdin instead of from a file;\n"
- " requires providing the shader stage using -S\n"
-- " --target-env {vulkan1.0 | vulkan1.1 | opengl | \n"
-+ " --target-env {vulkan1.0 | vulkan1.1 | vulkan1.2 | opengl | \n"
- " spirv1.0 | spirv1.1 | spirv1.2 | spirv1.3 | spirv1.4 | spirv1.5}\n"
-- " set execution environment that emitted code\n"
-- " will execute in (versus source language\n"
-- " semantics selected by --client) defaults:\n"
-- " * 'vulkan1.0' under '--client vulkan<ver>'\n"
-- " * 'opengl' under '--client opengl<ver>'\n"
-- " * 'spirv1.0' under --target-env vulkan1.0\n"
-- " * 'spirv1.3' under --target-env vulkan1.1\n"
-- " multiple --targen-env can be specified.\n"
-+ " Set the execution environment that the\n"
-+ " generated code will be executed in.\n"
-+ " Defaults to:\n"
-+ " * vulkan1.0 under --client vulkan<ver>\n"
-+ " * opengl under --client opengl<ver>\n"
-+ " * spirv1.0 under --target-env vulkan1.0\n"
-+ " * spirv1.3 under --target-env vulkan1.1\n"
-+ " * spirv1.5 under --target-env vulkan1.2\n"
-+ " Multiple --target-env can be specified.\n"
- " --variable-name <name>\n"
- " --vn <name> creates a C header file that contains a\n"
- " uint32_t array named <name>\n"
-diff --git a/Test/runtests b/Test/runtests
-index d1ca221ff..1a7c7c941 100755
---- a/Test/runtests
-+++ b/Test/runtests
-@@ -189,6 +189,7 @@ $EXE --client vulkan100 spv.targetVulkan.vert || HASERROR=1
- $EXE --client opengl100 spv.targetOpenGL.vert || HASERROR=1
- $EXE --target-env vulkan1.0 spv.targetVulkan.vert || HASERROR=1
- $EXE --target-env vulkan1.1 spv.targetVulkan.vert || HASERROR=1
-+$EXE --target-env vulkan1.2 spv.targetVulkan.vert || HASERROR=1
- $EXE --target-env opengl spv.targetOpenGL.vert || HASERROR=1
- $EXE -V100 spv.targetVulkan.vert || HASERROR=1
- $EXE -G100 spv.targetOpenGL.vert || HASERROR=1
-diff --git a/glslang/MachineIndependent/localintermediate.h b/glslang/MachineIndependent/localintermediate.h
-index cb172e5e9..683290af7 100644
---- a/glslang/MachineIndependent/localintermediate.h
-+++ b/glslang/MachineIndependent/localintermediate.h
-@@ -332,6 +332,9 @@ class TIntermediate {
- case EShTargetVulkan_1_1:
- processes.addProcess("target-env vulkan1.1");
- break;
-+ case EShTargetVulkan_1_2:
-+ processes.addProcess("target-env vulkan1.2");
-+ break;
- default:
- processes.addProcess("target-env vulkanUnknown");
- break;
-diff --git a/glslang/Public/ShaderLang.h b/glslang/Public/ShaderLang.h
-index 4cc6c2f48..4fe5c7df1 100755
---- a/glslang/Public/ShaderLang.h
-+++ b/glslang/Public/ShaderLang.h
-@@ -145,6 +145,7 @@ typedef enum {
- typedef enum {
- EShTargetVulkan_1_0 = (1 << 22), // Vulkan 1.0
- EShTargetVulkan_1_1 = (1 << 22) | (1 << 12), // Vulkan 1.1
-+ EShTargetVulkan_1_2 = (1 << 22) | (2 << 12), // Vulkan 1.2
- EShTargetOpenGL_450 = 450, // OpenGL
- } EShTargetClientVersion;
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/glslang.git/commitdiff/eeb92650c93d0cc9fa10d41a96e43baaabccee8d
More information about the pld-cvs-commit
mailing list