godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Fix default_texture_param in shader pipeline to support uniform arrays

Browse Source
This commit is contained in:
Yuri Roubinsky
2021-10-17 14:38:26 +03:00
parent 13769aebe9
commit 826e781bfa
28 changed files with 199 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
servers/rendering/renderer_rd/renderer_canvas_render_rd.cpp
View File

@@ -2120,11 +2120,20 @@ void RendererCanvasRenderRD::ShaderData::set_code(const String &p_code) {
valid = true;
}
void RendererCanvasRenderRD::ShaderData::set_default_texture_param(const StringName &p_name, RID p_texture) {
void RendererCanvasRenderRD::ShaderData::set_default_texture_param(const StringName &p_name, RID p_texture, int p_index) {
if (!p_texture.is_valid()) {
default_texture_params.erase(p_name);
if (default_texture_params.has(p_name) && default_texture_params[p_name].has(p_index)) {
default_texture_params[p_name].erase(p_index);
if (default_texture_params[p_name].is_empty()) {
default_texture_params.erase(p_name);
}
}
} else {
default_texture_params[p_name] = p_texture;
if (!default_texture_params.has(p_name)) {
default_texture_params[p_name] = Map<int, RID>();
}
default_texture_params[p_name][p_index] = p_texture;
}
}