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

Fix #1333: Protect against -g for non-generating code.

Browse Source
This commit is contained in:
John Kessenich 2018-04-05 19:00:01 -06:00
parent a89f8cf76b
commit 7f0bcfd8d8
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
StandAlone/StandAlone.cpp
View File

@ -729,6 +729,9 @@ void SetMessageOptions(EShMessages& messages)
// //
void CompileShaders(glslang::TWorklist& worklist) void CompileShaders(glslang::TWorklist& worklist)
{ {
if (Options & EOptionDebug)
Error("cannot generate debug information unless linking to generate code");
glslang::TWorkItem* workItem; glslang::TWorkItem* workItem;
if (Options & EOptionStdin) { if (Options & EOptionStdin) {
worklist.remove(workItem); worklist.remove(workItem);

2
glslang/MachineIndependent/localintermediate.h
View File

@ -619,7 +619,7 @@ public:
return semanticNameSet.insert(name).first->c_str(); return semanticNameSet.insert(name).first->c_str();
} }
void setSourceFile(const char* file) { sourceFile = file; } void setSourceFile(const char* file) { if (file != nullptr) sourceFile = file; }
const std::string& getSourceFile() const { return sourceFile; } const std::string& getSourceFile() const { return sourceFile; }
void addSourceText(const char* text) { sourceText = sourceText + text; } void addSourceText(const char* text) { sourceText = sourceText + text; }
const std::string& getSourceText() const { return sourceText; } const std::string& getSourceText() const { return sourceText; }