griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

GPU: Preprocessor: Remove disabled code before builtin parsing

Browse Source 
This avoid issues with drw_debug_ prefix being scanned in
disabled code.

Fixes assert in debug builds.

Pull Request: https://projects.blender.org/blender/blender/pulls/147974
This commit is contained in:
Clément Foucault
2025-10-13 14:35:42 +02:00
committed by Clément Foucault
parent 84d99a5902
commit 4ce37852fe
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/gpu/glsl_preprocess/glsl_preprocess.hh
View File

@@ -212,6 +212,9 @@ class Preprocessor {
}
str = remove_comments(str, report_error);
threadgroup_variables_parsing(str);
if (language == BLENDER_GLSL || language == CPP) {
str = disabled_code_mutation(str, report_error);
}
parse_builtins(str, filename);
if (language == BLENDER_GLSL || language == CPP) {
if (do_parse_function) {
@@ -221,7 +224,6 @@ class Preprocessor {
pragma_runtime_generated_parsing(str);
pragma_once_linting(str, filename, report_error);
}
str = disabled_code_mutation(str, report_error);
str = include_parse_and_remove(str, report_error);
str = pragmas_mutation(str, report_error);
str = swizzle_function_mutation(str, report_error);