From: Timo Röhling <roehling@debian.org>
Date: Fri, 27 Jan 2023 23:24:14 +0000 (+0100)
Subject: Fix compatibility with spirv-cross SDK 1.3.236
X-Git-Tag: archive/raspbian/1.9.25+dfsg3-1+rpi1^2~41
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=77dd4e6f3c7af82a0ffcedbc1fcf4abd6de3633c;p=filament.git

Fix compatibility with spirv-cross SDK 1.3.236
---

diff --git a/debian/patches/0019-Fix-compatibility-with-spirv-cross-SDK-1.3.236.patch b/debian/patches/0019-Fix-compatibility-with-spirv-cross-SDK-1.3.236.patch
new file mode 100644
index 0000000..2419ca0
--- /dev/null
+++ b/debian/patches/0019-Fix-compatibility-with-spirv-cross-SDK-1.3.236.patch
@@ -0,0 +1,24 @@
+From: =?utf-8?q?Timo_R=C3=B6hling?= <roehling@debian.org>
+Date: Sat, 28 Jan 2023 00:24:04 +0100
+Subject: Fix compatibility with spirv-cross SDK 1.3.236
+
+---
+ libs/filamat/src/GLSLPostProcessor.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/libs/filamat/src/GLSLPostProcessor.cpp b/libs/filamat/src/GLSLPostProcessor.cpp
+index 678f069..c774bd9 100644
+--- a/libs/filamat/src/GLSLPostProcessor.cpp
++++ b/libs/filamat/src/GLSLPostProcessor.cpp
+@@ -346,7 +346,11 @@ void GLSLPostProcessor::fullOptimization(const TShader& tShader,
+ 
+         if (tShader.getStage() == EShLangFragment && glslOptions.es) {
+             for (auto i : config.glsl.subpassInputToColorLocation) {
++#if SPV_VERSION >= 0x10600
++                glslCompiler.remap_ext_framebuffer_fetch(i.first, i.second, true);
++#else
+                 glslCompiler.remap_ext_framebuffer_fetch(i.first, i.second);
++#endif
+             }
+         }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 3c09467..83f6b96 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,3 +16,4 @@
 0016-Fix-FTBFS-with-GCC-12.patch
 0017-Workaround-for-armel-clang-compiler-bug.patch
 0018-Fix-TBuiltInResource-struct.patch
+0019-Fix-compatibility-with-spirv-cross-SDK-1.3.236.patch