Have memory counters normally turned off, to avoid cross-windows-platform linking...

git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@28078 e7fa87d3-cd2b-0410-9028-fcbf551c1848

diff --git a/BIL/BilDoc.cpp b/BIL/BilDoc.cpp
index 036a6cd..caa37f8 100644 (file)
--- a/BIL/BilDoc.cpp
+++ b/BIL/BilDoc.cpp
@@ -42,24 +42,24 @@
 \r
 #include "BilDoc.h"\r
 \r
-#if ! defined(INCLUDE_BIL_DOC)\r
-\r
 namespace glbil {\r
 \r
-    void PrintDoc()\r
-    {\r
-    }\r
+#if ! defined(INCLUDE_BIL_DOC)\r
 \r
-}; // end glbil namespace\r
+void Parameterize()\r
+{\r
+}\r
 \r
-#else\r
+void PrintDoc()\r
+{\r
+}\r
 \r
-namespace glbil {\r
+#else\r
 \r
 void PrintDoc()\r
 {\r
 }\r
 \r
-}; // end glbil namespace\r
-\r
 #endif\r
+\r
+}; // end glbil namespace\r

diff --git a/BIL/BilDoc.h b/BIL/BilDoc.h
index 4e3e787..6d87a89 100644 (file)
--- a/BIL/BilDoc.h
+++ b/BIL/BilDoc.h
@@ -44,6 +44,7 @@
 \r
 namespace glbil {\r
 \r
+    void Parameterize();\r
     void PrintDoc();\r
 \r
 };  // end glbil namespace\r

diff --git a/BIL/GLSL450Lib.h b/BIL/GLSL450Lib.h
new file mode 100644 (file)
index 0000000..92ad0ed
--- /dev/null
+++ b/BIL/GLSL450Lib.h
@@ -0,0 +1,14 @@
+namespace GLSL_STD_450 {\r
+\r
+enum Entrypoints {\r
+    Round,\r
+    Count\r
+};\r
+\r
+extern const char* Names[Count];\r
+\r
+inline void Initialize()\r
+{\r
+}\r
+\r
+}; // end namespace GLSL_STD_450\r

diff --git a/StandAlone/StandAlone.cpp b/StandAlone/StandAlone.cpp
index 3ee056f..55e557c 100644 (file)
--- 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 <string.h>
 #include <stdlib.h>
 #include <math.h>
@@ -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 4c6caf0..4566114 100644 (file)
--- 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