Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix errors when freeing GPUParticles #82431

Merged
merged 1 commit into from
Oct 11, 2023
Merged

Fix errors when freeing GPUParticles #82431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions drivers/gles3/storage/particles_storage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,15 @@ RID ParticlesStorage::particles_allocate() {
}

void ParticlesStorage::particles_initialize(RID p_rid) {
particles_owner.initialize_rid(p_rid, Particles());
particles_owner.initialize_rid(p_rid);
}

void ParticlesStorage::particles_free(RID p_rid) {
update_particles();
Particles *particles = particles_owner.get_or_null(p_rid);

particles->dependency.deleted_notify(p_rid);
particles->update_list.remove_from_list();

_particles_free_data(particles);
particles_owner.free(p_rid);
}
Expand Down Expand Up @@ -355,8 +357,10 @@ void ParticlesStorage::particles_request_process(RID p_particles) {

if (!particles->dirty) {
particles->dirty = true;
particles->update_list = particle_update_list;
particle_update_list = particles;

if (!particles->update_list.in_list()) {
particle_update_list.add(&particles->update_list);
}
}
}

Expand Down Expand Up @@ -978,13 +982,12 @@ void ParticlesStorage::update_particles() {
glBindBufferBase(GL_UNIFORM_BUFFER, PARTICLES_GLOBALS_UNIFORM_LOCATION, global_buffer);
glBindBuffer(GL_UNIFORM_BUFFER, 0);

while (particle_update_list) {
while (particle_update_list.first()) {
// Use transform feedback to process particles.

Particles *particles = particle_update_list;
Particles *particles = particle_update_list.first()->self();

particle_update_list = particles->update_list;
particles->update_list = nullptr;
particles->update_list.remove_from_list();
particles->dirty = false;

_particles_update_buffers(particles);
Expand Down
7 changes: 4 additions & 3 deletions drivers/gles3/storage/particles_storage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ class ParticlesStorage : public RendererParticlesStorage {
uint32_t userdata_count = 0;

bool dirty = false;
Particles *update_list = nullptr;
SelfList<Particles> update_list;

double phase = 0.0;
double prev_phase = 0.0;
Expand Down Expand Up @@ -237,7 +237,8 @@ class ParticlesStorage : public RendererParticlesStorage {
double trail_length = 1.0;
bool trails_enabled = false;

Particles() {
Particles() :
update_list(this) {
}
};

Expand All @@ -259,7 +260,7 @@ class ParticlesStorage : public RendererParticlesStorage {
RID copy_shader_version;
} particles_shader;

Particles *particle_update_list = nullptr;
SelfList<Particles>::List particle_update_list;

mutable RID_Owner<Particles, true> particles_owner;

Expand Down
20 changes: 11 additions & 9 deletions servers/rendering/renderer_rd/storage_rd/particles_storage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,13 +221,15 @@ RID ParticlesStorage::particles_allocate() {
}

void ParticlesStorage::particles_initialize(RID p_rid) {
particles_owner.initialize_rid(p_rid, Particles());
particles_owner.initialize_rid(p_rid);
}

void ParticlesStorage::particles_free(RID p_rid) {
update_particles();
Particles *particles = particles_owner.get_or_null(p_rid);

particles->dependency.deleted_notify(p_rid);
particles->update_list.remove_from_list();

_particles_free_data(particles);
particles_owner.free(p_rid);
}
Expand Down Expand Up @@ -577,8 +579,10 @@ void ParticlesStorage::particles_request_process(RID p_particles) {

if (!particles->dirty) {
particles->dirty = true;
particles->update_list = particle_update_list;
particle_update_list = particles;

if (!particles->update_list.in_list()) {
particle_update_list.add(&particles->update_list);
}
}
}

Expand Down Expand Up @@ -1345,14 +1349,12 @@ void ParticlesStorage::_particles_update_buffers(Particles *particles) {
void ParticlesStorage::update_particles() {
uint32_t frame = RSG::rasterizer->get_frame_number();
bool uses_motion_vectors = RSG::viewport->get_num_viewports_with_motion_vectors() > 0;
while (particle_update_list) {
while (particle_update_list.first()) {
//use transform feedback to process particles

Particles *particles = particle_update_list;
Particles *particles = particle_update_list.first()->self();

//take and remove
particle_update_list = particles->update_list;
particles->update_list = nullptr;
particles->update_list.remove_from_list();
particles->dirty = false;

_particles_update_buffers(particles);
Expand Down
7 changes: 4 additions & 3 deletions servers/rendering/renderer_rd/storage_rd/particles_storage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ class ParticlesStorage : public RendererParticlesStorage {
RID particles_sort_uniform_set;

bool dirty = false;
Particles *update_list = nullptr;
SelfList<Particles> update_list;

RID sub_emitter;

Expand Down Expand Up @@ -250,7 +250,8 @@ class ParticlesStorage : public RendererParticlesStorage {
LocalVector<ParticlesFrameParams> frame_history;
LocalVector<ParticlesFrameParams> trail_params;

Particles() {
Particles() :
update_list(this) {
}
};

Expand Down Expand Up @@ -322,7 +323,7 @@ class ParticlesStorage : public RendererParticlesStorage {

} particles_shader;

Particles *particle_update_list = nullptr;
SelfList<Particles>::List particle_update_list;

mutable RID_Owner<Particles, true> particles_owner;

Expand Down