[lunarglass] r1096 committed - LunarGOO standalone: Fix bug that was dropping compilation message mod...

[lunar...@googlecode.com]

Revision: 1096
Author: jo...@lunarg.com
Date: Fri Jul 17 23:48:54 2015 UTC
Log: LunarGOO standalone: Fix bug that was dropping compilation
message modes. E.g., preserve request for relaxed error checking.
https://code.google.com/p/lunarglass/source/detail?r=1096

Modified:
/trunk/Standalone/main.cpp

=======================================
--- /trunk/Standalone/main.cpp Fri May 29 17:20:42 2015 UTC
+++ /trunk/Standalone/main.cpp Fri Jul 17 23:48:54 2015 UTC
@@ -383,6 +383,7 @@

void SetMessageOptions(EShMessages& messages)
{
+ messages = EShMsgDefault;
if (Options & EOptionRelaxedErrors)
messages = (EShMessages)(messages | EShMsgRelaxedErrors);
if (Options & EOptionIntermediate)
@@ -518,18 +519,13 @@
if (! data)
return false;

- EShMessages messages = EShMsgDefault;
- if (! (Options & EDebugOpGiveWarnings))
- messages = (EShMessages)(messages | EShMsgSuppressWarnings);
- if (Options & EDebugOpRelaxedErrors)
- messages = (EShMessages)(messages | EShMsgRelaxedErrors);
-
- for (int i = 0; i < ((Options & EDebugOpMemoryLeakMode) ? 100 : 1);
++i) {
- for (int j = 0; j < ((Options & EDebugOpMemoryLeakMode) ? 100 :
1); ++j)
- ret = ShCompile(compiler, data, 1, 0, EShOptNone, resources,
Options, 100, false, EShMsgDefault);
+ SetMessageOptions(Messages);
+ for (int i = 0; i < ((Options & EOptionMemoryLeakMode) ? 100 : 1);
++i) {
+ for (int j = 0; j < ((Options & EOptionMemoryLeakMode) ? 100 : 1);
++j)
+ ret = ShCompile(compiler, data, 1, 0, EShOptNone, resources,
Options, 100, false, Messages);

#ifdef _WIN32
- if (Options & EDebugOpMemoryLeakMode) {
+ if (Options & EOptionMemoryLeakMode) {
GetProcessMemoryInfo(GetCurrentProcess(), &counters,
sizeof(counters));
printf("Working set size: %d\n", counters.WorkingSetSize);
}
@@ -544,7 +540,7 @@
#endif

TBuiltInResource Resources;
-EShMessages Messages;
+EShMessages Messages = EShMsgDefault;
const int substitutionLevel = 1;

//
@@ -854,8 +850,7 @@

void TranslateShaders(const std::vector<const char*>& names)
{
- EShMessages messages = EShMsgDefault;
- SetMessageOptions(messages);
+ SetMessageOptions(Messages);

if (Options & EOptionMultiThreaded)
TranslateShadersMultithreaded(names);