summaryrefslogtreecommitdiffstats
path: root/servers/rendering/shader_preprocessor.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'servers/rendering/shader_preprocessor.cpp')
-rw-r--r--servers/rendering/shader_preprocessor.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/servers/rendering/shader_preprocessor.cpp b/servers/rendering/shader_preprocessor.cpp
index 0644f5918c..7af326f779 100644
--- a/servers/rendering/shader_preprocessor.cpp
+++ b/servers/rendering/shader_preprocessor.cpp
@@ -680,7 +680,7 @@ void ShaderPreprocessor::process_include(Tokenizer *p_tokenizer) {
}
if (!ResourceLoader::exists(path)) {
- set_error(RTR("Shader include file does not exist: ") + path, line);
+ set_error(RTR("Shader include file does not exist:") + " " + path, line);
return;
}
@@ -700,7 +700,7 @@ void ShaderPreprocessor::process_include(Tokenizer *p_tokenizer) {
if (!included.is_empty()) {
uint64_t code_hash = included.hash64();
if (state->cyclic_include_hashes.find(code_hash)) {
- set_error(RTR("Cyclic include found."), line);
+ set_error(RTR("Cyclic include found") + ": " + path, line);
return;
}
}
@@ -733,7 +733,7 @@ void ShaderPreprocessor::process_include(Tokenizer *p_tokenizer) {
FilePosition fp;
fp.file = state->current_filename;
- fp.line = line;
+ fp.line = line + 1;
state->include_positions.push_back(fp);
String result;
@@ -1157,6 +1157,7 @@ void ShaderPreprocessor::set_error(const String &p_error, int p_line) {
if (state->error.is_empty()) {
state->error = p_error;
FilePosition fp;
+ fp.file = state->current_filename;
fp.line = p_line + 1;
state->include_positions.push_back(fp);
}