Commit cf74ae1b by John Kessenich

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

parent 01fd50e4
...@@ -42,24 +42,24 @@ ...@@ -42,24 +42,24 @@
#include "BilDoc.h" #include "BilDoc.h"
#if ! defined(INCLUDE_BIL_DOC)
namespace glbil { namespace glbil {
void PrintDoc() #if ! defined(INCLUDE_BIL_DOC)
{
}
}; // end glbil namespace void Parameterize()
{
}
#else void PrintDoc()
{
}
namespace glbil { #else
void PrintDoc() void PrintDoc()
{ {
} }
}; // end glbil namespace
#endif #endif
}; // end glbil namespace
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
namespace glbil { namespace glbil {
void Parameterize();
void PrintDoc(); void PrintDoc();
}; // end glbil namespace }; // end glbil namespace
namespace GLSL_STD_450 {
enum Entrypoints {
Round,
Count
};
extern const char* Names[Count];
inline void Initialize()
{
}
}; // end namespace GLSL_STD_450
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
#include "../BIL/GlslangToBil.h" #include "../BIL/GlslangToBil.h"
#include "../BIL/BilDisassemble.h" #include "../BIL/BilDisassemble.h"
#include "../BIL/BilDoc.h" #include "../BIL/BilDoc.h"
#include "../BIL/GLSL450Lib.h"
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <math.h> #include <math.h>
...@@ -711,6 +712,7 @@ int C_DECL main(int argc, char* argv[]) ...@@ -711,6 +712,7 @@ int C_DECL main(int argc, char* argv[])
// //
if (Options & EOptionLinkProgram) { if (Options & EOptionLinkProgram) {
glslang::InitializeProcess(); glslang::InitializeProcess();
GLSL_STD_450::Initialize();
CompileAndLinkShaders(); CompileAndLinkShaders();
glslang::FinalizeProcess(); glslang::FinalizeProcess();
} else { } else {
......
...@@ -134,9 +134,13 @@ void OS_Sleep(int milliseconds) ...@@ -134,9 +134,13 @@ void OS_Sleep(int milliseconds)
void OS_DumpMemoryCounters() void OS_DumpMemoryCounters()
{ {
#ifdef DUMP_COUNTERS
PROCESS_MEMORY_COUNTERS counters; PROCESS_MEMORY_COUNTERS counters;
GetProcessMemoryInfo(GetCurrentProcess(), &counters, sizeof(counters)); GetProcessMemoryInfo(GetCurrentProcess(), &counters, sizeof(counters));
printf("Working set size: %d\n", counters.WorkingSetSize); printf("Working set size: %d\n", counters.WorkingSetSize);
#else
printf("Recompile with DUMP_COUNTERS defined to see counters.\n");
#endif
} }
} // namespace glslang } // namespace glslang
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment