Skip to content

Commit bfc14a6

Browse files
reduzreduz
authored
Merge pull request #50269 from reduz/fix-reimport-invalidate-material
Fix material invalidation on reimport.
2 parents 5db1f8b + 83addd6 commit bfc14a6

9 files changed

+42
-15
lines changed

‎drivers/vulkan/rendering_device_vulkan.cpp

+11
Original file line numberDiff line numberDiff line change
@@ -5505,6 +5505,13 @@ bool RenderingDeviceVulkan::uniform_set_is_valid(RID p_uniform_set) {
55055505
return uniform_set_owner.owns(p_uniform_set);
55065506
}
55075507

5508+
void RenderingDeviceVulkan::uniform_set_set_invalidation_callback(RID p_uniform_set, UniformSetInvalidatedCallback p_callback, void *p_userdata) {
5509+
UniformSet *us = uniform_set_owner.getornull(p_uniform_set);
5510+
ERR_FAIL_COND(!us);
5511+
us->invalidated_callback = p_callback;
5512+
us->invalidated_callback_userdata = p_userdata;
5513+
}
5514+
55085515
Error RenderingDeviceVulkan::buffer_update(RID p_buffer, uint32_t p_offset, uint32_t p_size, const void *p_data, uint32_t p_post_barrier) {
55095516
_THREAD_SAFE_METHOD_
55105517

@@ -7844,6 +7851,10 @@ void RenderingDeviceVulkan::_free_internal(RID p_id) {
78447851
} else if (uniform_set_owner.owns(p_id)) {
78457852
UniformSet *uniform_set = uniform_set_owner.getornull(p_id);
78467853
frames[frame].uniform_sets_to_dispose_of.push_back(*uniform_set);
7854+
if (uniform_set->invalidated_callback != nullptr) {
7855+
uniform_set->invalidated_callback(p_id, uniform_set->invalidated_callback_userdata);
7856+
}
7857+
78477858
uniform_set_owner.free(p_id);
78487859
} else if (render_pipeline_owner.owns(p_id)) {
78497860
RenderPipeline *pipeline = render_pipeline_owner.getornull(p_id);

‎drivers/vulkan/rendering_device_vulkan.h

+3
Original file line numberDiff line numberDiff line change
@@ -732,6 +732,8 @@ class RenderingDeviceVulkan : public RenderingDevice {
732732
LocalVector<AttachableTexture> attachable_textures; //used for validation
733733
Vector<Texture *> mutable_sampled_textures; //used for layout change
734734
Vector<Texture *> mutable_storage_textures; //used for layout change
735+
UniformSetInvalidatedCallback invalidated_callback = nullptr;
736+
void *invalidated_callback_userdata = nullptr;
735737
};
736738

737739
RID_Owner<UniformSet, true> uniform_set_owner;
@@ -1088,6 +1090,7 @@ class RenderingDeviceVulkan : public RenderingDevice {
10881090

10891091
virtual RID uniform_set_create(const Vector<Uniform> &p_uniforms, RID p_shader, uint32_t p_shader_set);
10901092
virtual bool uniform_set_is_valid(RID p_uniform_set);
1093+
virtual void uniform_set_set_invalidation_callback(RID p_uniform_set, UniformSetInvalidatedCallback p_callback, void *p_userdata);
10911094

10921095
virtual Error buffer_update(RID p_buffer, uint32_t p_offset, uint32_t p_size, const void *p_data, uint32_t p_post_barrier = BARRIER_MASK_ALL); //works for any buffer
10931096
virtual Error buffer_clear(RID p_buffer, uint32_t p_offset, uint32_t p_size, uint32_t p_post_barrier = BARRIER_MASK_ALL);

‎servers/rendering/renderer_rd/forward_clustered/scene_shader_forward_clustered.cpp

+1-3
Original file line numberDiff line numberDiff line change
@@ -442,9 +442,7 @@ bool SceneShaderForwardClustered::MaterialData::update_parameters(const Map<Stri
442442
}
443443

444444
SceneShaderForwardClustered::MaterialData::~MaterialData() {
445-
if (uniform_set.is_valid() && RD::get_singleton()->uniform_set_is_valid(uniform_set)) {
446-
RD::get_singleton()->free(uniform_set);
447-
}
445+
free_parameters_uniform_set(uniform_set);
448446
}
449447

450448
RendererStorageRD::MaterialData *SceneShaderForwardClustered::_create_material_func(ShaderData *p_shader) {

‎servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.cpp

+1-3
Original file line numberDiff line numberDiff line change
@@ -436,9 +436,7 @@ bool SceneShaderForwardMobile::MaterialData::update_parameters(const Map<StringN
436436
}
437437

438438
SceneShaderForwardMobile::MaterialData::~MaterialData() {
439-
if (uniform_set.is_valid() && RD::get_singleton()->uniform_set_is_valid(uniform_set)) {
440-
RD::get_singleton()->free(uniform_set);
441-
}
439+
free_parameters_uniform_set(uniform_set);
442440
}
443441

444442
RendererStorageRD::MaterialData *SceneShaderForwardMobile::_create_material_func(ShaderData *p_shader) {

‎servers/rendering/renderer_rd/renderer_canvas_render_rd.cpp

+1-3
Original file line numberDiff line numberDiff line change
@@ -2208,9 +2208,7 @@ bool RendererCanvasRenderRD::MaterialData::update_parameters(const Map<StringNam
22082208
}
22092209

22102210
RendererCanvasRenderRD::MaterialData::~MaterialData() {
2211-
if (uniform_set.is_valid() && RD::get_singleton()->uniform_set_is_valid(uniform_set)) {
2212-
RD::get_singleton()->free(uniform_set);
2213-
}
2211+
free_parameters_uniform_set(uniform_set);
22142212
}
22152213

22162214
RendererStorageRD::MaterialData *RendererCanvasRenderRD::_create_material_func(ShaderData *p_shader) {

‎servers/rendering/renderer_rd/renderer_scene_sky_rd.cpp

+1-3
Original file line numberDiff line numberDiff line change
@@ -239,9 +239,7 @@ bool RendererSceneSkyRD::SkyMaterialData::update_parameters(const Map<StringName
239239
}
240240

241241
RendererSceneSkyRD::SkyMaterialData::~SkyMaterialData() {
242-
if (uniform_set.is_valid() && RD::get_singleton()->uniform_set_is_valid(uniform_set)) {
243-
RD::get_singleton()->free(uniform_set);
244-
}
242+
free_parameters_uniform_set(uniform_set);
245243
}
246244

247245
////////////////////////////////////////////////////////////////////////////////

‎servers/rendering/renderer_rd/renderer_storage_rd.cpp

+20-3
Original file line numberDiff line numberDiff line change
@@ -2377,6 +2377,13 @@ void RendererStorageRD::MaterialData::update_textures(const Map<StringName, Vari
23772377
}
23782378
}
23792379

2380+
void RendererStorageRD::MaterialData::free_parameters_uniform_set(RID p_uniform_set) {
2381+
if (p_uniform_set.is_valid() && RD::get_singleton()->uniform_set_is_valid(p_uniform_set)) {
2382+
RD::get_singleton()->uniform_set_set_invalidation_callback(p_uniform_set, nullptr, nullptr);
2383+
RD::get_singleton()->free(p_uniform_set);
2384+
}
2385+
}
2386+
23802387
bool RendererStorageRD::MaterialData::update_parameters_uniform_set(const Map<StringName, Variant> &p_parameters, bool p_uniform_dirty, bool p_textures_dirty, const Map<StringName, ShaderLanguage::ShaderNode::Uniform> &p_uniforms, const uint32_t *p_uniform_offsets, const Vector<ShaderCompilerRD::GeneratedCode::Texture> &p_texture_uniforms, const Map<StringName, RID> &p_default_texture_params, uint32_t p_ubo_size, RID &uniform_set, RID p_shader, uint32_t p_shader_uniform_set, uint32_t p_barrier) {
23812388
if ((uint32_t)ubo_data.size() != p_ubo_size) {
23822389
p_uniform_dirty = true;
@@ -2393,6 +2400,7 @@ bool RendererStorageRD::MaterialData::update_parameters_uniform_set(const Map<St
23932400

23942401
//clear previous uniform set
23952402
if (uniform_set.is_valid() && RD::get_singleton()->uniform_set_is_valid(uniform_set)) {
2403+
RD::get_singleton()->uniform_set_set_invalidation_callback(uniform_set, nullptr, nullptr);
23962404
RD::get_singleton()->free(uniform_set);
23972405
uniform_set = RID();
23982406
}
@@ -2412,6 +2420,7 @@ bool RendererStorageRD::MaterialData::update_parameters_uniform_set(const Map<St
24122420

24132421
//clear previous uniform set
24142422
if (uniform_set.is_valid() && RD::get_singleton()->uniform_set_is_valid(uniform_set)) {
2423+
RD::get_singleton()->uniform_set_set_invalidation_callback(uniform_set, nullptr, nullptr);
24152424
RD::get_singleton()->free(uniform_set);
24162425
uniform_set = RID();
24172426
}
@@ -2454,9 +2463,19 @@ bool RendererStorageRD::MaterialData::update_parameters_uniform_set(const Map<St
24542463

24552464
uniform_set = RD::get_singleton()->uniform_set_create(uniforms, p_shader, p_shader_uniform_set);
24562465

2466+
RD::get_singleton()->uniform_set_set_invalidation_callback(uniform_set, _material_uniform_set_erased, &self);
2467+
24572468
return true;
24582469
}
24592470

2471+
void RendererStorageRD::_material_uniform_set_erased(const RID &p_set, void *p_material) {
2472+
RID rid = *(RID *)p_material;
2473+
Material *material = base_singleton->material_owner.getornull(rid);
2474+
if (material) {
2475+
material->dependency.changed_notify(DEPENDENCY_CHANGED_MATERIAL);
2476+
}
2477+
}
2478+
24602479
void RendererStorageRD::material_force_update_textures(RID p_material, ShaderType p_shader_type) {
24612480
Material *material = material_owner.getornull(p_material);
24622481
if (material->shader_type != p_shader_type) {
@@ -5367,9 +5386,7 @@ bool RendererStorageRD::ParticlesMaterialData::update_parameters(const Map<Strin
53675386
}
53685387

53695388
RendererStorageRD::ParticlesMaterialData::~ParticlesMaterialData() {
5370-
if (uniform_set.is_valid() && RD::get_singleton()->uniform_set_is_valid(uniform_set)) {
5371-
RD::get_singleton()->free(uniform_set);
5372-
}
5389+
free_parameters_uniform_set(uniform_set);
53735390
}
53745391

53755392
RendererStorageRD::MaterialData *RendererStorageRD::_create_particles_material_func(ParticlesShaderData *p_shader) {

‎servers/rendering/renderer_rd/renderer_storage_rd.h

+2
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ class RendererStorageRD : public RendererStorage {
160160

161161
//to be used internally by update_parameters, in the most common configuration of material parameters
162162
bool update_parameters_uniform_set(const Map<StringName, Variant> &p_parameters, bool p_uniform_dirty, bool p_textures_dirty, const Map<StringName, ShaderLanguage::ShaderNode::Uniform> &p_uniforms, const uint32_t *p_uniform_offsets, const Vector<ShaderCompilerRD::GeneratedCode::Texture> &p_texture_uniforms, const Map<StringName, RID> &p_default_texture_params, uint32_t p_ubo_size, RID &uniform_set, RID p_shader, uint32_t p_shader_uniform_set, uint32_t p_barrier = RD::BARRIER_MASK_ALL);
163+
void free_parameters_uniform_set(RID p_uniform_set);
163164

164165
private:
165166
friend class RendererStorageRD;
@@ -175,6 +176,7 @@ class RendererStorageRD : public RendererStorage {
175176
Vector<RID> texture_cache;
176177
};
177178
typedef MaterialData *(*MaterialDataRequestFunction)(ShaderData *);
179+
static void _material_uniform_set_erased(const RID &p_set, void *p_material);
178180

179181
enum DefaultRDTexture {
180182
DEFAULT_RD_TEXTURE_WHITE,

‎servers/rendering/rendering_device.h

+2
Original file line numberDiff line numberDiff line change
@@ -715,6 +715,8 @@ class RenderingDevice : public Object {
715715

716716
virtual RID uniform_set_create(const Vector<Uniform> &p_uniforms, RID p_shader, uint32_t p_shader_set) = 0;
717717
virtual bool uniform_set_is_valid(RID p_uniform_set) = 0;
718+
typedef void (*UniformSetInvalidatedCallback)(const RID &, void *);
719+
virtual void uniform_set_set_invalidation_callback(RID p_uniform_set, UniformSetInvalidatedCallback p_callback, void *p_userdata) = 0;
718720

719721
virtual Error buffer_update(RID p_buffer, uint32_t p_offset, uint32_t p_size, const void *p_data, uint32_t p_post_barrier = BARRIER_MASK_ALL) = 0;
720722
virtual Error buffer_clear(RID p_buffer, uint32_t p_offset, uint32_t p_size, uint32_t p_post_barrier = BARRIER_MASK_ALL) = 0;

0 commit comments

Comments
 (0)