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

Merge pull request #175 from rdb/master

Browse Source 
Fix compilation issues with MSVC 2010
This commit is contained in:
John Kessenich
2016-02-27 21:29:14 -07:00
parent ced70f4e28 32084e889d
commit 52d08596ec
8 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
StandAlone/StandAlone.cpp
View File

@@ -689,7 +689,8 @@ void CompileAndLinkShaderUnits(std::vector<ShaderCompUnit> compUnits)
//
glslang::TProgram& program = *new glslang::TProgram;
for (auto compUnit : compUnits) {
for (auto it = compUnits.cbegin(); it != compUnits.cend(); ++it) {
const auto &compUnit = *it;
glslang::TShader* shader = new glslang::TShader(compUnit.stage);
shader->setStrings(compUnit.text, 1);
shaders.push_back(shader);
@@ -821,8 +822,8 @@ void CompileAndLinkShaderFiles()
glslang::OS_DumpMemoryCounters();
}
for (auto c : compUnits)
FreeFileData(c.text);
for (auto it = compUnits.begin(); it != compUnits.end(); ++it)
FreeFileData(it->text);
}
int C_DECL main(int argc, char* argv[])