asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #55669 from lawnjelly/rid_fixes

Browse source
This commit is contained in:
Rémi Verschelde 2021-12-06 18:14:11 +01:00 committed by GitHub
commit dbe9bb85c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 52 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/gles2/rasterizer_gles2.cpp
View file

@ -537,5 +537,8 @@ RasterizerGLES2::RasterizerGLES2() {
RasterizerGLES2::~RasterizerGLES2() { RasterizerGLES2::~RasterizerGLES2() {
memdelete(scene); memdelete(scene);
memdelete(canvas); memdelete(canvas);
// Storage needs to be deleted after canvas as canvas destructor frees RIDs
// stored in storage RID owners.
memdelete(storage); memdelete(storage);
} }

25
drivers/gles2/rasterizer_scene_gles2.cpp
View file

@ -4077,3 +4077,28 @@ void RasterizerSceneGLES2::finalize() {
RasterizerSceneGLES2::RasterizerSceneGLES2() { RasterizerSceneGLES2::RasterizerSceneGLES2() {
_light_counter = 0; _light_counter = 0;
} }
RasterizerSceneGLES2::~RasterizerSceneGLES2() {
storage->free(default_material);
default_material = RID();
storage->free(default_material_twosided);
default_material_twosided = RID();
storage->free(default_shader);
default_shader = RID();
storage->free(default_shader_twosided);
default_shader_twosided = RID();
storage->free(default_worldcoord_material);
default_worldcoord_material = RID();
storage->free(default_worldcoord_material_twosided);
default_worldcoord_material_twosided = RID();
storage->free(default_worldcoord_shader);
default_worldcoord_shader = RID();
storage->free(default_worldcoord_shader_twosided);
default_worldcoord_shader_twosided = RID();
storage->free(default_overdraw_material);
default_overdraw_material = RID();
storage->free(default_overdraw_shader);
default_overdraw_shader = RID();
}

1
drivers/gles2/rasterizer_scene_gles2.h
View file

@ -773,6 +773,7 @@ public:
void initialize(); void initialize();
void finalize(); void finalize();
RasterizerSceneGLES2(); RasterizerSceneGLES2();
~RasterizerSceneGLES2();
}; };
#endif // RASTERIZERSCENEGLES2_H #endif // RASTERIZERSCENEGLES2_H

3
drivers/gles3/rasterizer_gles3.cpp
View file

@ -499,5 +499,8 @@ RasterizerGLES3::RasterizerGLES3() {
RasterizerGLES3::~RasterizerGLES3() { RasterizerGLES3::~RasterizerGLES3() {
memdelete(scene); memdelete(scene);
memdelete(canvas); memdelete(canvas);
// storage must be deleted last,
// because it contains RID_owners that are used by scene and canvas destructors
memdelete(storage); memdelete(storage);
} }

30
drivers/gles3/rasterizer_scene_gles3.cpp
View file

@ -5282,18 +5282,28 @@ RasterizerSceneGLES3::RasterizerSceneGLES3() {
} }
RasterizerSceneGLES3::~RasterizerSceneGLES3() { RasterizerSceneGLES3::~RasterizerSceneGLES3() {
memdelete(storage->material_owner.getptr(default_material)); storage->free(default_material);
memdelete(storage->material_owner.getptr(default_material_twosided)); default_material = RID();
memdelete(storage->shader_owner.getptr(default_shader)); storage->free(default_material_twosided);
memdelete(storage->shader_owner.getptr(default_shader_twosided)); default_material_twosided = RID();
storage->free(default_shader);
default_shader = RID();
storage->free(default_shader_twosided);
default_shader_twosided = RID();
memdelete(storage->material_owner.getptr(default_worldcoord_material)); storage->free(default_worldcoord_material);
memdelete(storage->material_owner.getptr(default_worldcoord_material_twosided)); default_worldcoord_material = RID();
memdelete(storage->shader_owner.getptr(default_worldcoord_shader)); storage->free(default_worldcoord_material_twosided);
memdelete(storage->shader_owner.getptr(default_worldcoord_shader_twosided)); default_worldcoord_material_twosided = RID();
storage->free(default_worldcoord_shader);
default_worldcoord_shader = RID();
storage->free(default_worldcoord_shader_twosided);
default_worldcoord_shader_twosided = RID();
memdelete(storage->material_owner.getptr(default_overdraw_material)); storage->free(default_overdraw_material);
memdelete(storage->shader_owner.getptr(default_overdraw_shader)); default_overdraw_material = RID();
storage->free(default_overdraw_shader);
default_overdraw_shader = RID();
memfree(state.spot_array_tmp); memfree(state.spot_array_tmp);
memfree(state.omni_array_tmp); memfree(state.omni_array_tmp);