From 233c8d07d6ec4dfc513c4d08722ae1074745c48e Mon Sep 17 00:00:00 2001 From: baldurk Date: Sat, 11 Jul 2015 22:37:47 +0200 Subject: [PATCH] Disable glslang use for SPIR-V compilation until it's proven more stable --- renderdoc/driver/shaders/spirv/spirv_compile.cpp | 4 ++++ renderdoc/driver/shaders/spirv/spirv_disassemble.cpp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/renderdoc/driver/shaders/spirv/spirv_compile.cpp b/renderdoc/driver/shaders/spirv/spirv_compile.cpp index 4acd610f2..c7f38d73b 100644 --- a/renderdoc/driver/shaders/spirv/spirv_compile.cpp +++ b/renderdoc/driver/shaders/spirv/spirv_compile.cpp @@ -134,6 +134,9 @@ TBuiltInResource DefaultResources = string CompileSPIRV(SPIRVShaderStage shadType, const std::vector &sources, vector &spirv) { +#if defined(RELEASE) + return "SPIR-V disassembly disabled due to glslang instability"; +#else if(shadType >= eSPIRVInvalid) return "Invalid shader stage specified"; @@ -202,4 +205,5 @@ string CompileSPIRV(SPIRVShaderStage shadType, const std::vector &s delete[] strs; return errors; +#endif } diff --git a/renderdoc/driver/shaders/spirv/spirv_disassemble.cpp b/renderdoc/driver/shaders/spirv/spirv_disassemble.cpp index d3abd9b32..26d613954 100644 --- a/renderdoc/driver/shaders/spirv/spirv_disassemble.cpp +++ b/renderdoc/driver/shaders/spirv/spirv_disassemble.cpp @@ -49,6 +49,9 @@ static string OptionalFlagString(EnumType e) void DisassembleSPIRV(SPIRVShaderStage shadType, const vector &spirv, string &disasm) { +#if defined(RELEASE) + return; +#else if(shadType >= eSPIRVInvalid) return; @@ -678,6 +681,7 @@ void DisassembleSPIRV(SPIRVShaderStage shadType, const vector &spirv, } return; +#endif } template<>