AuroraMiddleware/glslang
1
0
Fork 0
mirror of https://github.com/KhronosGroup/glslang synced 2024-09-19 20:29:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use our own SPIRV-Tools message stringifier

Browse Source 
Stop including an internal SPIRV-Tools header. It has been
deleted.

Fixes #1477
This commit is contained in:
David Neto 2018-08-20 10:36:27 -04:00
parent 93dbbdee36
commit 9fd2a8cdfc
1 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
SPIRV/GlslangToSpv.cpp
View File

@ -56,7 +56,6 @@ namespace spv {
#if ENABLE_OPT #if ENABLE_OPT
#include "spirv-tools/optimizer.hpp" #include "spirv-tools/optimizer.hpp"
#include "message.h"
#endif #endif
#if ENABLE_OPT #if ENABLE_OPT
@ -7032,13 +7031,37 @@ void GlslangToSpv(const glslang::TIntermediate& intermediate, std::vector<unsign
spv_target_env target_env = SPV_ENV_UNIVERSAL_1_2; spv_target_env target_env = SPV_ENV_UNIVERSAL_1_2;
spvtools::Optimizer optimizer(target_env); spvtools::Optimizer optimizer(target_env);
optimizer.SetMessageConsumer([](spv_message_level_t level, optimizer.SetMessageConsumer(
const char* source, [](spv_message_level_t level, const char *source, const spv_position_t &position, const char *message) {
const spv_position_t& position, auto &out = std::cerr;
const char* message) { switch (level)
std::cerr << StringifyMessage(level, source, position, message) {
<< std::endl; case SPV_MSG_FATAL:
}); case SPV_MSG_INTERNAL_ERROR:
case SPV_MSG_ERROR:
out << "error: ";
break;
case SPV_MSG_WARNING:
out << "warning: ";
break;
case SPV_MSG_INFO:
case SPV_MSG_DEBUG:
out << "info: ";
break;
default:
break;
}
if (source)
{
out << source << ":";
}
out << position.line << ":" << position.column << ":" << position.index << ":";
if (message)
{
out << " " << message;
}
out << std::endl;
});
optimizer.RegisterPass(CreateMergeReturnPass()); optimizer.RegisterPass(CreateMergeReturnPass());
optimizer.RegisterPass(CreateInlineExhaustivePass()); optimizer.RegisterPass(CreateInlineExhaustivePass());