From bd39b5580acdc20179efeed50fe1cca383d9157a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=80=D0=B0=D0=BD=D0=B8=D0=BC=D0=B8=D1=80=20=D0=9A?= =?UTF-8?q?=D0=B0=D1=80=D0=B0=D1=9F=D0=B8=D1=9B?= Date: Wed, 24 Jul 2019 20:12:07 -0700 Subject: [PATCH] Cleanup. --- tools/shaderc/shaderc_spirv.cpp | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/tools/shaderc/shaderc_spirv.cpp b/tools/shaderc/shaderc_spirv.cpp index 28b4b3005..358c99b8c 100644 --- a/tools/shaderc/shaderc_spirv.cpp +++ b/tools/shaderc/shaderc_spirv.cpp @@ -543,11 +543,6 @@ namespace bgfx { namespace spirv } } -// static void printError(spv_message_level_t, const char*, const spv_position_t&, const char* _message) -// { -// fprintf(stderr, "%s\n", _message); -// } - static const char* s_attribName[] = { "a_position", @@ -628,7 +623,7 @@ namespace bgfx { namespace spirv EShLanguage stage = getLang(_options.shaderType); if (EShLangCount == stage) { - fprintf(stderr, "Error: Unknown shader type '%c'.\n", _options.shaderType); + bx::printf("Error: Unknown shader type '%c'.\n", _options.shaderType); return false; } glslang::TShader* shader = new glslang::TShader(stage); @@ -687,7 +682,7 @@ namespace bgfx { namespace spirv printCode(_code.c_str(), line, start, end, column); - fprintf(stderr, "%s\n", log); + bx::printf("%s\n", log); } } else @@ -703,7 +698,7 @@ namespace bgfx { namespace spirv const char* log = program->getInfoLog(); if (NULL != log) { - fprintf(stderr, "%s\n", log); + bx::printf("%s\n", log); } } else @@ -821,10 +816,16 @@ namespace bgfx { namespace spirv spvtools::Optimizer opt(SPV_ENV_VULKAN_1_0); - auto print_msg_to_stderr = [](spv_message_level_t, const char*, - const spv_position_t&, const char* m) { - fprintf(stderr, "error:%s\n", m); + auto print_msg_to_stderr = []( + spv_message_level_t + , const char* + , const spv_position_t& + , const char* m + ) + { + bx::printf("Error: %s\n", m); }; + opt.SetMessageConsumer(print_msg_to_stderr); opt.RegisterLegalizationPasses();