Update glslang and SPIRV-Cross (#1285)

Update glslang to version 13.0.0 and SPIRV-Cross to latest main branch. When updating glslang it now has a better way for setting default resource limits, that removes the need for "ResourceLimits.h".
BabylonJS · Sep 20, 2023 · 1456d20 · 1456d20
1 parent 420364e
commit 1456d20
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 136 deletions.
diff --git a/Dependencies/CMakeLists.txt b/Dependencies/CMakeLists.txt
@@ -78,12 +78,14 @@ set_property(TARGET OGLCompiler PROPERTY FOLDER Dependencies/glslang)
 set_property(TARGET OSDependent PROPERTY FOLDER Dependencies/glslang)
 set_property(TARGET MachineIndependent PROPERTY FOLDER Dependencies/glslang)
 set_property(TARGET SPIRV PROPERTY FOLDER Dependencies/glslang)
+set_property(TARGET glslang-default-resource-limits PROPERTY FOLDER Dependencies/glslang)
 disable_warnings(GenericCodeGen)
 disable_warnings(glslang)
 disable_warnings(OGLCompiler)
 disable_warnings(OSDependent)
 disable_warnings(MachineIndependent)
 disable_warnings(SPIRV)
+disable_warnings(glslang-default-resource-limits)
 
 # -------------------------------- SPIRV-Cross --------------------------------
 # Dependencies: none

diff --git a/Dependencies/SPIRV-Cross b/Dependencies/SPIRV-Cross
diff --git a/Dependencies/glslang b/Dependencies/glslang
diff --git a/Install/Install.cmake b/Install/Install.cmake
@@ -1,5 +1,9 @@
 include(GNUInstallDirs)
 
+if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+  set(CMAKE_INSTALL_PREFIX "./install/" CACHE PATH "..." FORCE)
+endif()
+
 function(install_targets)
     install(TARGETS ${ARGN})
 
@@ -27,7 +31,7 @@ install_targets(arcana)
 install_targets(astc-encoder edtaa3 etc1 etc2 iqa nvtt pvrtc squish tinyexr bgfx bimg bx)
 
 ## glslang
-install_targets(GenericCodeGen glslang MachineIndependent OGLCompiler OSDependent SPIRV)
+install_targets(GenericCodeGen glslang MachineIndependent OGLCompiler OSDependent SPIRV glslang-default-resource-limits)
 
 ## SPIRV-Cross
 install_targets(spirv-cross-core spirv-cross-glsl)

diff --git a/Install/Test/CMakeLists.txt b/Install/Test/CMakeLists.txt
@@ -171,6 +171,7 @@ target_link_libraries(TestInstall
     d3d12
     d3dcompiler
     Pathcch
+    glslang-default-resource-limits
     gtest_main
     ${ADDITIONAL_LIBRARIES}
     )

diff --git a/Plugins/NativeEngine/CMakeLists.txt b/Plugins/NativeEngine/CMakeLists.txt
@@ -7,8 +7,6 @@ set(SOURCES
     "Source/NativeEngine.cpp"
     "Source/NativeEngine.h"
     "Source/PerFrameValue.h"
-    "Source/ResourceLimits.cpp"
-    "Source/ResourceLimits.h"
     "Source/ShaderCompiler.h"
     "Source/ShaderCompilerCommon.h"
     "Source/ShaderCompilerCommon.cpp"
@@ -41,6 +39,7 @@ target_link_libraries(NativeEngine
     PRIVATE bimg
     PRIVATE bx
     PRIVATE glslang
+    PRIVATE glslang-default-resource-limits
     PRIVATE SPIRV
     PRIVATE GraphicsDeviceContext
     PRIVATE napi_extensions)

diff --git a/Plugins/NativeEngine/Source/ResourceLimits.cpp b/Plugins/NativeEngine/Source/ResourceLimits.cpp
diff --git a/Plugins/NativeEngine/Source/ResourceLimits.h b/Plugins/NativeEngine/Source/ResourceLimits.h
diff --git a/Plugins/NativeEngine/Source/ShaderCompilerD3D.h b/Plugins/NativeEngine/Source/ShaderCompilerD3D.h
@@ -3,10 +3,10 @@
 #include "ShaderCompiler.h"
 #include "ShaderCompilerCommon.h"
 #include "ShaderCompilerTraversers.h"
-#include "ResourceLimits.h"
 #include <arcana/experimental/array.h>
 #include <bgfx/bgfx.h>
 #include <glslang/Public/ShaderLang.h>
+#include <glslang/Public/ResourceLimits.h>
 #include <SPIRV/GlslangToSpv.h>
 #include <spirv_parser.hpp>
 #include <spirv_hlsl.hpp>
@@ -22,7 +22,9 @@ namespace Babylon
             const std::array<const char*, 1> sources{source.data()};
             shader.setStrings(sources.data(), gsl::narrow_cast<int>(sources.size()));
 
-            if (!shader.parse(&DefaultTBuiltInResource, 310, EProfile::EEsProfile, true, true, EShMsgDefault))
+            auto defaultTBuiltInResource = GetDefaultResources();
+
+            if (!shader.parse(defaultTBuiltInResource, 310, EProfile::EEsProfile, true, true, EShMsgDefault))
             {
                 throw std::runtime_error{shader.getInfoLog()};
             }

diff --git a/Plugins/NativeEngine/Source/ShaderCompilerMetal.cpp b/Plugins/NativeEngine/Source/ShaderCompilerMetal.cpp
@@ -1,10 +1,10 @@
 #include "ShaderCompiler.h"
 #include "ShaderCompilerCommon.h"
 #include "ShaderCompilerTraversers.h"
-#include "ResourceLimits.h"
 #include <arcana/experimental/array.h>
 #include <bgfx/bgfx.h>
 #include <glslang/Public/ShaderLang.h>
+#include <glslang/Public/ResourceLimits.h>
 #include <SPIRV/GlslangToSpv.h>
 #include <spirv_parser.hpp>
 #include <spirv_msl.hpp>
@@ -18,7 +18,9 @@ namespace Babylon
             const std::array<const char*, 1> sources{source.data()};
             shader.setStrings(sources.data(), gsl::narrow_cast<int>(sources.size()));
 
-            if (!shader.parse(&DefaultTBuiltInResource, 310, EProfile::EEsProfile, true, true, EShMsgDefault))
+            auto defaultTBuiltInResource = GetDefaultResources();
+
+            if (!shader.parse(defaultTBuiltInResource, 310, EProfile::EEsProfile, true, true, EShMsgDefault))
             {
                 throw std::runtime_error(shader.getInfoLog());
             }

diff --git a/Plugins/NativeEngine/Source/ShaderCompilerOpenGL.cpp b/Plugins/NativeEngine/Source/ShaderCompilerOpenGL.cpp
@@ -1,25 +1,25 @@
 #include "ShaderCompiler.h"
 #include "ShaderCompilerCommon.h"
 #include "ShaderCompilerTraversers.h"
-#include "ResourceLimits.h"
 #include <arcana/experimental/array.h>
 #include <glslang/Public/ShaderLang.h>
+#include <glslang/Public/ResourceLimits.h>
 #include <SPIRV/GlslangToSpv.h>
 #include <spirv_parser.hpp>
 #include <spirv_glsl.hpp>
 
 namespace Babylon
 {
-    extern const TBuiltInResource DefaultTBuiltInResource;
-
     namespace
     {
         void AddShader(glslang::TProgram& program, glslang::TShader& shader, std::string_view source)
         {
             const std::array<const char*, 1> sources{source.data()};
             shader.setStrings(sources.data(), gsl::narrow_cast<int>(sources.size()));
 
-            if (!shader.parse(&DefaultTBuiltInResource, 310, EProfile::EEsProfile, true, true, EShMsgDefault))
+            auto defaultTBuiltInResource = GetDefaultResources();
+
+            if (!shader.parse(defaultTBuiltInResource, 310, EProfile::EEsProfile, true, true, EShMsgDefault))
             {
                 throw std::runtime_error(shader.getInfoLog());
             }

diff --git a/Plugins/NativeEngine/Source/ShaderCompilerVulkan.cpp b/Plugins/NativeEngine/Source/ShaderCompilerVulkan.cpp
@@ -1,26 +1,26 @@
 #include "ShaderCompiler.h"
 #include "ShaderCompilerCommon.h"
 #include "ShaderCompilerTraversers.h"
-#include "ResourceLimits.h"
 #include <arcana/experimental/array.h>
 #include <glslang/Public/ShaderLang.h>
+#include <glslang/Public/ResourceLimits.h>
 #include <SPIRV/GlslangToSpv.h>
 #include <spirv_parser.hpp>
 #include <spirv_glsl.hpp>
 #include <bgfx/bgfx.h>
 
 namespace Babylon
 {
-    extern const TBuiltInResource DefaultTBuiltInResource;
-
     namespace
     {
         void AddShader(glslang::TProgram& program, glslang::TShader& shader, std::string_view source)
         {
             const std::array<const char*, 1> sources{source.data()};
             shader.setStrings(sources.data(), gsl::narrow_cast<int>(sources.size()));
 
-            if (!shader.parse(&DefaultTBuiltInResource, 310, EProfile::EEsProfile, true, true, EShMsgDefault))
+            auto defaultTBuiltInResource = GetDefaultResources();
+
+            if (!shader.parse(defaultTBuiltInResource, 310, EProfile::EEsProfile, true, true, EShMsgDefault))
             {
                 throw std::runtime_error(shader.getInfoLog());
             }