From f5ce6465466a8a8b6dbfd802bd65ac927f1745aa Mon Sep 17 00:00:00 2001 From: John Kessenich Date: Sun, 13 Dec 2015 11:20:12 -0700 Subject: [PATCH] Fix crash: when no #version for compute shader in es mode. An extra line of error recovery code set a non-sense combination of es version and core profile. --- glslang/Include/revision.h | 2 +- glslang/MachineIndependent/ShaderLang.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/glslang/Include/revision.h b/glslang/Include/revision.h index 397b48c..55eced3 100644 --- a/glslang/Include/revision.h +++ b/glslang/Include/revision.h @@ -2,5 +2,5 @@ // For the version, it uses the latest git tag followed by the number of commits. // For the date, it uses the current date (when then script is run). -#define GLSLANG_REVISION "SPIRV99.842" +#define GLSLANG_REVISION "SPIRV99.843" #define GLSLANG_DATE "13-Dec-2015" diff --git a/glslang/MachineIndependent/ShaderLang.cpp b/glslang/MachineIndependent/ShaderLang.cpp index 8167e3c..3a07691 100644 --- a/glslang/MachineIndependent/ShaderLang.cpp +++ b/glslang/MachineIndependent/ShaderLang.cpp @@ -386,7 +386,6 @@ bool DeduceVersionProfile(TInfoSink& infoSink, EShLanguage stage, bool versionNo correct = false; infoSink.info.message(EPrefixError, "#version: compute shaders require es profile with version 310 or above, or non-es profile with version 420 or above"); version = profile == EEsProfile ? 310 : 430; // 420 supports the extension, correction is to 430 which does not - profile = ECoreProfile; } break; default: -- 2.7.4