diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-01-18 11:15:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-18 11:15:44 +0100 |
| commit | 6384dd8f2ca80b47e3b7d426906ec5a8bb2c93da (patch) | |
| tree | b1ac15c6d0e6810b91247c313c87c36a7a30246b | |
| parent | 7b443073d434dc6b82a7f78411d0a26ba8f02246 (diff) | |
| parent | a285a1cfdfd85d2be27c6d6a7895298f906865c2 (diff) | |
Merge pull request #25070 from RedMser/shader_errors_linefix
Fix shader compile error line numbers starting at 0
| -rw-r--r-- | drivers/gles2/shader_compiler_gles2.cpp | 2 | ||||
| -rw-r--r-- | drivers/gles3/shader_compiler_gles3.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gles2/shader_compiler_gles2.cpp b/drivers/gles2/shader_compiler_gles2.cpp index f0a8ceb8c5..bff031b93a 100644 --- a/drivers/gles2/shader_compiler_gles2.cpp +++ b/drivers/gles2/shader_compiler_gles2.cpp @@ -737,7 +737,7 @@ Error ShaderCompilerGLES2::compile(VS::ShaderMode p_mode, const String &p_code, Vector<String> shader = p_code.split("\n"); for (int i = 0; i < shader.size(); i++) { - print_line(itos(i) + " " + shader[i]); + print_line(itos(i + 1) + " " + shader[i]); } _err_print_error(NULL, p_path.utf8().get_data(), parser.get_error_line(), parser.get_error_text().utf8().get_data(), ERR_HANDLER_SHADER); diff --git a/drivers/gles3/shader_compiler_gles3.cpp b/drivers/gles3/shader_compiler_gles3.cpp index 56446b33ff..cda6dac506 100644 --- a/drivers/gles3/shader_compiler_gles3.cpp +++ b/drivers/gles3/shader_compiler_gles3.cpp @@ -748,7 +748,7 @@ Error ShaderCompilerGLES3::compile(VS::ShaderMode p_mode, const String &p_code, Vector<String> shader = p_code.split("\n"); for (int i = 0; i < shader.size(); i++) { - print_line(itos(i) + " " + shader[i]); + print_line(itos(i + 1) + " " + shader[i]); } _err_print_error(NULL, p_path.utf8().get_data(), parser.get_error_line(), parser.get_error_text().utf8().get_data(), ERR_HANDLER_SHADER); |