godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #81381 from bitsawer/fix_shader_include_markers

Browse Source 
Fix shader language preprocessor include marker handling
This commit is contained in:
Rémi Verschelde 2023-09-26 08:19:40 +02:00
commit e25408df4b
No known key found for this signature in database
GPG Key ID: C3336907360768E1
3 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
servers/rendering/shader_language.cpp
View File

@ -610,19 +610,39 @@ ShaderLanguage::Token ShaderLanguage::_get_token() {
incp.push_back(0); // Zero end it. incp.push_back(0); // Zero end it.
String include_path(incp.ptr()); String include_path(incp.ptr());
include_positions.write[include_positions.size() - 1].line = tk_line; include_positions.write[include_positions.size() - 1].line = tk_line;
FilePosition fp;
fp.file = include_path; String marker = ">>" + include_path;
fp.line = 0; if (!include_markers_handled.has(marker)) {
tk_line = 0; include_markers_handled.insert(marker);
include_positions.push_back(fp);
FilePosition fp;
fp.file = include_path;
fp.line = 0;
tk_line = 0;
include_positions.push_back(fp);
}
} else if (GETCHAR(0) == '@' && GETCHAR(1) == '<') { } else if (GETCHAR(0) == '@' && GETCHAR(1) == '<') {
if (include_positions.size() == 1) {
return _make_token(TK_ERROR, "Invalid include exit hint @@< without matching enter hint.");
}
char_idx += 2; char_idx += 2;
include_positions.resize(include_positions.size() - 1); // Pop back. LocalVector<char32_t> incp;
while (GETCHAR(0) != '\n') {
incp.push_back(GETCHAR(0));
char_idx++;
}
incp.push_back(0); // Zero end it.
String include_path(incp.ptr());
String marker = "<<" + include_path;
if (!include_markers_handled.has(marker)) {
include_markers_handled.insert(marker);
if (include_positions.size() == 1) {
return _make_token(TK_ERROR, "Invalid include exit hint @@< without matching enter hint.");
}
include_positions.resize(include_positions.size() - 1); // Pop back.
}
tk_line = include_positions[include_positions.size() - 1].line - 1; // Restore line. tk_line = include_positions[include_positions.size() - 1].line - 1; // Restore line.
} else { } else {
@ -1217,6 +1237,8 @@ void ShaderLanguage::clear() {
include_positions.clear(); include_positions.clear();
include_positions.push_back(FilePosition()); include_positions.push_back(FilePosition());
include_markers_handled.clear();
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
keyword_completion_context = CF_UNSPECIFIED; keyword_completion_context = CF_UNSPECIFIED;
used_constants.clear(); used_constants.clear();

1
servers/rendering/shader_language.h
View File

@ -910,6 +910,7 @@ private:
int error_line = 0; int error_line = 0;
Vector<FilePosition> include_positions; Vector<FilePosition> include_positions;
HashSet<String> include_markers_handled;
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
struct Usage { struct Usage {

2
servers/rendering/shader_preprocessor.cpp
View File

@ -747,7 +747,7 @@ void ShaderPreprocessor::process_include(Tokenizer *p_tokenizer) {
processor.preprocess(state, included, result); processor.preprocess(state, included, result);
add_to_output("@@>" + real_path + "\n"); // Add token for enter include path add_to_output("@@>" + real_path + "\n"); // Add token for enter include path
add_to_output(result); add_to_output(result);
add_to_output("\n@@<\n"); // Add token for exit include path add_to_output("\n@@<" + real_path + "\n"); // Add token for exit include path.
// Reset to last include if there are no errors. We want to use this as context. // Reset to last include if there are no errors. We want to use this as context.
if (state->error.is_empty()) { if (state->error.is_empty()) {