Merge pull request #56563 from V-Sekai/dirty_material

Fix queueing a texture and regular uniform update in RD backend
This commit is contained in:
Clay John 2022-01-06 09:41:29 -08:00 committed by GitHub
commit 1dee3e0cc7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1639,14 +1639,14 @@ void RendererStorageRD::material_initialize(RID p_rid) {
} }
void RendererStorageRD::_material_queue_update(Material *material, bool p_uniform, bool p_texture) { void RendererStorageRD::_material_queue_update(Material *material, bool p_uniform, bool p_texture) {
material->uniform_dirty = material->uniform_dirty || p_uniform;
material->texture_dirty = material->texture_dirty || p_texture;
if (material->update_element.in_list()) { if (material->update_element.in_list()) {
return; return;
} }
material_update_list.add(&material->update_element); material_update_list.add(&material->update_element);
material->uniform_dirty = material->uniform_dirty || p_uniform;
material->texture_dirty = material->texture_dirty || p_texture;
} }
void RendererStorageRD::material_set_shader(RID p_material, RID p_shader) { void RendererStorageRD::material_set_shader(RID p_material, RID p_shader) {