From 1e6637098ad8464d9b9116e30719de0299574bde Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Thu, 25 Oct 2018 15:30:02 +0100
Subject: [PATCH] Use default set of glslang limits instead of 0s, which might
 fail

---
 renderdoc/driver/gl/gl_shader_refl.cpp        | 5 ++---
 renderdoc/driver/shaders/spirv/spirv_common.h | 3 +++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/renderdoc/driver/gl/gl_shader_refl.cpp b/renderdoc/driver/gl/gl_shader_refl.cpp
index fa0d97fc7..e41f06664 100644
--- a/renderdoc/driver/gl/gl_shader_refl.cpp
+++ b/renderdoc/driver/gl/gl_shader_refl.cpp
@@ -260,11 +260,10 @@ GLuint MakeSeparableShaderProgram(WrappedOpenGL &drv, GLenum type, vector<string
         sh.setEnvClient(glslang::EShClientOpenGL, glslang::EShTargetOpenGL_450);
         sh.setEnvTarget(glslang::EShTargetNone, glslang::EShTargetSpv_1_0);
 
-        TBuiltInResource res = {};
         glslang::TShader::ForbidIncluder incl;
 
-        bool success =
-            sh.preprocess(&res, 100, ENoProfile, false, false, EShMsgOnlyPreprocessor, &src, incl);
+        bool success = sh.preprocess(&DefaultResources, 100, ENoProfile, false, false,
+                                     EShMsgOnlyPreprocessor, &src, incl);
 
         if(!success)
         {
diff --git a/renderdoc/driver/shaders/spirv/spirv_common.h b/renderdoc/driver/shaders/spirv/spirv_common.h
index 56e7aea51..0785ba169 100644
--- a/renderdoc/driver/shaders/spirv/spirv_common.h
+++ b/renderdoc/driver/shaders/spirv/spirv_common.h
@@ -29,6 +29,7 @@
 #include <utility>
 #include <vector>
 #include "3rdparty/glslang/SPIRV/spirv.hpp"
+#include "3rdparty/glslang/glslang/Include/ResourceLimits.h"
 #include "api/replay/renderdoc_replay.h"
 
 using std::string;
@@ -178,6 +179,8 @@ glslang::TShader *CompileShaderForReflection(SPIRVShaderStage stage,
                                              const std::vector<std::string> &sources);
 glslang::TProgram *LinkProgramForReflection(const std::vector<glslang::TShader *> &shaders);
 
+extern TBuiltInResource DefaultResources;
+
 enum class ReflectionInterface
 {
   Input,