shaderc: Show correct error line.

bkaradzic · bkaradzic · commit f6baa4bdaf7d · 2024-11-25T19:39:17.000-08:00
diff --git a/makefile b/makefile
@@ -209,7 +209,7 @@ BUILD_TOOLS_SUFFIX=Release
 EXE=
 else
 OS=linux
-BUILD_PROJECT_DIR=gmake-linux
+BUILD_PROJECT_DIR=gmake-linux-gcc
 BUILD_OUTPUT_DIR=linux64_gcc
 BUILD_TOOLS_CONFIG=release64
 BUILD_TOOLS_SUFFIX=Release
diff --git a/tools/shaderc/shaderc_metal.cpp b/tools/shaderc/shaderc_metal.cpp
@@ -427,7 +427,7 @@ namespace bgfx { namespace metal
 					end   = start + 20;
 				}
 
-				printCode(_code.c_str(), line, start, end, column);
+				printCode(_code.c_str(), bx::uint32_satsub(line, 1), start, end, column);
 
 				bx::write(_messageWriter, &messageErr, "%s\n", log);
 			}
diff --git a/tools/shaderc/shaderc_spirv.cpp b/tools/shaderc/shaderc_spirv.cpp
@@ -528,7 +528,7 @@ namespace bgfx { namespace spirv
 					end   = start + 20;
 				}
 
-				printCode(_code.c_str(), line, start, end, column);
+				printCode(_code.c_str(), bx::uint32_satsub(line, 1), start, end, column);
 
 				bx::write(_messageWriter, &messageErr, "%s\n", log);
 			}

Original file line number	Diff line number	Diff line change
`@@ -427,7 +427,7 @@ namespace bgfx { namespace metal`
`427`	`427`	`end = start + 20;`
`428`	`428`	`}`
`429`	`429`
`430`		`- printCode(_code.c_str(), line, start, end, column);`
	`430`	`+ printCode(_code.c_str(), bx::uint32_satsub(line, 1), start, end, column);`
`431`	`431`
`432`	`432`	`bx::write(_messageWriter, &messageErr, "%s\n", log);`
`433`	`433`	`}`
Original file line number	Diff line number	Diff line change
`@@ -528,7 +528,7 @@ namespace bgfx { namespace spirv`
`528`	`528`	`end = start + 20;`
`529`	`529`	`}`
`530`	`530`
`531`		`- printCode(_code.c_str(), line, start, end, column);`
	`531`	`+ printCode(_code.c_str(), bx::uint32_satsub(line, 1), start, end, column);`
`532`	`532`
`533`	`533`	`bx::write(_messageWriter, &messageErr, "%s\n", log);`
`534`	`534`	`}`