Have memory counters normally turned off, to avoid cross-windows-platform linking problems.
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
--- 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 4e3e787..6d87a89 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 0000000..92ad0ed
--- /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 3ee056f..55e557c 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 <string.h>
#include <stdlib.h>
#include <math.h>
@@ -711,6 +712,7 @@
//
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
--- a/glslang/OSDependent/Windows/ossource.cpp
+++ b/glslang/OSDependent/Windows/ossource.cpp
@@ -134,9 +134,13 @@
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