Jordan Justen pushed to branch debian/master at X Strike Force / app / renderdoc
Commits: bb8c7724 by Jordan Justen at 2021-01-28T17:15:21-08:00 d/changelog: Start 1.11+dfsg-5 changelog Signed-off-by: Jordan Justen <jljus...@debian.org> - - - - - 5526fee0 by Jordan Justen at 2021-01-31T16:57:46-08:00 d/patches: Patch for glslang 11.1.0. (Closes: #980608) Signed-off-by: Jordan Justen <jljus...@debian.org> - - - - - b3cddbcc by Jordan Justen at 2021-01-31T16:58:01-08:00 d/control: Bump glslang dep version to 11.1.0 Signed-off-by: Jordan Justen <jljus...@debian.org> - - - - - dc5f0b44 by Jordan Justen at 2021-01-31T17:07:27-08:00 d/changelog: Release 1.11+dfsg-5 to unstable Signed-off-by: Jordan Justen <jljus...@debian.org> - - - - - 4 changed files: - debian/changelog - debian/control - + debian/patches/0008-renderdoc-Patch-for-glslang-11.1.0.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +renderdoc (1.11+dfsg-5) unstable; urgency=medium + + * d/patches: Patch for glslang 11.1.0. (Closes: #980608) + * d/control: Bump glslang dep version to 11.1.0 + + -- Jordan Justen <jljus...@debian.org> Sun, 31 Jan 2021 17:06:50 -0800 + renderdoc (1.11+dfsg-4) unstable; urgency=medium * debian: Split packaging to allow gui/cli/python to be installed ===================================== debian/control ===================================== @@ -6,7 +6,7 @@ Uploaders: Jordan Justen <jljus...@debian.org> Build-Depends: bison, cmake, debhelper-compat (= 13), - glslang-dev (>= 7.11.3214), + glslang-dev (>= 11.1.0), libboost-dev, libegl1-mesa-dev | libegl-dev, libgl1-mesa-dev | libgl-dev, ===================================== debian/patches/0008-renderdoc-Patch-for-glslang-11.1.0.patch ===================================== @@ -0,0 +1,35 @@ +From: Jordan Justen <jljus...@debian.org> +Date: Sun, 31 Jan 2021 12:20:17 -0800 +Subject: renderdoc: Patch for glslang 11.1.0 + +Signed-off-by: Jordan Justen <jljus...@debian.org> +--- + renderdoc/CMakeLists.txt | 2 ++ + renderdoc/driver/shaders/spirv/glslang_compile.cpp | 1 + + 2 files changed, 3 insertions(+) + +diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt +index 1de52fb..b204da9 100644 +--- a/renderdoc/CMakeLists.txt ++++ b/renderdoc/CMakeLists.txt +@@ -499,6 +499,8 @@ if(ENABLE_GL OR ENABLE_GLES OR ENABLE_VULKAN) + list(APPEND RDOC_LIBRARIES + PRIVATE -lglslang + PRIVATE -lHLSL ++ PRIVATE -lMachineIndependent ++ PRIVATE -lGenericCodeGen + PRIVATE -lOGLCompiler + PRIVATE -lOSDependent + PRIVATE -lSPIRV +diff --git a/renderdoc/driver/shaders/spirv/glslang_compile.cpp b/renderdoc/driver/shaders/spirv/glslang_compile.cpp +index c94415e..798b3b2 100644 +--- a/renderdoc/driver/shaders/spirv/glslang_compile.cpp ++++ b/renderdoc/driver/shaders/spirv/glslang_compile.cpp +@@ -129,6 +129,7 @@ static TBuiltInResource DefaultResources = { + /*.maxTaskWorkGroupSizeY_NV =*/1, + /*.maxTaskWorkGroupSizeZ_NV =*/1, + /*.maxMeshViewCountNV =*/4, ++ /*.maxDualSourceDrawBuffersEXT =*/1, + + /*.limits*/ + { ===================================== debian/patches/series ===================================== @@ -5,3 +5,4 @@ 0005-replay-Only-support-compressonator-on-x86.patch 0006-linux_process-Only-use-ptrace-for-x86-family-process.patch 0007-renderdoc-serialise-Add-DoStringise-const-long-el-fo.patch +0008-renderdoc-Patch-for-glslang-11.1.0.patch View it on GitLab: https://salsa.debian.org/xorg-team/app/renderdoc/-/compare/1b8292df4128db2ad93d9c8a22a669a8a4c849b0...dc5f0b448587e32e1bf55c64bacaaca2589e2cd9 -- View it on GitLab: https://salsa.debian.org/xorg-team/app/renderdoc/-/compare/1b8292df4128db2ad93d9c8a22a669a8a4c849b0...dc5f0b448587e32e1bf55c64bacaaca2589e2cd9 You're receiving this email because of your account on salsa.debian.org.