From 560c95cdc6cf8e477a3dfd39cb491c39ac3af493 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Sat, 11 Jul 2015 22:35:54 +0200
Subject: [PATCH] Updates from renderdoc branch on
 https://github.com/baldurk/glslang

---
 renderdoc/3rdparty/glslang/SPIRV/GlslangToSpv.cpp | 2 ++
 renderdoc/3rdparty/glslang/SPIRV/SpvBuilder.cpp   | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/renderdoc/3rdparty/glslang/SPIRV/GlslangToSpv.cpp b/renderdoc/3rdparty/glslang/SPIRV/GlslangToSpv.cpp
index 86d18a58e..0c01d9e71 100644
--- a/renderdoc/3rdparty/glslang/SPIRV/GlslangToSpv.cpp
+++ b/renderdoc/3rdparty/glslang/SPIRV/GlslangToSpv.cpp
@@ -817,6 +817,8 @@ bool TGlslangToSpvTraverser::visitAggregate(glslang::TVisit visit, glslang::TInt
             glslang::TConstUnionArray emptyConsts;
             int nextConst = 0;
             result = createSpvConstant(node->getType(), emptyConsts, nextConst);
+            if(! result)
+                return false;
         }
         builder.clearAccessChain();
         builder.setAccessChainRValue(result);
diff --git a/renderdoc/3rdparty/glslang/SPIRV/SpvBuilder.cpp b/renderdoc/3rdparty/glslang/SPIRV/SpvBuilder.cpp
index ba687ffee..0f12b94fd 100644
--- a/renderdoc/3rdparty/glslang/SPIRV/SpvBuilder.cpp
+++ b/renderdoc/3rdparty/glslang/SPIRV/SpvBuilder.cpp
@@ -2129,13 +2129,13 @@ void Builder::dumpInstructions(std::vector<unsigned int>& out, const std::vector
 
 void MissingFunctionality(const char* fun)
 {
-    printf("Missing functionality: %s\n", fun);
-    exit(1);
+    //printf("Missing functionality: %s\n", fun);
+    //exit(1);
 }
 
 void ValidationError(const char* error)
 {
-    printf("Validation Error: %s\n", error);
+    //printf("Validation Error: %s\n", error);
 }
 
 }; // end spv namespace