Externals / VideoCommon: update glslang to latest, turn into submodule

5 files changed, 126 insertions, 8 deletions

diff --git a/Source/Core/DolphinQt/DolphinQt.vcxproj b/Source/Core/DolphinQt/DolphinQt.vcxproj
index 0250f7260e..a1bc4f0597 100644
--- a/Source/Core/DolphinQt/DolphinQt.vcxproj
+++ b/Source/Core/DolphinQt/DolphinQt.vcxproj
@@ -482,6 +482,7 @@
   <Import Project="$(ExternalsDir)discord-rpc\exports.props" />
   <Import Project="$(ExternalsDir)enet\exports.props" />
   <Import Project="$(ExternalsDir)fmt\exports.props" />
+  <Import Project="$(ExternalsDir)glslang\exports.props" />
   <Import Project="$(ExternalsDir)imgui\exports.props" />
   <Import Project="$(ExternalsDir)implot\exports.props" />
   <Import Project="$(ExternalsDir)liblzma\exports.props" />
diff --git a/Source/Core/DolphinTool/DolphinTool.vcxproj b/Source/Core/DolphinTool/DolphinTool.vcxproj
index 94173a8971..79e1264b38 100644
--- a/Source/Core/DolphinTool/DolphinTool.vcxproj
+++ b/Source/Core/DolphinTool/DolphinTool.vcxproj
@@ -38,6 +38,7 @@
   <Import Project="$(ExternalsDir)bzip2\exports.props" />
   <Import Project="$(ExternalsDir)cpp-optparse\exports.props" />
   <Import Project="$(ExternalsDir)fmt\exports.props" />
+  <Import Project="$(ExternalsDir)glslang\exports.props" />
   <Import Project="$(ExternalsDir)liblzma\exports.props" />
   <Import Project="$(ExternalsDir)mbedtls\exports.props" />
   <Import Project="$(ExternalsDir)picojson\exports.props" />
diff --git a/Source/Core/VideoCommon/CMakeLists.txt b/Source/Core/VideoCommon/CMakeLists.txt
index 1bf87231e5..0ead1af2f8 100644
--- a/Source/Core/VideoCommon/CMakeLists.txt
+++ b/Source/Core/VideoCommon/CMakeLists.txt
@@ -270,11 +270,11 @@ endif()
 # Silence warnings on glslang by flagging it as a system include
 target_include_directories(videocommon
 SYSTEM PUBLIC
-  ${CMAKE_SOURCE_DIR}/Externals/glslang/glslang/Public
+  ${CMAKE_SOURCE_DIR}/Externals/glslang/glslang/glslang/Public
 SYSTEM PRIVATE
-  ${CMAKE_SOURCE_DIR}/Externals/glslang/StandAlone
-  ${CMAKE_SOURCE_DIR}/Externals/glslang/SPIRV
-  ${CMAKE_SOURCE_DIR}/Externals/glslang
+  ${CMAKE_SOURCE_DIR}/Externals/glslang/glslang/glslang
+  ${CMAKE_SOURCE_DIR}/Externals/glslang/glslang/SPIRV
+  ${CMAKE_SOURCE_DIR}/Externals/glslang/glslang
 )
 
 if(MSVC)
diff --git a/Source/Core/VideoCommon/Spirv.cpp b/Source/Core/VideoCommon/Spirv.cpp
index 9583838c97..1ee3d6da2d 100644
--- a/Source/Core/VideoCommon/Spirv.cpp
+++ b/Source/Core/VideoCommon/Spirv.cpp
@@ -5,7 +5,6 @@
 
 // glslang includes
 #include "GlslangToSpv.h"
-#include "ResourceLimits.h"
 #include "disassemble.h"
 
 #include "Common/FileUtil.h"
