Update g_verbose SpirvToolsDisassemble to output based on spirv target env for Metal and SPIRV. (#2306)

Fix up alignment in shaderc help string.
This commit is contained in:
pheonix 2020-11-08 10:57:03 -08:00 committed by GitHub
parent 4a5eb7a2ef
commit e541312851
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions

View File

@ -903,7 +903,7 @@ namespace bgfx
" s_5\n" " s_5\n"
" metal\n" " metal\n"
" pssl\n" " pssl\n"
" spirv Alias for spirv10-10. \n" " spirv Alias for spirv10-10. \n"
" spirv10-10\n" " spirv10-10\n"
" spirv13-11\n" " spirv13-11\n"
" spirv14-11\n" " spirv14-11\n"

View File

@ -909,7 +909,7 @@ namespace bgfx { namespace metal
{ {
if (g_verbose) if (g_verbose)
{ {
glslang::SpirvToolsDisassemble(std::cout, spirv); glslang::SpirvToolsDisassemble(std::cout, spirv, SPV_ENV_VULKAN_1_0);
} }
spirv_cross::CompilerMSL msl(std::move(spirv) ); spirv_cross::CompilerMSL msl(std::move(spirv) );

View File

@ -1041,7 +1041,7 @@ namespace bgfx { namespace spirv
if (g_verbose) if (g_verbose)
{ {
glslang::SpirvToolsDisassemble(std::cout, spirv); glslang::SpirvToolsDisassemble(std::cout, spirv, getSpirvTargetVersion(_version) );
} }
// Loop through the separate_images, and extract the uniform names: // Loop through the separate_images, and extract the uniform names: