glslang_utils: remove default resources workaround

mbouron · May 20, 2024 · 2342fb8 · 2342fb8
1 parent c582c84
commit 2342fb8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/doc/usr/howto/installation.md b/doc/usr/howto/installation.md
@@ -27,7 +27,7 @@ building and running the complete `nope.gl` stack.
     typically named with a `-dev` suffix on Debian based systems)
   - **Graphviz**
   - **SDL2**
-  - **Glslang**
+  - **Glslang ≥ 11.13.0**
   - **MoltenVK** (macOS, optional)
 - Build with `./configure.py && make`
 - Enter the virtual environment with `. venv/bin/ngli-activate`

diff --git a/libnopegl/meson.build b/libnopegl/meson.build
@@ -601,7 +601,7 @@ foreach gbackend_name, gbackend_cfg : gbackends_cfg
           )
         endforeach
         glslang_ver = '.'.join(glslang_ver_array)
-        glslang_min_ver = '>= 11.3.0'
+        glslang_min_ver = '>= 11.13.0'
         if glslang_ver.version_compare(glslang_min_ver)
           gbackend_deps += declare_dependency(include_directories: glslang_include_dirs)
         else

diff --git a/libnopegl/src/backends/vk/glslang_utils.c b/libnopegl/src/backends/vk/glslang_utils.c
@@ -24,6 +24,7 @@
 #include <string.h>
 #include <glslang/build_info.h>
 #include <glslang/Include/glslang_c_interface.h>
+#include <glslang/Public/resource_limits_c.h>
 
 #include "glslang_utils.h"
 #include "log.h"
@@ -32,13 +33,6 @@
 #include "program.h"
 #include "pthread_compat.h"
 
-/*
- * resource_limits_c.h which declares glslang_default_resource() is currently
- * not distributed, so forward declare it.
- * See: https://github.com/KhronosGroup/glslang/issues/2822
- */
-const glslang_resource_t *glslang_default_resource(void);
-
 static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
 static int refcount = 0;