@@ -39,7 +38,123 @@ bool InitializeGlslang()
 
 const TBuiltInResource* GetCompilerResourceLimits()
 {
-  return &glslang::DefaultTBuiltInResource;
+  static const TBuiltInResource default_resource = {
+      /* .MaxLights = */ 32,
+      /* .MaxClipPlanes = */ 6,
+      /* .MaxTextureUnits = */ 32,
+      /* .MaxTextureCoords = */ 32,
+      /* .MaxVertexAttribs = */ 64,
+      /* .MaxVertexUniformComponents = */ 4096,
+      /* .MaxVaryingFloats = */ 64,
+      /* .MaxVertexTextureImageUnits = */ 32,
+      /* .MaxCombinedTextureImageUnits = */ 80,
+      /* .MaxTextureImageUnits = */ 32,
+      /* .MaxFragmentUniformComponents = */ 4096,
+      /* .MaxDrawBuffers = */ 32,
+      /* .MaxVertexUniformVectors = */ 128,
+      /* .MaxVaryingVectors = */ 8,
+      /* .MaxFragmentUniformVectors = */ 16,
+      /* .MaxVertexOutputVectors = */ 16,
+      /* .MaxFragmentInputVectors = */ 15,
+      /* .MinProgramTexelOffset = */ -8,
+      /* .MaxProgramTexelOffset = */ 7,
+      /* .MaxClipDistances = */ 8,
+      /* .MaxComputeWorkGroupCountX = */ 65535,
+      /* .MaxComputeWorkGroupCountY = */ 65535,
+      /* .MaxComputeWorkGroupCountZ = */ 65535,
+      /* .MaxComputeWorkGroupSizeX = */ 1024,
+      /* .MaxComputeWorkGroupSizeY = */ 1024,
+      /* .MaxComputeWorkGroupSizeZ = */ 64,
+      /* .MaxComputeUniformComponents = */ 1024,
+      /* .MaxComputeTextureImageUnits = */ 16,
+      /* .MaxComputeImageUniforms = */ 8,
+      /* .MaxComputeAtomicCounters = */ 8,
+      /* .MaxComputeAtomicCounterBuffers = */ 1,
+      /* .MaxVaryingComponents = */ 60,
+      /* .MaxVertexOutputComponents = */ 64,
+      /* .MaxGeometryInputComponents = */ 64,
+      /* .MaxGeometryOutputComponents = */ 128,
+      /* .MaxFragmentInputComponents = */ 128,
+      /* .MaxImageUnits = */ 8,
+      /* .MaxCombinedImageUnitsAndFragmentOutputs = */ 8,
+      /* .MaxCombinedShaderOutputResources = */ 8,
+      /* .MaxImageSamples = */ 0,
+      /* .MaxVertexImageUniforms = */ 0,
+      /* .MaxTessControlImageUniforms = */ 0,
+      /* .MaxTessEvaluationImageUniforms = */ 0,
+      /* .MaxGeometryImageUniforms = */ 0,
+      /* .MaxFragmentImageUniforms = */ 8,
+      /* .MaxCombinedImageUniforms = */ 8,
+      /* .MaxGeometryTextureImageUnits = */ 16,
+      /* .MaxGeometryOutputVertices = */ 256,
+      /* .MaxGeometryTotalOutputComponents = */ 1024,
+      /* .MaxGeometryUniformComponents = */ 1024,
+      /* .MaxGeometryVaryingComponents = */ 64,
+      /* .MaxTessControlInputComponents = */ 128,
+      /* .MaxTessControlOutputComponents = */ 128,
+      /* .MaxTessControlTextureImageUnits = */ 16,
+      /* .MaxTessControlUniformComponents = */ 1024,
+      /* .MaxTessControlTotalOutputComponents = */ 4096,
+      /* .MaxTessEvaluationInputComponents = */ 128,
+      /* .MaxTessEvaluationOutputComponents = */ 128,
+      /* .MaxTessEvaluationTextureImageUnits = */ 16,
+      /* .MaxTessEvaluationUniformComponents = */ 1024,
+      /* .MaxTessPatchComponents = */ 120,
+      /* .MaxPatchVertices = */ 32,
+      /* .MaxTessGenLevel = */ 64,
+      /* .MaxViewports = */ 16,
+      /* .MaxVertexAtomicCounters = */ 0,
+      /* .MaxTessControlAtomicCounters = */ 0,
+      /* .MaxTessEvaluationAtomicCounters = */ 0,
+      /* .MaxGeometryAtomicCounters = */ 0,
+      /* .MaxFragmentAtomicCounters = */ 8,
+      /* .MaxCombinedAtomicCounters = */ 8,
+      /* .MaxAtomicCounterBindings = */ 1,
+      /* .MaxVertexAtomicCounterBuffers = */ 0,
+      /* .MaxTessControlAtomicCounterBuffers = */ 0,
+      /* .MaxTessEvaluationAtomicCounterBuffers = */ 0,
+      /* .MaxGeometryAtomicCounterBuffers = */ 0,
+      /* .MaxFragmentAtomicCounterBuffers = */ 1,
+      /* .MaxCombinedAtomicCounterBuffers = */ 1,
+      /* .MaxAtomicCounterBufferSize = */ 16384,
+      /* .MaxTransformFeedbackBuffers = */ 4,
+      /* .MaxTransformFeedbackInterleavedComponents = */ 64,
+      /* .MaxCullDistances = */ 8,
+      /* .MaxCombinedClipAndCullDistances = */ 8,
+      /* .MaxSamples = */ 4,
+      /* .maxMeshOutputVerticesNV = */ 256,
+      /* .maxMeshOutputPrimitivesNV = */ 512,
+      /* .maxMeshWorkGroupSizeX_NV = */ 32,
+      /* .maxMeshWorkGroupSizeY_NV = */ 1,
+      /* .maxMeshWorkGroupSizeZ_NV = */ 1,
+      /* .maxTaskWorkGroupSizeX_NV = */ 32,
+      /* .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 = */
+      {
+          /* .nonInductiveForLoops = */ 1,
+          /* .whileLoops = */ 1,
+          /* .doWhileLoops = */ 1,
+          /* .generalUniformIndexing = */ 1,
+          /* .generalAttributeMatrixVectorIndexing = */ 1,
+          /* .generalVaryingIndexing = */ 1,
+          /* .generalSamplerIndexing = */ 1,
+          /* .generalVariableIndexing = */ 1,
+          /* .generalConstantMatrixVectorIndexing = */ 1,
+      }};
+  return &default_resource;
 }
 
 std::optional<SPIRV::CodeVector>
