From e541312851f9722e95e64e84ce345eaed5a26877 Mon Sep 17 00:00:00 2001
From: pheonix <dev@creatingtrouble.com>
Date: Sun, 8 Nov 2020 10:57:03 -0800
Subject: [PATCH] Update g_verbose SpirvToolsDisassemble to output based on
 spirv target env for Metal and SPIRV. (#2306)

Fix up alignment in shaderc help string.
---
 tools/shaderc/shaderc.cpp       | 2 +-
 tools/shaderc/shaderc_metal.cpp | 2 +-
 tools/shaderc/shaderc_spirv.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/shaderc/shaderc.cpp b/tools/shaderc/shaderc.cpp
index 59722d1a6..2eff8fab7 100644
--- a/tools/shaderc/shaderc.cpp
+++ b/tools/shaderc/shaderc.cpp
@@ -903,7 +903,7 @@ namespace bgfx
 				"           s_5\n"
 				"           metal\n"
 				"           pssl\n"
-				"           spirv              Alias for spirv10-10. \n"
+				"           spirv                Alias for spirv10-10. \n"
 				"           spirv10-10\n"
 				"           spirv13-11\n"
 				"           spirv14-11\n"
diff --git a/tools/shaderc/shaderc_metal.cpp b/tools/shaderc/shaderc_metal.cpp
index 7540e70b5..1b640a5dd 100644
--- a/tools/shaderc/shaderc_metal.cpp
+++ b/tools/shaderc/shaderc_metal.cpp
@@ -909,7 +909,7 @@ namespace bgfx { namespace metal
 					{
 						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) );
diff --git a/tools/shaderc/shaderc_spirv.cpp b/tools/shaderc/shaderc_spirv.cpp
index dd321a55d..9d8654eb3 100644
--- a/tools/shaderc/shaderc_spirv.cpp
+++ b/tools/shaderc/shaderc_spirv.cpp
@@ -1041,7 +1041,7 @@ namespace bgfx { namespace spirv
 
 					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: