Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-08 06:09:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #113432 from TheDying0fLight/set-shader-path-before-compiling

Browse source 
Set shader path before compilation
This commit is contained in:
Rémi Verschelde 2025-12-02 14:17:38 +01:00
commit 5f12ada7a4
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
drivers/gles3/storage/material_storage.cpp
View file

@ -2281,6 +2281,7 @@ void MaterialStorage::shader_set_code(RID p_shader, const String &p_code) {
} }
if (shader->data) { if (shader->data) {
shader->data->set_path_hint(shader->path_hint);
shader->data->set_code(p_code); shader->data->set_code(p_code);
} }

2
servers/rendering/rendering_server_default.h
View file

@ -263,8 +263,8 @@ public:
} }
RSG::material_storage->shader_initialize(shader, false); RSG::material_storage->shader_initialize(shader, false);
RSG::material_storage->shader_set_code(shader, p_code);
RSG::material_storage->shader_set_path_hint(shader, p_path_hint); RSG::material_storage->shader_set_path_hint(shader, p_path_hint);
RSG::material_storage->shader_set_code(shader, p_code);
} else { } else {
command_queue.push(RSG::material_storage, &RendererMaterialStorage::shader_initialize, shader, false); command_queue.push(RSG::material_storage, &RendererMaterialStorage::shader_initialize, shader, false);
command_queue.push(RSG::material_storage, &RendererMaterialStorage::shader_set_code, shader, p_code); command_queue.push(RSG::material_storage, &RendererMaterialStorage::shader_set_code, shader, p_code);