diff --git a/BIL/BilDoc.cpp b/BIL/BilDoc.cpp index 036a6cd7..caa37f82 100644 --- a/BIL/BilDoc.cpp +++ b/BIL/BilDoc.cpp @@ -42,24 +42,24 @@ #include "BilDoc.h" +namespace glbil { + #if ! defined(INCLUDE_BIL_DOC) -namespace glbil { - - void PrintDoc() - { - } - -}; // end glbil namespace - -#else - -namespace glbil { +void Parameterize() +{ +} void PrintDoc() { } -}; // end glbil namespace +#else + +void PrintDoc() +{ +} #endif + +}; // end glbil namespace diff --git a/BIL/BilDoc.h b/BIL/BilDoc.h index 4e3e7875..6d87a897 100644 --- a/BIL/BilDoc.h +++ b/BIL/BilDoc.h @@ -44,6 +44,7 @@ namespace glbil { + void Parameterize(); void PrintDoc(); }; // end glbil namespace diff --git a/BIL/GLSL450Lib.h b/BIL/GLSL450Lib.h new file mode 100644 index 00000000..92ad0ede --- /dev/null +++ b/BIL/GLSL450Lib.h @@ -0,0 +1,14 @@ +namespace GLSL_STD_450 { + +enum Entrypoints { + Round, + Count +}; + +extern const char* Names[Count]; + +inline void Initialize() +{ +} + +}; // end namespace GLSL_STD_450 diff --git a/StandAlone/StandAlone.cpp b/StandAlone/StandAlone.cpp index 3ee056fd..55e557cc 100644 --- a/StandAlone/StandAlone.cpp +++ b/StandAlone/StandAlone.cpp @@ -43,6 +43,7 @@ #include "../BIL/GlslangToBil.h" #include "../BIL/BilDisassemble.h" #include "../BIL/BilDoc.h" +#include "../BIL/GLSL450Lib.h" #include #include #include @@ -711,6 +712,7 @@ int C_DECL main(int argc, char* argv[]) // if (Options & EOptionLinkProgram) { glslang::InitializeProcess(); + GLSL_STD_450::Initialize(); CompileAndLinkShaders(); glslang::FinalizeProcess(); } else { diff --git a/glslang/OSDependent/Windows/ossource.cpp b/glslang/OSDependent/Windows/ossource.cpp index 4c6caf0d..45661145 100644 --- a/glslang/OSDependent/Windows/ossource.cpp +++ b/glslang/OSDependent/Windows/ossource.cpp @@ -134,9 +134,13 @@ void OS_Sleep(int milliseconds) void OS_DumpMemoryCounters() { +#ifdef DUMP_COUNTERS PROCESS_MEMORY_COUNTERS counters; GetProcessMemoryInfo(GetCurrentProcess(), &counters, sizeof(counters)); printf("Working set size: %d\n", counters.WorkingSetSize); +#else + printf("Recompile with DUMP_COUNTERS defined to see counters.\n"); +#endif } } // namespace glslang