@@ -124,8 +239,8 @@ CompileShaderToSPV(EShLanguage stage, APIType api_type,
   if (g_ActiveConfig.bEnableValidationLayer)
   {
     // Attach the source code to the SPIR-V for tools like RenderDoc.
-    intermediate->setSourceFile(stage_filename);
-    intermediate->addSourceText(pass_source_code, pass_source_code_length);
+    shader->setSourceFile(stage_filename);
+    shader->addSourceText(pass_source_code, pass_source_code_length);
 
     options.generateDebugInfo = true;
     options.disableOptimizer = true;
diff --git a/Source/UnitTests/UnitTests.vcxproj b/Source/UnitTests/UnitTests.vcxproj
index 6725c1cc23..f35f6a691a 100644
--- a/Source/UnitTests/UnitTests.vcxproj
+++ b/Source/UnitTests/UnitTests.vcxproj
@@ -103,6 +103,7 @@
   </ItemGroup>
   <Import Project="$(ExternalsDir)Bochs_disasm\exports.props" />
   <Import Project="$(ExternalsDir)fmt\exports.props" />
+  <Import Project="$(ExternalsDir)glslang\exports.props" />
   <Import Project="$(ExternalsDir)picojson\exports.props" />
   <Import Project="$(ExternalsDir)rcheevos\exports.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />