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

Minor change in command-line options.

Browse Source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@27840 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich
2014-08-25 20:07:55 +00:00
parent 777cb2bfd8
commit d78e3512ac
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
StandAlone/StandAlone.cpp
View File

@@ -60,7 +60,7 @@ enum TOptions {
EOptionMemoryLeakMode = 0x004, EOptionMemoryLeakMode = 0x004,
EOptionRelaxedErrors = 0x008, EOptionRelaxedErrors = 0x008,
EOptionGiveWarnings = 0x010, EOptionGiveWarnings = 0x010,
EOptionsLinkProgram = 0x020, EOptionLinkProgram = 0x020,
EOptionMultiThreaded = 0x040, EOptionMultiThreaded = 0x040,
EOptionDumpConfig = 0x080, EOptionDumpConfig = 0x080,
EOptionDumpReflection = 0x100, EOptionDumpReflection = 0x100,
@@ -481,6 +481,7 @@ bool ProcessArguments(int argc, char* argv[])
switch (argv[0][1]) { switch (argv[0][1]) {
case 'b': case 'b':
Options |= EOptionBil; Options |= EOptionBil;
Options |= EOptionLinkProgram;
break; break;
case 'c': case 'c':
Options |= EOptionDumpConfig; Options |= EOptionDumpConfig;
@@ -492,7 +493,7 @@ bool ProcessArguments(int argc, char* argv[])
Options |= EOptionIntermediate; Options |= EOptionIntermediate;
break; break;
case 'l': case 'l':
Options |= EOptionsLinkProgram; Options |= EOptionLinkProgram;
break; break;
case 'm': case 'm':
Options |= EOptionMemoryLeakMode; Options |= EOptionMemoryLeakMode;
@@ -701,7 +702,7 @@ int C_DECL main(int argc, char* argv[])
// 1) linking all arguments together, single-threaded, new C++ interface // 1) linking all arguments together, single-threaded, new C++ interface
// 2) independent arguments, can be tackled by multiple asynchronous threads, for testing thread safety, using the old handle interface // 2) independent arguments, can be tackled by multiple asynchronous threads, for testing thread safety, using the old handle interface
// //
if (Options & EOptionsLinkProgram) { if (Options & EOptionLinkProgram) {
glslang::InitializeProcess(); glslang::InitializeProcess();
CompileAndLinkShaders(); CompileAndLinkShaders();
glslang::FinalizeProcess(); glslang::FinalizeProcess();