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

Memory: Add loop around main, to test tear-down and reuse, and monitor memory changes.

Browse Source
This commit is contained in:
John Kessenich 2017-11-13 01:32:06 -07:00
parent cb42541e51
commit 94f28eb61a
1 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
StandAlone/StandAlone.cpp
View File

@ -127,6 +127,9 @@ void InfoLogMsg(const char* msg, const char* name, const int num);
bool CompileFailed = false; bool CompileFailed = false;
bool LinkFailed = false; bool LinkFailed = false;
// array of unique places to leave the shader names and infologs for the asynchronous compiles
std::vector<std::unique_ptr<glslang::TWorkItem>> WorkItems;
TBuiltInResource Resources; TBuiltInResource Resources;
std::string ConfigFile; std::string ConfigFile;
@ -1022,14 +1025,10 @@ void CompileAndLinkShaderFiles(glslang::TWorklist& Worklist)
FreeFileData(const_cast<char*>(it->text[0])); FreeFileData(const_cast<char*>(it->text[0]));
} }
int C_DECL main(int argc, char* argv[]) int singleMain()
{ {
// array of unique places to leave the shader names and infologs for the asynchronous compiles
std::vector<std::unique_ptr<glslang::TWorkItem>> workItems;
ProcessArguments(workItems, argc, argv);
glslang::TWorklist workList; glslang::TWorklist workList;
std::for_each(workItems.begin(), workItems.end(), [&workList](std::unique_ptr<glslang::TWorkItem>& item) { std::for_each(WorkItems.begin(), WorkItems.end(), [&workList](std::unique_ptr<glslang::TWorkItem>& item) {
assert(item); assert(item);
workList.add(item.get()); workList.add(item.get());
}); });
@ -1061,8 +1060,8 @@ int C_DECL main(int argc, char* argv[])
} }
if (Options & EOptionStdin) { if (Options & EOptionStdin) {
workItems.push_back(std::unique_ptr<glslang::TWorkItem>{new glslang::TWorkItem("stdin")}); WorkItems.push_back(std::unique_ptr<glslang::TWorkItem>{new glslang::TWorkItem("stdin")});
workList.add(workItems.back().get()); workList.add(WorkItems.back().get());
} }
ProcessConfigFile(); ProcessConfigFile();
@ -1100,11 +1099,11 @@ int C_DECL main(int argc, char* argv[])
CompileShaders(workList); CompileShaders(workList);
// Print out all the resulting infologs // Print out all the resulting infologs
for (size_t w = 0; w < workItems.size(); ++w) { for (size_t w = 0; w < WorkItems.size(); ++w) {
if (workItems[w]) { if (WorkItems[w]) {
if (printShaderNames || workItems[w]->results.size() > 0) if (printShaderNames || WorkItems[w]->results.size() > 0)
PutsIfNonEmpty(workItems[w]->name.c_str()); PutsIfNonEmpty(WorkItems[w]->name.c_str());
PutsIfNonEmpty(workItems[w]->results.c_str()); PutsIfNonEmpty(WorkItems[w]->results.c_str());
} }
} }
@ -1119,6 +1118,25 @@ int C_DECL main(int argc, char* argv[])
return 0; return 0;
} }
int C_DECL main(int argc, char* argv[])
{
ProcessArguments(WorkItems, argc, argv);
int ret = 0;
// Loop over the entire init/finalize cycle to watch memory changes
const int iterations = 1;
if (iterations > 1)
glslang::OS_DumpMemoryCounters();
for (int i = 0; i < iterations; ++i) {
ret = singleMain();
if (iterations > 1)
glslang::OS_DumpMemoryCounters();
}
return ret;
}
// //
// Deduce the language from the filename. Files must end in one of the // Deduce the language from the filename. Files must end in one of the
// following extensions: // following extensions: