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

Removed tabs and replaced with spaces. Changed layout for "else if"

Browse Source
This commit is contained in:
Flavio
2017-02-15 14:29:33 -08:00
parent aea3c890d3
commit 15017db971
2 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
SPIRV/GlslangToSpv.cpp
View File

@@ -5259,10 +5259,10 @@ void OutputSpvHex(const std::vector<unsigned int>& spirv, const char* baseName,
std::ofstream out; std::ofstream out;
out.open(baseName, std::ios::binary | std::ios::out); out.open(baseName, std::ios::binary | std::ios::out);
out << "\t// " GLSLANG_REVISION " " GLSLANG_DATE << std::endl; out << "\t// " GLSLANG_REVISION " " GLSLANG_DATE << std::endl;
if (varName != nullptr) { if (varName != nullptr) {
out << "\t #pragma once" << std::endl; out << "\t #pragma once" << std::endl;
out << "const uint32_t " << varName << "[] = {" << std::endl; out << "const uint32_t " << varName << "[] = {" << std::endl;
} }
const int WORDS_PER_LINE = 8; const int WORDS_PER_LINE = 8;
for (int i = 0; i < (int)spirv.size(); i += WORDS_PER_LINE) { for (int i = 0; i < (int)spirv.size(); i += WORDS_PER_LINE) {
out << "\t"; out << "\t";
@@ -5275,9 +5275,9 @@ void OutputSpvHex(const std::vector<unsigned int>& spirv, const char* baseName,
} }
out << std::endl; out << std::endl;
} }
if (varName != nullptr) { if (varName != nullptr) {
out << "};"; out << "};";
} }
out.close(); out.close();
} }

26
StandAlone/StandAlone.cpp
View File

@@ -303,20 +303,18 @@ void ProcessArguments(int argc, char* argv[])
} else if (lowerword == "no-storage-format" || // synonyms } else if (lowerword == "no-storage-format" || // synonyms
lowerword == "nsf") { lowerword == "nsf") {
Options |= EOptionNoStorageFormat; Options |= EOptionNoStorageFormat;
} } else if (lowerword == "variable-name" || // synonyms
else if (lowerword == "variable-name" || // synonyms lowerword == "vn") {
lowerword == "vn") { Options |= EOptionOutputHexadecimal;
Options |= EOptionOutputHexadecimal; variableName = argv[1];
variableName = argv[1]; if (argc > 0) {
if (argc > 0) { argc--;
argc--; argv++;
argv++; } else
} Error("no <C-variable-name> provided for --variable-name");
else break;
Error("no <C-variable-name> provided for --variable-name"); }
break; else if (lowerword == "source-entrypoint" || // synonyms
}
else if (lowerword == "source-entrypoint" || // synonyms
lowerword == "sep") { lowerword == "sep") {
sourceEntryPointName = argv[1]; sourceEntryPointName = argv[1];
if (argc > 0) { if (argc > 0) {