diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-01-19 10:10:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-19 10:10:54 +0100 |
| commit | 8b8e858778bbf9e0dad66335f351920332c547de (patch) | |
| tree | 60786c000c2c0d975feb95e86d3ab98c7db1fd71 /drivers/vulkan/rendering_device_vulkan.cpp | |
| parent | 74b110a736c35d7183898b01b2f03db3bb98a5a5 (diff) | |
| parent | 4a1c28460e3d85d2d7505970ce3a6c2e6f404f15 (diff) | |
| download | redot-engine-8b8e858778bbf9e0dad66335f351920332c547de.tar.gz | |
Merge pull request #54489 from briansemrau/texture-delete-update
Diffstat (limited to 'drivers/vulkan/rendering_device_vulkan.cpp')
| -rw-r--r-- | drivers/vulkan/rendering_device_vulkan.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/vulkan/rendering_device_vulkan.cpp b/drivers/vulkan/rendering_device_vulkan.cpp index 4d742a36d9..c6592b300b 100644 --- a/drivers/vulkan/rendering_device_vulkan.cpp +++ b/drivers/vulkan/rendering_device_vulkan.cpp @@ -8372,11 +8372,11 @@ void RenderingDeviceVulkan::_free_internal(RID p_id) { } else if (uniform_set_owner.owns(p_id)) { UniformSet *uniform_set = uniform_set_owner.get_or_null(p_id); frames[frame].uniform_sets_to_dispose_of.push_back(*uniform_set); + uniform_set_owner.free(p_id); + if (uniform_set->invalidated_callback != nullptr) { - uniform_set->invalidated_callback(p_id, uniform_set->invalidated_callback_userdata); + uniform_set->invalidated_callback(uniform_set->invalidated_callback_userdata); } - - uniform_set_owner.free(p_id); } else if (render_pipeline_owner.owns(p_id)) { RenderPipeline *pipeline = render_pipeline_owner.get_or_null(p_id); frames[frame].render_pipelines_to_dispose_of.push_back(*pipeline); |