mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix crash: when no #version for compute shader in es mode.

Browse Source 
An extra line of error recovery code set a non-sense combination of
es version and core profile.
This commit is contained in:
John Kessenich 2015-12-13 11:20:12 -07:00
parent 61d9fb9048
commit f5ce646546
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glslang/Include/revision.h
View File

@ -2,5 +2,5 @@
// For the version, it uses the latest git tag followed by the number of commits. // 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). // 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" #define GLSLANG_DATE "13-Dec-2015"

1
glslang/MachineIndependent/ShaderLang.cpp
View File

@ -386,7 +386,6 @@ bool DeduceVersionProfile(TInfoSink& infoSink, EShLanguage stage, bool versionNo
correct = false; 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"); 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 version = profile == EEsProfile ? 310 : 430; // 420 supports the extension, correction is to 430 which does not
profile = ECoreProfile;
} }
break; break;
default: default: