Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-08 06:09:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename server "free" functions to "free_rid" to match exposed API

Browse source
This commit is contained in:
Aaron Franke 2025-06-05 00:49:35 -07:00
parent 4d231b5bf8
commit 9fbf5808a0
No known key found for this signature in database
GPG key ID: 40A1750B977E56BF
158 changed files with 724 additions and 696 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scene/3d/camera_3d.cpp
View file

@ -867,11 +867,11 @@ Camera3D::Camera3D() {
Camera3D::~Camera3D() {
ERR_FAIL_NULL(RenderingServer::get_singleton());
RenderingServer::get_singleton()->free(camera);
RenderingServer::get_singleton()->free_rid(camera);
#ifndef PHYSICS_3D_DISABLED
if (pyramid_shape.is_valid()) {
ERR_FAIL_NULL(PhysicsServer3D::get_singleton());
PhysicsServer3D::get_singleton()->free(pyramid_shape);
PhysicsServer3D::get_singleton()->free_rid(pyramid_shape);
}
#endif // PHYSICS_3D_DISABLED
}

2
scene/3d/cpu_particles_3d.cpp
View file

@ -1822,5 +1822,5 @@ CPUParticles3D::CPUParticles3D() {
CPUParticles3D::~CPUParticles3D() {
ERR_FAIL_NULL(RenderingServer::get_singleton());
RS::get_singleton()->free(multimesh);
RS::get_singleton()->free_rid(multimesh);
}

2
scene/3d/decal.cpp
View file

@ -288,5 +288,5 @@ Decal::Decal() {
Decal::~Decal() {
ERR_FAIL_NULL(RenderingServer::get_singleton());
RS::get_singleton()->free(decal);
RS::get_singleton()->free_rid(decal);
}

2
scene/3d/fog_volume.cpp
View file

@ -142,5 +142,5 @@ FogVolume::FogVolume() {
FogVolume::~FogVolume() {
ERR_FAIL_NULL(RenderingServer::get_singleton());
RS::get_singleton()->free(volume);
RS::get_singleton()->free_rid(volume);
}

2
scene/3d/gpu_particles_3d.cpp
View file

@ -904,5 +904,5 @@ GPUParticles3D::GPUParticles3D() {
GPUParticles3D::~GPUParticles3D() {
ERR_FAIL_NULL(RenderingServer::get_singleton());
RS::get_singleton()->free(particles);
RS::get_singleton()->free_rid(particles);
}

4
scene/3d/gpu_particles_collision_3d.cpp
View file

@ -59,7 +59,7 @@ GPUParticlesCollision3D::GPUParticlesCollision3D(RS::ParticlesCollisionType p_ty
GPUParticlesCollision3D::~GPUParticlesCollision3D() {
ERR_FAIL_NULL(RenderingServer::get_singleton());
RS::get_singleton()->free(collision);
RS::get_singleton()->free_rid(collision);
}
/////////////////////////////////
@ -910,7 +910,7 @@ GPUParticlesAttractor3D::GPUParticlesAttractor3D(RS::ParticlesCollisionType p_ty
}
GPUParticlesAttractor3D::~GPUParticlesAttractor3D() {
ERR_FAIL_NULL(RenderingServer::get_singleton());
RS::get_singleton()->free(collision);
RS::get_singleton()->free_rid(collision);
}
/////////////////////////////////

6
scene/3d/label_3d.cpp
View file

@ -470,7 +470,7 @@ void Label3D::_shape() {
// Clear materials.
for (const KeyValue<SurfaceKey, SurfaceData> &E : surfaces) {
RenderingServer::get_singleton()->free(E.value.material);
RenderingServer::get_singleton()->free_rid(E.value.material);
}
surfaces.clear();
@ -1105,9 +1105,9 @@ Label3D::~Label3D() {
TS->free_rid(text_rid);
ERR_FAIL_NULL(RenderingServer::get_singleton());
RenderingServer::get_singleton()->free(mesh);
RenderingServer::get_singleton()->free_rid(mesh);
for (KeyValue<SurfaceKey, SurfaceData> E : surfaces) {
RenderingServer::get_singleton()->free(E.value.material);
RenderingServer::get_singleton()->free_rid(E.value.material);
}
surfaces.clear();
}

2
scene/3d/light_3d.cpp
View file

@ -506,7 +506,7 @@ Light3D::~Light3D() {
RS::get_singleton()->instance_set_base(get_instance(), RID());
if (light.is_valid()) {
RenderingServer::get_singleton()->free(light);
RenderingServer::get_singleton()->free_rid(light);
}
}

2
scene/3d/lightmap_gi.cpp
View file

@ -365,7 +365,7 @@ LightmapGIData::LightmapGIData() {
LightmapGIData::~LightmapGIData() {
ERR_FAIL_NULL(RenderingServer::get_singleton());
RS::get_singleton()->free(lightmap);
RS::get_singleton()->free_rid(lightmap);
}
///////////////////////////

6
scene/3d/navigation/navigation_agent_3d.cpp
View file

@ -383,7 +383,7 @@ NavigationAgent3D::NavigationAgent3D() {
NavigationAgent3D::~NavigationAgent3D() {
ERR_FAIL_NULL(NavigationServer3D::get_singleton());
NavigationServer3D::get_singleton()->free(agent);
NavigationServer3D::get_singleton()->free_rid(agent);
agent = RID(); // Pointless
#ifdef DEBUG_ENABLED
@ -391,10 +391,10 @@ NavigationAgent3D::~NavigationAgent3D() {
ERR_FAIL_NULL(RenderingServer::get_singleton());
if (debug_path_instance.is_valid()) {
RenderingServer::get_singleton()->free(debug_path_instance);
RenderingServer::get_singleton()->free_rid(debug_path_instance);
}
if (debug_path_mesh.is_valid()) {
RenderingServer::get_singleton()->free(debug_path_mesh->get_rid());
RenderingServer::get_singleton()->free_rid(debug_path_mesh->get_rid());
}
#endif // DEBUG_ENABLED
}

6
scene/3d/navigation/navigation_link_3d.cpp
View file

@ -286,16 +286,16 @@ NavigationLink3D::NavigationLink3D() {
NavigationLink3D::~NavigationLink3D() {
ERR_FAIL_NULL(NavigationServer3D::get_singleton());
NavigationServer3D::get_singleton()->free(link);
NavigationServer3D::get_singleton()->free_rid(link);
link = RID();
#ifdef DEBUG_ENABLED
ERR_FAIL_NULL(RenderingServer::get_singleton());
if (debug_instance.is_valid()) {
RenderingServer::get_singleton()->free(debug_instance);
RenderingServer::get_singleton()->free_rid(debug_instance);
}
if (debug_mesh.is_valid()) {
RenderingServer::get_singleton()->free(debug_mesh->get_rid());
RenderingServer::get_singleton()->free_rid(debug_mesh->get_rid());
}
#endif // DEBUG_ENABLED
}

10
scene/3d/navigation/navigation_obstacle_3d.cpp
View file

@ -232,7 +232,7 @@ NavigationObstacle3D::~NavigationObstacle3D() {
NavigationServer3D *ns3d = NavigationServer3D::get_singleton();
ERR_FAIL_NULL(ns3d);
ns3d->free(obstacle);
ns3d->free_rid(obstacle);
obstacle = RID();
#ifdef DEBUG_ENABLED
@ -242,19 +242,19 @@ NavigationObstacle3D::~NavigationObstacle3D() {
RenderingServer *rs = RenderingServer::get_singleton();
ERR_FAIL_NULL(rs);
if (fake_agent_radius_debug_instance_rid.is_valid()) {
rs->free(fake_agent_radius_debug_instance_rid);
rs->free_rid(fake_agent_radius_debug_instance_rid);
fake_agent_radius_debug_instance_rid = RID();
}
if (fake_agent_radius_debug_mesh_rid.is_valid()) {
rs->free(fake_agent_radius_debug_mesh_rid);
rs->free_rid(fake_agent_radius_debug_mesh_rid);
fake_agent_radius_debug_mesh_rid = RID();
}
if (static_obstacle_debug_instance_rid.is_valid()) {
rs->free(static_obstacle_debug_instance_rid);
rs->free_rid(static_obstacle_debug_instance_rid);
static_obstacle_debug_instance_rid = RID();
}
if (static_obstacle_debug_mesh_rid.is_valid()) {
rs->free(static_obstacle_debug_mesh_rid);
rs->free_rid(static_obstacle_debug_mesh_rid);
static_obstacle_debug_mesh_rid = RID();
}
#endif // DEBUG_ENABLED

10
scene/3d/navigation/navigation_region_3d.cpp
View file

@ -445,7 +445,7 @@ NavigationRegion3D::~NavigationRegion3D() {
navigation_mesh->disconnect_changed(callable_mp(this, &NavigationRegion3D::_navigation_mesh_changed));
}
ERR_FAIL_NULL(NavigationServer3D::get_singleton());
NavigationServer3D::get_singleton()->free(region);
NavigationServer3D::get_singleton()->free_rid(region);
#ifdef DEBUG_ENABLED
NavigationServer3D::get_singleton()->disconnect(SNAME("map_changed"), callable_mp(this, &NavigationRegion3D::_navigation_map_changed));
@ -453,16 +453,16 @@ NavigationRegion3D::~NavigationRegion3D() {
ERR_FAIL_NULL(RenderingServer::get_singleton());
if (debug_instance.is_valid()) {
RenderingServer::get_singleton()->free(debug_instance);
RenderingServer::get_singleton()->free_rid(debug_instance);
}
if (debug_mesh.is_valid()) {
RenderingServer::get_singleton()->free(debug_mesh->get_rid());
RenderingServer::get_singleton()->free_rid(debug_mesh->get_rid());
}
if (debug_edge_connections_instance.is_valid()) {
RenderingServer::get_singleton()->free(debug_edge_connections_instance);
RenderingServer::get_singleton()->free_rid(debug_edge_connections_instance);
}
if (debug_edge_connections_mesh.is_valid()) {
RenderingServer::get_singleton()->free(debug_edge_connections_mesh->get_rid());
RenderingServer::get_singleton()->free_rid(debug_edge_connections_mesh->get_rid());
}
#endif // DEBUG_ENABLED
}

2
scene/3d/occluder_instance_3d.cpp
View file

@ -136,7 +136,7 @@ Occluder3D::Occluder3D() {
Occluder3D::~Occluder3D() {
if (occluder.is_valid()) {
ERR_FAIL_NULL(RenderingServer::get_singleton());
RS::get_singleton()->free(occluder);
RS::get_singleton()->free_rid(occluder);
}
}

4
scene/3d/path_3d.cpp
View file

@ -42,11 +42,11 @@ Path3D::Path3D() {
Path3D::~Path3D() {
if (debug_instance.is_valid()) {
ERR_FAIL_NULL(RenderingServer::get_singleton());
RS::get_singleton()->free(debug_instance);
RS::get_singleton()->free_rid(debug_instance);
}
if (debug_mesh.is_valid()) {
ERR_FAIL_NULL(RenderingServer::get_singleton());
RS::get_singleton()->free(debug_mesh->get_rid());
RS::get_singleton()->free_rid(debug_mesh->get_rid());
}
}

8
scene/3d/physics/collision_object_3d.cpp
View file

@ -386,7 +386,7 @@ void CollisionObject3D::_update_debug_shapes() {
ShapeData::ShapeBase &s = shape_bases[i];
if (s.shape.is_null() || shapedata.disabled) {
if (s.debug_shape.is_valid()) {
RS::get_singleton()->free(s.debug_shape);
RS::get_singleton()->free_rid(s.debug_shape);
s.debug_shape = RID();
--debug_shapes_count;
}
@ -418,7 +418,7 @@ void CollisionObject3D::_clear_debug_shapes() {
for (int i = 0; i < shapedata.shapes.size(); i++) {
ShapeData::ShapeBase &s = shape_bases[i];
if (s.debug_shape.is_valid()) {
RS::get_singleton()->free(s.debug_shape);
RS::get_singleton()->free_rid(s.debug_shape);
s.debug_shape = RID();
if (s.shape.is_valid()) {
s.shape->disconnect_changed(callable_mp(this, &CollisionObject3D::_update_shape_data));
@ -664,7 +664,7 @@ void CollisionObject3D::shape_owner_remove_shape(uint32_t p_owner, int p_shape)
}
if (s.debug_shape.is_valid()) {
RS::get_singleton()->free(s.debug_shape);
RS::get_singleton()->free_rid(s.debug_shape);
if (s.shape.is_valid()) {
s.shape->disconnect_changed(callable_mp(this, &CollisionObject3D::_shape_changed));
}
@ -757,5 +757,5 @@ CollisionObject3D::CollisionObject3D() {
CollisionObject3D::~CollisionObject3D() {
ERR_FAIL_NULL(PhysicsServer3D::get_singleton());
PhysicsServer3D::get_singleton()->free(rid);
PhysicsServer3D::get_singleton()->free_rid(rid);
}

2
scene/3d/physics/joints/joint_3d.cpp
View file

@ -239,5 +239,5 @@ Joint3D::Joint3D() {
Joint3D::~Joint3D() {
ERR_FAIL_NULL(PhysicsServer3D::get_singleton());
PhysicsServer3D::get_singleton()->free(joint);
PhysicsServer3D::get_singleton()->free_rid(joint);
}

2
scene/3d/physics/physical_bone_3d.cpp
View file

@ -1287,7 +1287,7 @@ PhysicalBone3D::~PhysicalBone3D() {
memdelete(joint_data);
}
ERR_FAIL_NULL(PhysicsServer3D::get_singleton());
PhysicsServer3D::get_singleton()->free(joint);
PhysicsServer3D::get_singleton()->free_rid(joint);
}
void PhysicalBone3D::update_bone_id() {

4
scene/3d/physics/ray_cast_3d.cpp
View file

@ -547,11 +547,11 @@ void RayCast3D::_update_debug_shape() {
void RayCast3D::_clear_debug_shape() {
ERR_FAIL_NULL(RenderingServer::get_singleton());
if (debug_instance.is_valid()) {
RenderingServer::get_singleton()->free(debug_instance);
RenderingServer::get_singleton()->free_rid(debug_instance);
debug_instance = RID();
}
if (debug_mesh.is_valid()) {
RenderingServer::get_singleton()->free(debug_mesh->get_rid());
RenderingServer::get_singleton()->free_rid(debug_mesh->get_rid());
debug_mesh = Ref<ArrayMesh>();
}
}

4
scene/3d/physics/shape_cast_3d.cpp
View file

@ -633,11 +633,11 @@ void ShapeCast3D::_update_debug_shape() {
void ShapeCast3D::_clear_debug_shape() {
ERR_FAIL_NULL(RenderingServer::get_singleton());
if (debug_instance.is_valid()) {
RenderingServer::get_singleton()->free(debug_instance);
RenderingServer::get_singleton()->free_rid(debug_instance);
debug_instance = RID();
}
if (debug_mesh.is_valid()) {
RenderingServer::get_singleton()->free(debug_mesh->get_rid());
RenderingServer::get_singleton()->free_rid(debug_mesh->get_rid());
debug_mesh = Ref<ArrayMesh>();
}
}

2
scene/3d/physics/soft_body_3d.cpp
View file

@ -741,7 +741,7 @@ SoftBody3D::SoftBody3D() :
SoftBody3D::~SoftBody3D() {
memdelete(rendering_server_handler);
ERR_FAIL_NULL(PhysicsServer3D::get_singleton());
PhysicsServer3D::get_singleton()->free(physics_rid);
PhysicsServer3D::get_singleton()->free_rid(physics_rid);
}
void SoftBody3D::_make_cache_dirty() {

2
scene/3d/reflection_probe.cpp
View file

@ -309,5 +309,5 @@ ReflectionProbe::ReflectionProbe() {
ReflectionProbe::~ReflectionProbe() {
ERR_FAIL_NULL(RenderingServer::get_singleton());
RS::get_singleton()->free(probe);
RS::get_singleton()->free_rid(probe);
}

2
scene/3d/skeleton_3d.cpp
View file

@ -61,7 +61,7 @@ SkinReference::~SkinReference() {
if (skeleton_node) {
skeleton_node->skin_bindings.erase(this);
}
RS::get_singleton()->free(skeleton);
RS::get_singleton()->free_rid(skeleton);
}
///////////////////////////////////////

4
scene/3d/sprite_3d.cpp
View file

@ -772,8 +772,8 @@ SpriteBase3D::SpriteBase3D() {
SpriteBase3D::~SpriteBase3D() {
ERR_FAIL_NULL(RenderingServer::get_singleton());
RenderingServer::get_singleton()->free(mesh);
RenderingServer::get_singleton()->free(material);
RenderingServer::get_singleton()->free_rid(mesh);
RenderingServer::get_singleton()->free_rid(material);
}
///////////////////////////////////////////

2
scene/3d/visible_on_screen_notifier_3d.cpp
View file

@ -98,7 +98,7 @@ VisibleOnScreenNotifier3D::~VisibleOnScreenNotifier3D() {
RID base_old = get_base();
set_base(RID());
ERR_FAIL_NULL(RenderingServer::get_singleton());
RS::get_singleton()->free(base_old);
RS::get_singleton()->free_rid(base_old);
}
//////////////////////////////////////

2
scene/3d/visual_instance_3d.cpp
View file

@ -205,7 +205,7 @@ VisualInstance3D::VisualInstance3D() {
VisualInstance3D::~VisualInstance3D() {
ERR_FAIL_NULL(RenderingServer::get_singleton());
RenderingServer::get_singleton()->free(instance);
RenderingServer::get_singleton()->free_rid(instance);
}
void GeometryInstance3D::set_material_override(const Ref<Material> &p_material) {

4
scene/3d/voxel_gi.cpp
View file

@ -260,7 +260,7 @@ VoxelGIData::VoxelGIData() {
VoxelGIData::~VoxelGIData() {
ERR_FAIL_NULL(RenderingServer::get_singleton());
RS::get_singleton()->free(probe);
RS::get_singleton()->free_rid(probe);
}
//////////////////////
@ -586,5 +586,5 @@ VoxelGI::VoxelGI() {
VoxelGI::~VoxelGI() {
ERR_FAIL_NULL(RenderingServer::get_singleton());
RS::get_singleton()->free(voxel_gi);
RS::get_singleton()->free_rid(voxel_gi);
}