HLSL: Change the final syntax-error printf to go to the infoLog.

Fixes issue #510.
This commit is contained in:
John Kessenich 2016-09-19 14:56:55 -06:00
parent 28b28140bb
commit 142785f324
3 changed files with 15 additions and 11 deletions

View file

@ -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 "Overload400-PrecQual.1494"
#define GLSLANG_REVISION "Overload400-PrecQual.1495"
#define GLSLANG_DATE "19-Sep-2016"

View file

@ -41,9 +41,13 @@ namespace glslang {
void TInfoSinkBase::append(const char* s)
{
if (outputStream & EString) {
if (s == nullptr)
sink.append("(null)");
else {
checkMem(strlen(s));
sink.append(s);
}
}
//#ifdef _WIN32
// if (outputStream & EDebugger)

View file

@ -124,8 +124,8 @@ bool HlslParseContext::parseShaderStrings(TPpContext& ppContext, TInputScanner&
// Print a message formated such that if you click on the message it will take you right to
// the line through most UIs.
const glslang::TSourceLoc& sourceLoc = input.getSourceLoc();
printf("\n%s(%i): error at column %i, HLSL translation failed.\n", sourceLoc.name, sourceLoc.line,
sourceLoc.column);
infoSink.info << sourceLoc.name << "(" << sourceLoc.line << "): error at column " << sourceLoc.column << ", HLSL parsing failed.\n";
++numErrors;
return false;
}