Fix compatibility with glslang-dev >= 11.12.0

diff --git a/debian/control b/debian/control
index 9b7917abb5c46588282a6e3b0eadff396459348b..1a21628e551d802f0dedc8b4d9456b5707b5a434 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Timo Röhling <roehling@debian.org>
 Build-Depends: debhelper-compat (= 13),
     clang,
     cmake,
-    glslang-dev,
+    glslang-dev (>= 11.12.0),
     libassimp-dev,
     libastcenc-dev,
     libbenchmark-dev,

diff --git a/debian/patches/0018-Fix-TBuiltInResource-struct.patch b/debian/patches/0018-Fix-TBuiltInResource-struct.patch
new file mode 100644 (file)
index 0000000..b8ec36b
--- /dev/null
+++ b/debian/patches/0018-Fix-TBuiltInResource-struct.patch
@@ -0,0 +1,49 @@
+From: =?utf-8?q?Timo_R=C3=B6hling?= <roehling@debian.org>
+Date: Sat, 12 Nov 2022 13:26:20 +0100
+Subject: Fix TBuiltInResource struct
+
+---
+ filament/backend/test/builtinResource.h | 9 +++++++++
+ libs/filamat/src/sca/builtinResource.h  | 9 +++++++++
+ 2 files changed, 18 insertions(+)
+
+diff --git a/filament/backend/test/builtinResource.h b/filament/backend/test/builtinResource.h
+index 39ac194..78397fe 100644
+--- a/filament/backend/test/builtinResource.h
++++ b/filament/backend/test/builtinResource.h
+@@ -107,6 +107,15 @@ const TBuiltInResource DefaultTBuiltInResource = {
+         /* .maxTaskWorkGroupSizeY_NV = */ 1,
+         /* .maxTaskWorkGroupSizeZ_NV = */ 1,
+         /* .maxMeshViewCountNV = */ 4,
++        /* .maxMeshOutputVerticesEXT = */ 256,
++        /* .maxMeshOutputPrimitivesEXT = */ 256,
++        /* .maxMeshWorkGroupSizeX_EXT = */ 128,
++        /* .maxMeshWorkGroupSizeY_EXT = */ 128,
++        /* .maxMeshWorkGroupSizeZ_EXT = */ 128,
++        /* .maxTaskWorkGroupSizeX_EXT = */ 128,
++        /* .maxTaskWorkGroupSizeY_EXT = */ 128,
++        /* .maxTaskWorkGroupSizeZ_EXT = */ 128,
++        /* .maxMeshViewCountEXT = */ 4,
+         /* .maxDualSourceDrawBuffersEXT = */ 1,
+ 
+         /* .limits = */ {
+diff --git a/libs/filamat/src/sca/builtinResource.h b/libs/filamat/src/sca/builtinResource.h
+index 4419eb6..c47c8e0 100644
+--- a/libs/filamat/src/sca/builtinResource.h
++++ b/libs/filamat/src/sca/builtinResource.h
+@@ -107,6 +107,15 @@ const TBuiltInResource DefaultTBuiltInResource = {
+         /* .maxTaskWorkGroupSizeY_NV = */ 1,
+         /* .maxTaskWorkGroupSizeZ_NV = */ 1,
+         /* .maxMeshViewCountNV = */ 4,
++        /* .maxMeshOutputVerticesEXT = */ 256,
++        /* .maxMeshOutputPrimitivesEXT = */ 256,
++        /* .maxMeshWorkGroupSizeX_EXT = */ 128,
++        /* .maxMeshWorkGroupSizeY_EXT = */ 128,
++        /* .maxMeshWorkGroupSizeZ_EXT = */ 128,
++        /* .maxTaskWorkGroupSizeX_EXT = */ 128,
++        /* .maxTaskWorkGroupSizeY_EXT = */ 128,
++        /* .maxTaskWorkGroupSizeZ_EXT = */ 128,
++        /* .maxMeshViewCountEXT = */ 4,
+         /* .maxDualSourceDrawBuffersEXT = */ 1,
+ 
+         /* .limits = */ {

diff --git a/debian/patches/series b/debian/patches/series
index 95abe8608b073d5ad927f4e18128284557733385..3c09467bd881ee9d155e0ba8b8bd82efee9aa1eb 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@
 0015-Ensure-proper-alignment-of-resgen-_OFFSET-and-_SIZE-.patch
 0016-Fix-FTBFS-with-GCC-12.patch
 0017-Workaround-for-armel-clang-compiler-bug.patch
+0018-Fix-TBuiltInResource-struct.patch