AuroraMiddleware/glslang
1
0
Fork 0
mirror of https://github.com/KhronosGroup/glslang synced 2024-11-09 12:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Encapsulate warnings like errors. Add warning for missing #version.

Browse Source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@22041 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich 2013-06-17 21:47:23 +00:00
parent a622cf2dc5
commit c59d0cd9e6
6 changed files with 55 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
glslang/MachineIndependent/ParseHelper.cpp
View File

@ -207,7 +207,6 @@ void C_DECL TParseContext::error(TSourceLoc nLine, const char *szReason, const c
safe_vsprintf(szExtraInfo, maxSize, szExtraInfoFormat, marker);
/* VC++ format: file(linenum) : error #: 'token' : extrainfo */
infoSink.info.prefix(EPrefixError);
infoSink.info.location(nLine);
infoSink.info << "'" << szToken << "' : " << szReason << " " << szExtraInfo << "\n";
@ -217,6 +216,27 @@ void C_DECL TParseContext::error(TSourceLoc nLine, const char *szReason, const c
++numErrors;
}
void C_DECL TParseContext::warn(TSourceLoc nLine, const char *szReason, const char *szToken,
const char *szExtraInfoFormat, ...)
{
if (messages & EShMsgSuppressWarnings)
return;
const int maxSize = GlslangMaxTokenLength + 200;
char szExtraInfo[maxSize];
va_list marker;
va_start(marker, szExtraInfoFormat);
safe_vsprintf(szExtraInfo, maxSize, szExtraInfoFormat, marker);
infoSink.info.prefix(EPrefixWarning);
infoSink.info.location(nLine);
infoSink.info << "'" << szToken << "' : " << szReason << " " << szExtraInfo << "\n";
va_end(marker);
}
TIntermTyped* TParseContext::handleVariable(int line, TSymbol* symbol, TString* string)
{
TIntermTyped* node = 0;

4
glslang/MachineIndependent/ParseHelper.h
View File

@ -99,9 +99,11 @@ struct TParseContext {
void initializeExtensionBehavior();
const char* getPreamble();
void C_DECL error(TSourceLoc, const char *szReason, const char *szToken,
const char *szExtraInfoFormat, ...);
void C_DECL warn(TSourceLoc, const char *szReason, const char *szToken,
const char *szExtraInfoFormat, ...);
bool reservedErrorCheck(int line, const TString& identifier);
TIntermTyped* handleVariable(int line, TSymbol* symbol, TString* string);

7
glslang/MachineIndependent/ShaderLang.cpp
View File

@ -506,9 +506,12 @@ int ShCompile(
int version;
EProfile profile;
bool versionStatementMissing = false;
ScanVersion(shaderStrings, numStrings, version, profile);
if (version == 0)
if (version == 0) {
version = defaultVersion;
versionStatementMissing = true;
}
bool goodProfile = DeduceProfile(compiler->infoSink, version, profile);
TIntermediate intermediate(compiler->infoSink, version, profile);
@ -528,6 +531,8 @@ int ShCompile(
parseContext.error(1, "incorrect", "#version", "");
parseContext.initializeExtensionBehavior();
if (versionStatementMissing)
parseContext.warn(1, "statement missing: use #version on first line of shader", "#version", "");
GlobalParseContext = &parseContext;

56
glslang/MachineIndependent/glslang.l
View File

@ -763,10 +763,8 @@ int PaIdentOrReserved(bool reserved, TParseContext& pc, int line, const char* te
return 0;
}
if (pc.forwardCompatible && ! (pc.messages & EShMsgSuppressWarnings)) {
pc.infoSink.info.message(EPrefixWarning, yytext, yylineno);
pc.infoSink.info.message(EPrefixWarning, "using future reserved keyword", yylineno);
}
if (pc.forwardCompatible)
pc.warn(yylineno, "using future reserved keyword", text, "");
return PaIdentOrType(text, pc, pyylval);
}
@ -779,10 +777,8 @@ int PaES30ReservedFromGLSL(int version, TParseContext& pc, int line, const char*
if (pc.profile == EEsProfile && pc.version < 300 ||
pc.profile != EEsProfile && pc.version < version) {
if (pc.forwardCompatible && ! (pc.messages & EShMsgSuppressWarnings)) {
pc.infoSink.info.message(EPrefixWarning, text, yylineno);
pc.infoSink.info.message(EPrefixWarning, "future reserved word in ES 300 and keyword in GLSL", yylineno);
}
if (pc.forwardCompatible)
pc.warn(yylineno, "future reserved word in ES 300 and keyword in GLSL", text, "");
return PaIdentOrType(text, pc, pyylval);
} else if (pc.profile == EEsProfile && pc.version >= 300)
@ -799,10 +795,8 @@ int PaNonreservedKeyword(int esVersion, int nonEsVersion, TParseContext& pc, int
if (pc.profile == EEsProfile && pc.version < esVersion ||
pc.profile != EEsProfile && pc.version < nonEsVersion) {
if (pc.forwardCompatible && ! (pc.messages & EShMsgSuppressWarnings)) {
pc.infoSink.info.message(EPrefixWarning, text, yylineno);
pc.infoSink.info.message(EPrefixWarning, "using future keyword", yylineno);
}
if (pc.forwardCompatible)
pc.warn(yylineno, "using future keyword", text, "");
return PaIdentOrType(text, pc, pyylval);
}
@ -817,10 +811,8 @@ int PaPrecisionKeyword(TParseContext& pc, int line, const char* text, YYSTYPE* p
if (pc.profile == EEsProfile || pc.version >= 130)
return keyword;
if (pc.forwardCompatible && ! (pc.messages & EShMsgSuppressWarnings)) {
pc.infoSink.info.message(EPrefixWarning, text, yylineno);
pc.infoSink.info.message(EPrefixWarning, "using ES precision qualifier keyword", yylineno);
}
if (pc.forwardCompatible)
pc.warn(yylineno, "using ES precision qualifier keyword", text, "");
return PaIdentOrType(text, pc, pyylval);
}
@ -833,10 +825,8 @@ int PaMatNxM(TParseContext& pc, int line, const char* text, YYSTYPE* pyylval, in
if (pc.version > 110)
return keyword;
if (pc.forwardCompatible && ! (pc.messages & EShMsgSuppressWarnings)) {
pc.infoSink.info.message(EPrefixWarning, text, yylineno);
pc.infoSink.info.message(EPrefixWarning, "using future non-square matrix type keyword", yylineno);
}
if (pc.forwardCompatible)
pc.warn(yylineno, "using future non-square matrix type keyword", text, "");
return PaIdentOrType(text, pc, pyylval);
}
@ -855,10 +845,8 @@ int PaDMat(TParseContext& pc, int line, const char* text, YYSTYPE* pyylval, int
if (pc.profile != EEsProfile && pc.version >= 400)
return keyword;
if (pc.forwardCompatible && ! (pc.messages & EShMsgSuppressWarnings)) {
pc.infoSink.info.message(EPrefixWarning, text, yylineno);
pc.infoSink.info.message(EPrefixWarning, "using future type keyword", yylineno);
}
if (pc.forwardCompatible)
pc.warn(yylineno, "using future type keyword", text, "");
return PaIdentOrType(text, pc, pyylval);
}
@ -878,10 +866,8 @@ int Pa1stGenerationImage(TParseContext& pc, int line, const char* text, YYSTYPE*
return keyword;
}
if (pc.forwardCompatible && ! (pc.messages & EShMsgSuppressWarnings)) {
pc.infoSink.info.message(EPrefixWarning, text, yylineno);
pc.infoSink.info.message(EPrefixWarning, "using future type keyword", yylineno);
}
if (pc.forwardCompatible)
pc.warn(yylineno, "using future type keyword", text, "");
return PaIdentOrType(text, pc, pyylval);
}
@ -894,10 +880,8 @@ int Pa2ndGenerationImage(TParseContext& pc, int line, const char* text, YYSTYPE*
if (pc.profile != EEsProfile && pc.version >= 420)
return keyword;
if (pc.forwardCompatible && ! (pc.messages & EShMsgSuppressWarnings)) {
pc.infoSink.info.message(EPrefixWarning, text, yylineno);
pc.infoSink.info.message(EPrefixWarning, "using future type keyword", yylineno);
}
if (pc.forwardCompatible)
pc.warn(yylineno, "using future type keyword", text, "");
return PaIdentOrType(text, pc, pyylval);
}
@ -946,15 +930,14 @@ void ShPpWarningToInfoLog(const char *msg)
{
TParseContext& pc = *((TParseContext *)cpp->pC);
if (! (pc.messages & EShMsgSuppressWarnings))
pc.infoSink.info.message(EPrefixWarning, msg, yylineno);
pc.warn(yylineno, msg, "Preprocessor", "");
}
void ShPpErrorToInfoLog(const char *msg)
{
TParseContext& pc = *((TParseContext *)cpp->pC);
pc.error(yylineno, "", "Preprocessor", msg, "");
pc.error(yylineno, msg, "Preprocessor", "");
}
// return 1 if error
@ -1185,8 +1168,7 @@ void updateExtensionBehavior(const char* extName, const char* behavior)
case EBhEnable:
case EBhWarn:
case EBhDisable:
msg = TString("extension '") + extName + "' is not supported";
pc.infoSink.info.message(EPrefixWarning, msg.c_str(), yylineno);
pc.warn(yylineno, "extension not supported", extName, "");
break;
default:
assert(0 && "unexpected behaviorVal");

8
glslang/MachineIndependent/preprocessor/cpp.c
View File

@ -355,7 +355,7 @@ static int CPPelse(int matchelse, yystypepp * yylvalpp)
// found the #else we are looking for
token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
if (token != '\n') {
ShPpWarningToInfoLog("unexpected tokens following #else preprocessor directive - expected a newline");
ShPpWarningToInfoLog("unexpected tokens following #else directive - expected a newline");
while (token != '\n')
token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
}
@ -558,7 +558,7 @@ static int CPPif(yystypepp * yylvalpp)
}
token = eval(token, MIN_PREC, &res, &err, yylvalpp);
if (token != '\n') {
ShPpWarningToInfoLog("unexpected tokens following the preprocessor directive - expected a newline");
ShPpWarningToInfoLog("unexpected tokens following directive - expected a newline");
while (token != '\n')
token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
}
@ -584,7 +584,7 @@ static int CPPifdef(int defined, yystypepp * yylvalpp)
Symbol *s = LookUpSymbol(macros, name);
token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
if (token != '\n') {
ShPpWarningToInfoLog("unexpected tokens following #ifdef preprocessor directive - expected a newline");
ShPpWarningToInfoLog("unexpected tokens following #ifdef - expected a newline");
while (token != '\n')
token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
}
@ -824,7 +824,7 @@ int readCPPline(yystypepp * yylvalpp)
}
token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
if (token != '\n') {
ShPpWarningToInfoLog("unexpected tokens following #else preprocessor directive - expected a newline");
ShPpWarningToInfoLog("unexpected tokens following #else - expected a newline");
while (token != '\n')
token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
}

3
glslang/Public/ShaderLang.h
View File

@ -232,7 +232,8 @@ enum TDebugOptions {
EDebugOpSuppressInfolog = 0x010,
EDebugOpMemoryLeakMode = 0x020,
EDebugOpTexturePrototypes = 0x040,
EDebugOpRelaxedErrors = 0x080
EDebugOpRelaxedErrors = 0x080,
EDebugOpGiveWarnings = 0x100,
};
#ifdef __cplusplus
}