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

Merge pull request #285 from baldurk/vs2010-fixes

Browse Source 
VS2010 compilation fixes
This commit is contained in:
John Kessenich
2016-05-17 00:31:36 -06:00
parent ebb505355d 6b32ae18fa
commit bedde872b6
4 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
SPIRV/Logger.cpp
View File

@@ -54,14 +54,14 @@ void SpvBuildLogger::missingFunctionality(const std::string& f)
std::string SpvBuildLogger::getAllMessages() const {
std::ostringstream messages;
for (const auto& f : tbdFeatures)
messages << "TBD functionality: " << f << "\n";
for (const auto& f : missingFeatures)
messages << "Missing functionality: " << f << "\n";
for (const auto& w : warnings)
messages << "warning: " << w << "\n";
for (const auto& e : errors)
messages << "error: " << e << "\n";
for (auto it = tbdFeatures.cbegin(); it != tbdFeatures.cend(); ++it)
messages << "TBD functionality: " << *it << "\n";
for (auto it = missingFeatures.cbegin(); it != missingFeatures.cend(); ++it)
messages << "Missing functionality: " << *it << "\n";
for (auto it = warnings.cbegin(); it != warnings.cend(); ++it)
messages << "warning: " << *it << "\n";
for (auto it = errors.cbegin(); it != errors.cend(); ++it)
messages << "error: " << *it << "\n";
return messages.str();
}

5
SPIRV/Logger.h
View File

@@ -44,8 +44,7 @@ namespace spv {
// missing/TBD functionalities, warnings, and errors.
class SpvBuildLogger {
public:
SpvBuildLogger() = default;
SpvBuildLogger(const SpvBuildLogger&) = delete;
SpvBuildLogger() {}
// Registers a TBD functionality.
void tbdFunctionality(const std::string& f);
@@ -62,6 +61,8 @@ public:
std::string getAllMessages() const;
private:
SpvBuildLogger(const SpvBuildLogger&);
std::vector<std::string> tbdFeatures;
std::vector<std::string> missingFeatures;
std::vector<std::string> warnings;