glslang_utils: remove default resources workaround

NopeForge · Apr 29, 2024 · 64360dc · 64360dc
1 parent 05ca383
commit 64360dc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
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;