Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-19 07:53:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #107139 from aaronfranke/server-free

Browse source 
Rename server `free` functions to `free_rid` to match exposed API
This commit is contained in:
Thaddeus Crews 2025-09-30 20:10:29 -05:00
commit 4610e1e517
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
158 changed files with 724 additions and 696 deletions
Download patch file Download diff file Expand all files Collapse all files

6
editor/animation/animation_player_editor_plugin.cpp
View file

@ -1699,7 +1699,7 @@ void AnimationPlayerEditor::_allocate_onion_layers() {
void AnimationPlayerEditor::_free_onion_layers() { void AnimationPlayerEditor::_free_onion_layers() {
for (uint32_t i = 0; i < onion.captures.size(); i++) { for (uint32_t i = 0; i < onion.captures.size(); i++) {
if (onion.captures[i].is_valid()) { if (onion.captures[i].is_valid()) {
RS::get_singleton()->free(onion.captures[i]); RS::get_singleton()->free_rid(onion.captures[i]);
} }
} }
onion.captures.clear(); onion.captures.clear();
@ -2283,8 +2283,8 @@ void fragment() {
AnimationPlayerEditor::~AnimationPlayerEditor() { AnimationPlayerEditor::~AnimationPlayerEditor() {
_free_onion_layers(); _free_onion_layers();
RS::get_singleton()->free(onion.capture.canvas); RS::get_singleton()->free_rid(onion.capture.canvas);
RS::get_singleton()->free(onion.capture.canvas_item); RS::get_singleton()->free_rid(onion.capture.canvas_item);
onion.capture = {}; onion.capture = {};
} }

16
editor/editor_interface.cpp
View file

@ -213,18 +213,18 @@ Vector<Ref<Texture2D>> EditorInterface::make_mesh_previews(const Vector<Ref<Mesh
ERR_CONTINUE(img.is_null() || img->is_empty()); ERR_CONTINUE(img.is_null() || img->is_empty());
Ref<ImageTexture> it = ImageTexture::create_from_image(img); Ref<ImageTexture> it = ImageTexture::create_from_image(img);
RS::get_singleton()->free(inst); RS::get_singleton()->free_rid(inst);
textures.push_back(it); textures.push_back(it);
} }
RS::get_singleton()->free(viewport); RS::get_singleton()->free_rid(viewport);
RS::get_singleton()->free(light); RS::get_singleton()->free_rid(light);
RS::get_singleton()->free(light_instance); RS::get_singleton()->free_rid(light_instance);
RS::get_singleton()->free(light2); RS::get_singleton()->free_rid(light2);
RS::get_singleton()->free(light_instance2); RS::get_singleton()->free_rid(light_instance2);
RS::get_singleton()->free(camera); RS::get_singleton()->free_rid(camera);
RS::get_singleton()->free(scenario); RS::get_singleton()->free_rid(scenario);
return textures; return textures;
} }

44
editor/inspector/editor_preview_plugins.cpp
View file

@ -467,16 +467,16 @@ EditorMaterialPreviewPlugin::EditorMaterialPreviewPlugin() {
EditorMaterialPreviewPlugin::~EditorMaterialPreviewPlugin() { EditorMaterialPreviewPlugin::~EditorMaterialPreviewPlugin() {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
RS::get_singleton()->free(sphere); RS::get_singleton()->free_rid(sphere);
RS::get_singleton()->free(sphere_instance); RS::get_singleton()->free_rid(sphere_instance);
RS::get_singleton()->free(viewport); RS::get_singleton()->free_rid(viewport);
RS::get_singleton()->free(light); RS::get_singleton()->free_rid(light);
RS::get_singleton()->free(light_instance); RS::get_singleton()->free_rid(light_instance);
RS::get_singleton()->free(light2); RS::get_singleton()->free_rid(light2);
RS::get_singleton()->free(light_instance2); RS::get_singleton()->free_rid(light_instance2);
RS::get_singleton()->free(camera); RS::get_singleton()->free_rid(camera);
RS::get_singleton()->free(camera_attributes); RS::get_singleton()->free_rid(camera_attributes);
RS::get_singleton()->free(scenario); RS::get_singleton()->free_rid(scenario);
} }
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
@ -811,15 +811,15 @@ EditorMeshPreviewPlugin::EditorMeshPreviewPlugin() {
EditorMeshPreviewPlugin::~EditorMeshPreviewPlugin() { EditorMeshPreviewPlugin::~EditorMeshPreviewPlugin() {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
//RS::get_singleton()->free(sphere); //RS::get_singleton()->free(sphere);
RS::get_singleton()->free(mesh_instance); RS::get_singleton()->free_rid(mesh_instance);
RS::get_singleton()->free(viewport); RS::get_singleton()->free_rid(viewport);
RS::get_singleton()->free(light); RS::get_singleton()->free_rid(light);
RS::get_singleton()->free(light_instance); RS::get_singleton()->free_rid(light_instance);
RS::get_singleton()->free(light2); RS::get_singleton()->free_rid(light2);
RS::get_singleton()->free(light_instance2); RS::get_singleton()->free_rid(light_instance2);
RS::get_singleton()->free(camera); RS::get_singleton()->free_rid(camera);
RS::get_singleton()->free(camera_attributes); RS::get_singleton()->free_rid(camera_attributes);
RS::get_singleton()->free(scenario); RS::get_singleton()->free_rid(scenario);
} }
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
@ -903,9 +903,9 @@ EditorFontPreviewPlugin::EditorFontPreviewPlugin() {
EditorFontPreviewPlugin::~EditorFontPreviewPlugin() { EditorFontPreviewPlugin::~EditorFontPreviewPlugin() {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
RS::get_singleton()->free(canvas_item); RS::get_singleton()->free_rid(canvas_item);
RS::get_singleton()->free(canvas); RS::get_singleton()->free_rid(canvas);
RS::get_singleton()->free(viewport); RS::get_singleton()->free_rid(viewport);
} }
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////

10
editor/scene/2d/path_2d_editor_plugin.cpp
View file

@ -975,11 +975,11 @@ Path2DEditor::Path2DEditor() {
Path2DEditor::~Path2DEditor() { Path2DEditor::~Path2DEditor() {
ERR_FAIL_NULL(RS::get_singleton()); ERR_FAIL_NULL(RS::get_singleton());
RS::get_singleton()->free(debug_mesh_rid); RS::get_singleton()->free_rid(debug_mesh_rid);
RS::get_singleton()->free(debug_handle_curve_multimesh_rid); RS::get_singleton()->free_rid(debug_handle_curve_multimesh_rid);
RS::get_singleton()->free(debug_handle_sharp_multimesh_rid); RS::get_singleton()->free_rid(debug_handle_sharp_multimesh_rid);
RS::get_singleton()->free(debug_handle_smooth_multimesh_rid); RS::get_singleton()->free_rid(debug_handle_smooth_multimesh_rid);
RS::get_singleton()->free(debug_handle_mesh_rid); RS::get_singleton()->free_rid(debug_handle_mesh_rid);
} }
void Path2DEditorPlugin::edit(Object *p_object) { void Path2DEditorPlugin::edit(Object *p_object) {

4
editor/scene/2d/tiles/tile_atlas_view.cpp
View file

@ -316,12 +316,12 @@ RID TileAtlasView::_get_canvas_item_to_draw(const TileData *p_for_data, const Ca
void TileAtlasView::_clear_material_canvas_items() { void TileAtlasView::_clear_material_canvas_items() {
for (KeyValue<Ref<Material>, RID> kv : material_tiles_draw) { for (KeyValue<Ref<Material>, RID> kv : material_tiles_draw) {
RS::get_singleton()->free(kv.value); RS::get_singleton()->free_rid(kv.value);
} }
material_tiles_draw.clear(); material_tiles_draw.clear();
for (KeyValue<Ref<Material>, RID> kv : material_alternatives_draw) { for (KeyValue<Ref<Material>, RID> kv : material_alternatives_draw) {
RS::get_singleton()->free(kv.value); RS::get_singleton()->free_rid(kv.value);
} }
material_alternatives_draw.clear(); material_alternatives_draw.clear();
} }

4
editor/scene/3d/node_3d_editor_gizmos.cpp
View file

@ -61,7 +61,7 @@ void EditorNode3DGizmo::clear() {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
for (int i = 0; i < instances.size(); i++) { for (int i = 0; i < instances.size(); i++) {
if (instances[i].instance.is_valid()) { if (instances[i].instance.is_valid()) {
RS::get_singleton()->free(instances[i].instance); RS::get_singleton()->free_rid(instances[i].instance);
} }
} }
@ -828,7 +828,7 @@ void EditorNode3DGizmo::free() {
for (int i = 0; i < instances.size(); i++) { for (int i = 0; i < instances.size(); i++) {
if (instances[i].instance.is_valid()) { if (instances[i].instance.is_valid()) {
RS::get_singleton()->free(instances[i].instance); RS::get_singleton()->free_rid(instances[i].instance);
} }
instances.write[i].instance = RID(); instances.write[i].instance = RID();
} }

32
editor/scene/3d/node_3d_editor_plugin.cpp
View file

@ -4257,15 +4257,15 @@ void Node3DEditorViewport::_init_gizmo_instance(int p_idx) {
void Node3DEditorViewport::_finish_gizmo_instances() { void Node3DEditorViewport::_finish_gizmo_instances() {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
RS::get_singleton()->free(move_gizmo_instance[i]); RS::get_singleton()->free_rid(move_gizmo_instance[i]);
RS::get_singleton()->free(move_plane_gizmo_instance[i]); RS::get_singleton()->free_rid(move_plane_gizmo_instance[i]);
RS::get_singleton()->free(rotate_gizmo_instance[i]); RS::get_singleton()->free_rid(rotate_gizmo_instance[i]);
RS::get_singleton()->free(scale_gizmo_instance[i]); RS::get_singleton()->free_rid(scale_gizmo_instance[i]);
RS::get_singleton()->free(scale_plane_gizmo_instance[i]); RS::get_singleton()->free_rid(scale_plane_gizmo_instance[i]);
RS::get_singleton()->free(axis_gizmo_instance[i]); RS::get_singleton()->free_rid(axis_gizmo_instance[i]);
} }
// Rotation white outline // Rotation white outline
RS::get_singleton()->free(rotate_gizmo_instance[3]); RS::get_singleton()->free_rid(rotate_gizmo_instance[3]);
} }
void Node3DEditorViewport::_toggle_camera_preview(bool p_activate) { void Node3DEditorViewport::_toggle_camera_preview(bool p_activate) {
@ -6574,16 +6574,16 @@ Node3DEditor *Node3DEditor::singleton = nullptr;
Node3DEditorSelectedItem::~Node3DEditorSelectedItem() { Node3DEditorSelectedItem::~Node3DEditorSelectedItem() {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
if (sbox_instance.is_valid()) { if (sbox_instance.is_valid()) {
RenderingServer::get_singleton()->free(sbox_instance); RenderingServer::get_singleton()->free_rid(sbox_instance);
} }
if (sbox_instance_offset.is_valid()) { if (sbox_instance_offset.is_valid()) {
RenderingServer::get_singleton()->free(sbox_instance_offset); RenderingServer::get_singleton()->free_rid(sbox_instance_offset);
} }
if (sbox_instance_xray.is_valid()) { if (sbox_instance_xray.is_valid()) {
RenderingServer::get_singleton()->free(sbox_instance_xray); RenderingServer::get_singleton()->free_rid(sbox_instance_xray);
} }
if (sbox_instance_xray_offset.is_valid()) { if (sbox_instance_xray_offset.is_valid()) {
RenderingServer::get_singleton()->free(sbox_instance_xray_offset); RenderingServer::get_singleton()->free_rid(sbox_instance_xray_offset);
} }
} }
@ -8191,17 +8191,17 @@ void Node3DEditor::_init_grid() {
} }
void Node3DEditor::_finish_indicators() { void Node3DEditor::_finish_indicators() {
RenderingServer::get_singleton()->free(origin_instance); RenderingServer::get_singleton()->free_rid(origin_instance);
RenderingServer::get_singleton()->free(origin_multimesh); RenderingServer::get_singleton()->free_rid(origin_multimesh);
RenderingServer::get_singleton()->free(origin_mesh); RenderingServer::get_singleton()->free_rid(origin_mesh);
_finish_grid(); _finish_grid();
} }
void Node3DEditor::_finish_grid() { void Node3DEditor::_finish_grid() {
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
RenderingServer::get_singleton()->free(grid_instance[i]); RenderingServer::get_singleton()->free_rid(grid_instance[i]);
RenderingServer::get_singleton()->free(grid[i]); RenderingServer::get_singleton()->free_rid(grid[i]);
} }
} }

14
modules/betsy/image_compress_betsy.cpp
View file

@ -248,15 +248,15 @@ void BetsyCompressor::_thread_exit() {
if (compress_rd != nullptr) { if (compress_rd != nullptr) {
if (dxt1_encoding_table_buffer.is_valid()) { if (dxt1_encoding_table_buffer.is_valid()) {
compress_rd->free(dxt1_encoding_table_buffer); compress_rd->free_rid(dxt1_encoding_table_buffer);
} }
compress_rd->free(src_sampler); compress_rd->free_rid(src_sampler);
// Clear the shader cache, pipelines will be unreferenced automatically. // Clear the shader cache, pipelines will be unreferenced automatically.
for (int i = 0; i < BETSY_SHADER_MAX; i++) { for (int i = 0; i < BETSY_SHADER_MAX; i++) {
if (cached_shaders[i].compiled.is_valid()) { if (cached_shaders[i].compiled.is_valid()) {
compress_rd->free(cached_shaders[i].compiled); compress_rd->free_rid(cached_shaders[i].compiled);
} }
} }
@ -707,8 +707,8 @@ Error BetsyCompressor::_compress(BetsyFormat p_format, Image *r_img) {
dst_texture_rid = dst_texture_combined; dst_texture_rid = dst_texture_combined;
compress_rd->free(dst_texture_primary); compress_rd->free_rid(dst_texture_primary);
compress_rd->free(dst_texture_alpha); compress_rd->free_rid(dst_texture_alpha);
} }
// Copy data from the GPU to the buffer. // Copy data from the GPU to the buffer.
@ -718,8 +718,8 @@ Error BetsyCompressor::_compress(BetsyFormat p_format, Image *r_img) {
memcpy(dst_data_ptr + dst_ofs, texture_data.ptr(), texture_data.size()); memcpy(dst_data_ptr + dst_ofs, texture_data.ptr(), texture_data.size());
// Free the source and dest texture. // Free the source and dest texture.
compress_rd->free(src_texture); compress_rd->free_rid(src_texture);
compress_rd->free(dst_texture_rid); compress_rd->free_rid(dst_texture_rid);
} }
src_images.clear(); src_images.clear();

6
modules/csg/csg_shape.cpp
View file

@ -106,7 +106,7 @@ void CSGShape3D::set_use_collision(bool p_enable) {
set_collision_priority(collision_priority); set_collision_priority(collision_priority);
_make_dirty(); //force update _make_dirty(); //force update
} else { } else {
PhysicsServer3D::get_singleton()->free(root_collision_instance); PhysicsServer3D::get_singleton()->free_rid(root_collision_instance);
root_collision_instance = RID(); root_collision_instance = RID();
root_collision_shape.unref(); root_collision_shape.unref();
} }
@ -809,7 +809,7 @@ void CSGShape3D::_update_debug_collision_shape() {
void CSGShape3D::_clear_debug_collision_shape() { void CSGShape3D::_clear_debug_collision_shape() {
if (root_collision_debug_instance.is_valid()) { if (root_collision_debug_instance.is_valid()) {
RS::get_singleton()->free(root_collision_debug_instance); RS::get_singleton()->free_rid(root_collision_debug_instance);
root_collision_debug_instance = RID(); root_collision_debug_instance = RID();
} }
} }
@ -913,7 +913,7 @@ void CSGShape3D::_notification(int p_what) {
case NOTIFICATION_EXIT_TREE: { case NOTIFICATION_EXIT_TREE: {
if (use_collision && is_root_shape() && root_collision_instance.is_valid()) { if (use_collision && is_root_shape() && root_collision_instance.is_valid()) {
PhysicsServer3D::get_singleton()->free(root_collision_instance); PhysicsServer3D::get_singleton()->free_rid(root_collision_instance);
root_collision_instance = RID(); root_collision_instance = RID();
root_collision_shape.unref(); root_collision_shape.unref();
_clear_debug_collision_shape(); _clear_debug_collision_shape();

4
modules/godot_physics_2d/godot_physics_server_2d.cpp
View file

@ -1219,7 +1219,7 @@ PhysicsServer2D::JointType GodotPhysicsServer2D::joint_get_type(RID p_joint) con
return joint->get_type(); return joint->get_type();
} }
void GodotPhysicsServer2D::free(RID p_rid) { void GodotPhysicsServer2D::free_rid(RID p_rid) {
_update_shapes(); // just in case _update_shapes(); // just in case
if (shape_owner.owns(p_rid)) { if (shape_owner.owns(p_rid)) {
@ -1264,7 +1264,7 @@ void GodotPhysicsServer2D::free(RID p_rid) {
} }
active_spaces.erase(space); active_spaces.erase(space);
free(space->get_default_area()->get_self()); free_rid(space->get_default_area()->get_self());
space_owner.free(p_rid); space_owner.free(p_rid);
memdelete(space); memdelete(space);
} else if (joint_owner.owns(p_rid)) { } else if (joint_owner.owns(p_rid)) {

2
modules/godot_physics_2d/godot_physics_server_2d.h
View file

@ -285,7 +285,7 @@ public:
/* MISC */ /* MISC */
virtual void free(RID p_rid) override; virtual void free_rid(RID p_rid) override;
virtual void set_active(bool p_active) override; virtual void set_active(bool p_active) override;
virtual void init() override; virtual void init() override;

6
modules/godot_physics_3d/godot_physics_server_3d.cpp
View file

@ -1595,7 +1595,7 @@ bool GodotPhysicsServer3D::generic_6dof_joint_get_flag(RID p_joint, Vector3::Axi
return generic_6dof_joint->get_flag(p_axis, p_flag); return generic_6dof_joint->get_flag(p_axis, p_flag);
} }
void GodotPhysicsServer3D::free(RID p_rid) { void GodotPhysicsServer3D::free_rid(RID p_rid) {
_update_shapes(); //just in case _update_shapes(); //just in case
if (shape_owner.owns(p_rid)) { if (shape_owner.owns(p_rid)) {
@ -1646,8 +1646,8 @@ void GodotPhysicsServer3D::free(RID p_rid) {
} }
active_spaces.erase(space); active_spaces.erase(space);
free(space->get_default_area()->get_self()); free_rid(space->get_default_area()->get_self());
free(space->get_static_global_body()); free_rid(space->get_static_global_body());
space_owner.free(p_rid); space_owner.free(p_rid);
memdelete(space); memdelete(space);

2
modules/godot_physics_3d/godot_physics_server_3d.h
View file

@ -371,7 +371,7 @@ public:
/* MISC */ /* MISC */
virtual void free(RID p_rid) override; virtual void free_rid(RID p_rid) override;
virtual void set_active(bool p_active) override; virtual void set_active(bool p_active) override;
virtual void init() override; virtual void init() override;

36
modules/gridmap/editor/grid_map_editor_plugin.cpp
View file

@ -507,7 +507,7 @@ void GridMapEditor::_clear_clipboard_data() {
if (E.instance.is_null()) { if (E.instance.is_null()) {
continue; continue;
} }
RenderingServer::get_singleton()->free(E.instance); RenderingServer::get_singleton()->free_rid(E.instance);
} }
clipboard_items.clear(); clipboard_items.clear();
@ -1172,16 +1172,16 @@ void GridMapEditor::_notification(int p_what) {
_clear_clipboard_data(); _clear_clipboard_data();
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
RS::get_singleton()->free(grid_instance[i]); RS::get_singleton()->free_rid(grid_instance[i]);
RS::get_singleton()->free(grid[i]); RS::get_singleton()->free_rid(grid[i]);
grid_instance[i] = RID(); grid_instance[i] = RID();
grid[i] = RID(); grid[i] = RID();
RenderingServer::get_singleton()->free(selection_level_instance[i]); RenderingServer::get_singleton()->free_rid(selection_level_instance[i]);
} }
RenderingServer::get_singleton()->free(cursor_instance); RenderingServer::get_singleton()->free_rid(cursor_instance);
RenderingServer::get_singleton()->free(selection_instance); RenderingServer::get_singleton()->free_rid(selection_instance);
RenderingServer::get_singleton()->free(paste_instance); RenderingServer::get_singleton()->free_rid(paste_instance);
cursor_instance = RID(); cursor_instance = RID();
selection_instance = RID(); selection_instance = RID();
paste_instance = RID(); paste_instance = RID();
@ -1233,7 +1233,7 @@ void GridMapEditor::_update_cursor_instance() {
} }
if (cursor_instance.is_valid()) { if (cursor_instance.is_valid()) {
RenderingServer::get_singleton()->free(cursor_instance); RenderingServer::get_singleton()->free_rid(cursor_instance);
} }
cursor_instance = RID(); cursor_instance = RID();
@ -1721,32 +1721,32 @@ GridMapEditor::~GridMapEditor() {
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
if (grid[i].is_valid()) { if (grid[i].is_valid()) {
RenderingServer::get_singleton()->free(grid[i]); RenderingServer::get_singleton()->free_rid(grid[i]);
} }
if (grid_instance[i].is_valid()) { if (grid_instance[i].is_valid()) {
RenderingServer::get_singleton()->free(grid_instance[i]); RenderingServer::get_singleton()->free_rid(grid_instance[i]);
} }
if (selection_level_instance[i].is_valid()) { if (selection_level_instance[i].is_valid()) {
RenderingServer::get_singleton()->free(selection_level_instance[i]); RenderingServer::get_singleton()->free_rid(selection_level_instance[i]);
} }
if (selection_level_mesh[i].is_valid()) { if (selection_level_mesh[i].is_valid()) {
RenderingServer::get_singleton()->free(selection_level_mesh[i]); RenderingServer::get_singleton()->free_rid(selection_level_mesh[i]);
} }
} }
RenderingServer::get_singleton()->free(cursor_mesh); RenderingServer::get_singleton()->free_rid(cursor_mesh);
if (cursor_instance.is_valid()) { if (cursor_instance.is_valid()) {
RenderingServer::get_singleton()->free(cursor_instance); RenderingServer::get_singleton()->free_rid(cursor_instance);
} }
RenderingServer::get_singleton()->free(selection_mesh); RenderingServer::get_singleton()->free_rid(selection_mesh);
if (selection_instance.is_valid()) { if (selection_instance.is_valid()) {
RenderingServer::get_singleton()->free(selection_instance); RenderingServer::get_singleton()->free_rid(selection_instance);
} }
RenderingServer::get_singleton()->free(paste_mesh); RenderingServer::get_singleton()->free_rid(paste_mesh);
if (paste_instance.is_valid()) { if (paste_instance.is_valid()) {
RenderingServer::get_singleton()->free(paste_instance); RenderingServer::get_singleton()->free_rid(paste_instance);
} }
} }

32
modules/gridmap/grid_map.cpp
View file

@ -618,11 +618,11 @@ bool GridMap::_octant_update(const OctantKey &p_key) {
//erase navigation //erase navigation
for (KeyValue<IndexKey, Octant::NavigationCell> &E : g.navigation_cell_ids) { for (KeyValue<IndexKey, Octant::NavigationCell> &E : g.navigation_cell_ids) {
if (E.value.region.is_valid()) { if (E.value.region.is_valid()) {
NavigationServer3D::get_singleton()->free(E.value.region); NavigationServer3D::get_singleton()->free_rid(E.value.region);
E.value.region = RID(); E.value.region = RID();
} }
if (E.value.navigation_mesh_debug_instance.is_valid()) { if (E.value.navigation_mesh_debug_instance.is_valid()) {
RS::get_singleton()->free(E.value.navigation_mesh_debug_instance); RS::get_singleton()->free_rid(E.value.navigation_mesh_debug_instance);
E.value.navigation_mesh_debug_instance = RID(); E.value.navigation_mesh_debug_instance = RID();
} }
} }
@ -632,8 +632,8 @@ bool GridMap::_octant_update(const OctantKey &p_key) {
//erase multimeshes //erase multimeshes
for (int i = 0; i < g.multimesh_instances.size(); i++) { for (int i = 0; i < g.multimesh_instances.size(); i++) {
RS::get_singleton()->free(g.multimesh_instances[i].instance); RS::get_singleton()->free_rid(g.multimesh_instances[i].instance);
RS::get_singleton()->free(g.multimesh_instances[i].multimesh); RS::get_singleton()->free_rid(g.multimesh_instances[i].multimesh);
} }
g.multimesh_instances.clear(); g.multimesh_instances.clear();
@ -945,11 +945,11 @@ void GridMap::_octant_exit_world(const OctantKey &p_key) {
#ifndef NAVIGATION_3D_DISABLED #ifndef NAVIGATION_3D_DISABLED
for (KeyValue<IndexKey, Octant::NavigationCell> &F : g.navigation_cell_ids) { for (KeyValue<IndexKey, Octant::NavigationCell> &F : g.navigation_cell_ids) {
if (F.value.region.is_valid()) { if (F.value.region.is_valid()) {
NavigationServer3D::get_singleton()->free(F.value.region); NavigationServer3D::get_singleton()->free_rid(F.value.region);
F.value.region = RID(); F.value.region = RID();
} }
if (F.value.navigation_mesh_debug_instance.is_valid()) { if (F.value.navigation_mesh_debug_instance.is_valid()) {
RS::get_singleton()->free(F.value.navigation_mesh_debug_instance); RS::get_singleton()->free_rid(F.value.navigation_mesh_debug_instance);
F.value.navigation_mesh_debug_instance = RID(); F.value.navigation_mesh_debug_instance = RID();
} }
} }
@ -958,7 +958,7 @@ void GridMap::_octant_exit_world(const OctantKey &p_key) {
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
if (bake_navigation) { if (bake_navigation) {
if (g.navigation_debug_edge_connections_instance.is_valid()) { if (g.navigation_debug_edge_connections_instance.is_valid()) {
RenderingServer::get_singleton()->free(g.navigation_debug_edge_connections_instance); RenderingServer::get_singleton()->free_rid(g.navigation_debug_edge_connections_instance);
g.navigation_debug_edge_connections_instance = RID(); g.navigation_debug_edge_connections_instance = RID();
} }
if (g.navigation_debug_edge_connections_mesh.is_valid()) { if (g.navigation_debug_edge_connections_mesh.is_valid()) {
@ -982,23 +982,23 @@ void GridMap::_octant_clean_up(const OctantKey &p_key) {
#ifndef PHYSICS_3D_DISABLED #ifndef PHYSICS_3D_DISABLED
if (g.collision_debug.is_valid()) { if (g.collision_debug.is_valid()) {
RS::get_singleton()->free(g.collision_debug); RS::get_singleton()->free_rid(g.collision_debug);
} }
if (g.collision_debug_instance.is_valid()) { if (g.collision_debug_instance.is_valid()) {
RS::get_singleton()->free(g.collision_debug_instance); RS::get_singleton()->free_rid(g.collision_debug_instance);
} }
PhysicsServer3D::get_singleton()->free(g.static_body); PhysicsServer3D::get_singleton()->free_rid(g.static_body);
#endif // PHYSICS_3D_DISABLED #endif // PHYSICS_3D_DISABLED
#ifndef NAVIGATION_3D_DISABLED #ifndef NAVIGATION_3D_DISABLED
// Erase navigation // Erase navigation
for (const KeyValue<IndexKey, Octant::NavigationCell> &E : g.navigation_cell_ids) { for (const KeyValue<IndexKey, Octant::NavigationCell> &E : g.navigation_cell_ids) {
if (E.value.region.is_valid()) { if (E.value.region.is_valid()) {
NavigationServer3D::get_singleton()->free(E.value.region); NavigationServer3D::get_singleton()->free_rid(E.value.region);
} }
if (E.value.navigation_mesh_debug_instance.is_valid()) { if (E.value.navigation_mesh_debug_instance.is_valid()) {
RS::get_singleton()->free(E.value.navigation_mesh_debug_instance); RS::get_singleton()->free_rid(E.value.navigation_mesh_debug_instance);
} }
} }
g.navigation_cell_ids.clear(); g.navigation_cell_ids.clear();
@ -1007,7 +1007,7 @@ void GridMap::_octant_clean_up(const OctantKey &p_key) {
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
if (bake_navigation) { if (bake_navigation) {
if (g.navigation_debug_edge_connections_instance.is_valid()) { if (g.navigation_debug_edge_connections_instance.is_valid()) {
RenderingServer::get_singleton()->free(g.navigation_debug_edge_connections_instance); RenderingServer::get_singleton()->free_rid(g.navigation_debug_edge_connections_instance);
g.navigation_debug_edge_connections_instance = RID(); g.navigation_debug_edge_connections_instance = RID();
} }
if (g.navigation_debug_edge_connections_mesh.is_valid()) { if (g.navigation_debug_edge_connections_mesh.is_valid()) {
@ -1019,8 +1019,8 @@ void GridMap::_octant_clean_up(const OctantKey &p_key) {
//erase multimeshes //erase multimeshes
for (int i = 0; i < g.multimesh_instances.size(); i++) { for (int i = 0; i < g.multimesh_instances.size(); i++) {
RS::get_singleton()->free(g.multimesh_instances[i].instance); RS::get_singleton()->free_rid(g.multimesh_instances[i].instance);
RS::get_singleton()->free(g.multimesh_instances[i].multimesh); RS::get_singleton()->free_rid(g.multimesh_instances[i].multimesh);
} }
g.multimesh_instances.clear(); g.multimesh_instances.clear();
} }
@ -1349,7 +1349,7 @@ Vector3 GridMap::_get_offset() const {
void GridMap::clear_baked_meshes() { void GridMap::clear_baked_meshes() {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
for (int i = 0; i < baked_meshes.size(); i++) { for (int i = 0; i < baked_meshes.size(); i++) {
RS::get_singleton()->free(baked_meshes[i].instance); RS::get_singleton()->free_rid(baked_meshes[i].instance);
} }
baked_meshes.clear(); baked_meshes.clear();

2
modules/jolt_physics/jolt_physics_server_3d.cpp
View file

@ -1580,7 +1580,7 @@ bool JoltPhysicsServer3D::joint_is_disabled_collisions_between_bodies(RID p_join
return joint->is_collision_disabled(); return joint->is_collision_disabled();
} }
void JoltPhysicsServer3D::free(RID p_rid) { void JoltPhysicsServer3D::free_rid(RID p_rid) {
if (JoltShape3D *shape = shape_owner.get_or_null(p_rid)) { if (JoltShape3D *shape = shape_owner.get_or_null(p_rid)) {
free_shape(shape); free_shape(shape);
} else if (JoltBody3D *body = body_owner.get_or_null(p_rid)) { } else if (JoltBody3D *body = body_owner.get_or_null(p_rid)) {

2
modules/jolt_physics/jolt_physics_server_3d.h
View file

@ -411,7 +411,7 @@ public:
virtual void joint_disable_collisions_between_bodies(RID p_joint, bool p_disable) override; virtual void joint_disable_collisions_between_bodies(RID p_joint, bool p_disable) override;
virtual bool joint_is_disabled_collisions_between_bodies(RID p_joint) const override; virtual bool joint_is_disabled_collisions_between_bodies(RID p_joint) const override;
virtual void free(RID p_rid) override; virtual void free_rid(RID p_rid) override;
virtual void set_active(bool p_active) override; virtual void set_active(bool p_active) override;

88
modules/lightmapper_rd/lightmapper_rd.cpp
View file

@ -804,7 +804,7 @@ LightmapperRD::BakeError LightmapperRD::_dilate(RenderingDevice *rd, Ref<RDShade
//no barrier, let them run all together //no barrier, let them run all together
} }
rd->compute_list_end(); rd->compute_list_end();
rd->free(compute_shader_dilate); rd->free_rid(compute_shader_dilate);
#ifdef DEBUG_TEXTURES #ifdef DEBUG_TEXTURES
for (int i = 0; i < atlas_slices; i++) { for (int i = 0; i < atlas_slices; i++) {
@ -841,7 +841,7 @@ LightmapperRD::BakeError LightmapperRD::_pack_l1(RenderingDevice *rd, Ref<RDShad
//no barrier, let them run all together //no barrier, let them run all together
} }
rd->compute_list_end(); rd->compute_list_end();
rd->free(compute_shader_pack); rd->free_rid(compute_shader_pack);
return BAKE_OK; return BAKE_OK;
} }
@ -1051,8 +1051,8 @@ LightmapperRD::BakeError LightmapperRD::_denoise(RenderingDevice *p_rd, Ref<RDSh
} }
} }
p_rd->free(compute_shader_denoise); p_rd->free_rid(compute_shader_denoise);
p_rd->free(denoise_params_buffer); p_rd->free_rid(denoise_params_buffer);
return BAKE_OK; return BAKE_OK;
} }
@ -1167,19 +1167,19 @@ LightmapperRD::BakeError LightmapperRD::bake(BakeQuality p_quality, bool p_use_d
RID shadowmask_tex; RID shadowmask_tex;
RID shadowmask_tex2; RID shadowmask_tex2;
#define FREE_TEXTURES \ #define FREE_TEXTURES \
rd->free(albedo_array_tex); \ rd->free_rid(albedo_array_tex); \
rd->free(emission_array_tex); \ rd->free_rid(emission_array_tex); \
rd->free(normal_tex); \ rd->free_rid(normal_tex); \
rd->free(position_tex); \ rd->free_rid(position_tex); \
rd->free(unocclude_tex); \ rd->free_rid(unocclude_tex); \
rd->free(light_source_tex); \ rd->free_rid(light_source_tex); \
rd->free(light_accum_tex2); \ rd->free_rid(light_accum_tex2); \
rd->free(light_accum_tex); \ rd->free_rid(light_accum_tex); \
rd->free(light_environment_tex); \ rd->free_rid(light_environment_tex); \
if (p_bake_shadowmask) { \ if (p_bake_shadowmask) { \
rd->free(shadowmask_tex); \ rd->free_rid(shadowmask_tex); \
rd->free(shadowmask_tex2); \ rd->free_rid(shadowmask_tex2); \
} }
{ // create all textures { // create all textures
@ -1284,17 +1284,17 @@ LightmapperRD::BakeError LightmapperRD::bake(BakeQuality p_quality, bool p_use_d
Vector<int> slice_seam_count; Vector<int> slice_seam_count;
#define FREE_BUFFERS \ #define FREE_BUFFERS \
rd->free(bake_parameters_buffer); \ rd->free_rid(bake_parameters_buffer); \
rd->free(vertex_buffer); \ rd->free_rid(vertex_buffer); \
rd->free(triangle_buffer); \ rd->free_rid(triangle_buffer); \
rd->free(lights_buffer); \ rd->free_rid(lights_buffer); \
rd->free(triangle_indices_buffer); \ rd->free_rid(triangle_indices_buffer); \
rd->free(cluster_indices_buffer); \ rd->free_rid(cluster_indices_buffer); \
rd->free(cluster_aabbs_buffer); \ rd->free_rid(cluster_aabbs_buffer); \
rd->free(grid_texture); \ rd->free_rid(grid_texture); \
rd->free(seams_buffer); \ rd->free_rid(seams_buffer); \
rd->free(probe_positions_buffer); rd->free_rid(probe_positions_buffer);
const uint32_t cluster_size = 16; const uint32_t cluster_size = 16;
_create_acceleration_structures(rd, atlas_size, atlas_slices, bounds, grid_size, cluster_size, probe_positions, p_generate_probes, slice_triangle_count, slice_seam_count, vertex_buffer, triangle_buffer, lights_buffer, triangle_indices_buffer, cluster_indices_buffer, cluster_aabbs_buffer, probe_positions_buffer, grid_texture, seams_buffer, p_step_function, p_bake_userdata); _create_acceleration_structures(rd, atlas_size, atlas_slices, bounds, grid_size, cluster_size, probe_positions, p_generate_probes, slice_triangle_count, slice_seam_count, vertex_buffer, triangle_buffer, lights_buffer, triangle_indices_buffer, cluster_indices_buffer, cluster_aabbs_buffer, probe_positions_buffer, grid_texture, seams_buffer, p_step_function, p_bake_userdata);
@ -1535,10 +1535,10 @@ LightmapperRD::BakeError LightmapperRD::bake(BakeQuality p_quality, bool p_use_d
} }
#endif #endif
#define FREE_RASTER_RESOURCES \ #define FREE_RASTER_RESOURCES \
rd->free(rasterize_shader); \ rd->free_rid(rasterize_shader); \
rd->free(sampler); \ rd->free_rid(sampler); \
rd->free(raster_depth_buffer); rd->free_rid(raster_depth_buffer);
/* Plot direct light */ /* Plot direct light */
@ -1596,11 +1596,11 @@ LightmapperRD::BakeError LightmapperRD::bake(BakeQuality p_quality, bool p_use_d
RID compute_base_uniform_set = rd->uniform_set_create(base_uniforms, compute_shader_primary, 0); RID compute_base_uniform_set = rd->uniform_set_create(base_uniforms, compute_shader_primary, 0);
#define FREE_COMPUTE_RESOURCES \ #define FREE_COMPUTE_RESOURCES \
rd->free(compute_shader_unocclude); \ rd->free_rid(compute_shader_unocclude); \
rd->free(compute_shader_primary); \ rd->free_rid(compute_shader_primary); \
rd->free(compute_shader_secondary); \ rd->free_rid(compute_shader_secondary); \
rd->free(compute_shader_light_probes); rd->free_rid(compute_shader_light_probes);
Vector3i group_size(Math::division_round_up(atlas_size.x, 8), Math::division_round_up(atlas_size.y, 8), 1); Vector3i group_size(Math::division_round_up(atlas_size.x, 8), Math::division_round_up(atlas_size.y, 8), 1);
rd->submit(); rd->submit();
@ -1957,7 +1957,7 @@ LightmapperRD::BakeError LightmapperRD::bake(BakeQuality p_quality, bool p_use_d
FREE_RASTER_RESOURCES FREE_RASTER_RESOURCES
FREE_COMPUTE_RESOURCES FREE_COMPUTE_RESOURCES
if (probe_positions.size() > 0) { if (probe_positions.size() > 0) {
rd->free(light_probe_buffer); rd->free_rid(light_probe_buffer);
} }
memdelete(rd); memdelete(rd);
if (rcd != nullptr) { if (rcd != nullptr) {
@ -2038,7 +2038,7 @@ LightmapperRD::BakeError LightmapperRD::bake(BakeQuality p_quality, bool p_use_d
FREE_RASTER_RESOURCES FREE_RASTER_RESOURCES
FREE_COMPUTE_RESOURCES FREE_COMPUTE_RESOURCES
if (probe_positions.size() > 0) { if (probe_positions.size() > 0) {
rd->free(light_probe_buffer); rd->free_rid(light_probe_buffer);
} }
memdelete(rd); memdelete(rd);
if (rcd != nullptr) { if (rcd != nullptr) {
@ -2073,7 +2073,7 @@ LightmapperRD::BakeError LightmapperRD::bake(BakeQuality p_quality, bool p_use_d
FREE_RASTER_RESOURCES FREE_RASTER_RESOURCES
FREE_COMPUTE_RESOURCES FREE_COMPUTE_RESOURCES
if (probe_positions.size() > 0) { if (probe_positions.size() > 0) {
rd->free(light_probe_buffer); rd->free_rid(light_probe_buffer);
} }
memdelete(rd); memdelete(rd);
if (rcd != nullptr) { if (rcd != nullptr) {
@ -2169,9 +2169,9 @@ LightmapperRD::BakeError LightmapperRD::bake(BakeQuality p_quality, bool p_use_d
ERR_FAIL_COND_V(blendseams_triangle_raster_shader.is_null(), BAKE_ERROR_LIGHTMAP_CANT_PRE_BAKE_MESHES); ERR_FAIL_COND_V(blendseams_triangle_raster_shader.is_null(), BAKE_ERROR_LIGHTMAP_CANT_PRE_BAKE_MESHES);
#define FREE_BLENDSEAMS_RESOURCES \ #define FREE_BLENDSEAMS_RESOURCES \
rd->free(blendseams_line_raster_shader); \ rd->free_rid(blendseams_line_raster_shader); \
rd->free(blendseams_triangle_raster_shader); rd->free_rid(blendseams_triangle_raster_shader);
{ {
//pre copy //pre copy
@ -2331,7 +2331,7 @@ LightmapperRD::BakeError LightmapperRD::bake(BakeQuality p_quality, bool p_use_d
probe_values.resize(probe_positions.size() * 9); probe_values.resize(probe_positions.size() * 9);
Vector<uint8_t> probe_data = rd->buffer_get_data(light_probe_buffer); Vector<uint8_t> probe_data = rd->buffer_get_data(light_probe_buffer);
memcpy(probe_values.ptrw(), probe_data.ptr(), probe_data.size()); memcpy(probe_values.ptrw(), probe_data.ptr(), probe_data.size());
rd->free(light_probe_buffer); rd->free_rid(light_probe_buffer);
#ifdef DEBUG_TEXTURES #ifdef DEBUG_TEXTURES
{ {

2
modules/navigation_2d/2d/godot_navigation_server_2d.cpp
View file

@ -1189,7 +1189,7 @@ void GodotNavigationServer2D::flush_queries() {
commands.clear(); commands.clear();
} }
COMMAND_1(free, RID, p_object) { COMMAND_1(free_rid, RID, p_object) {
if (geometry_parser_owner.owns(p_object)) { if (geometry_parser_owner.owns(p_object)) {
RWLockWrite write_lock(geometry_parser_rwlock); RWLockWrite write_lock(geometry_parser_rwlock);

2
modules/navigation_2d/2d/godot_navigation_server_2d.h
View file

@ -322,7 +322,7 @@ public:
virtual void query_path(const Ref<NavigationPathQueryParameters2D> &p_query_parameters, Ref<NavigationPathQueryResult2D> p_query_result, const Callable &p_callback = Callable()) override; virtual void query_path(const Ref<NavigationPathQueryParameters2D> &p_query_parameters, Ref<NavigationPathQueryResult2D> p_query_result, const Callable &p_callback = Callable()) override;
COMMAND_1(free, RID, p_object); COMMAND_1(free_rid, RID, p_object);
virtual void set_active(bool p_active) override; virtual void set_active(bool p_active) override;

2
modules/navigation_3d/3d/godot_navigation_server_3d.cpp
View file

@ -1227,7 +1227,7 @@ String GodotNavigationServer3D::get_baking_navigation_mesh_state_msg(Ref<Navigat
#endif // _3D_DISABLED #endif // _3D_DISABLED
} }
COMMAND_1(free, RID, p_object) { COMMAND_1(free_rid, RID, p_object) {
if (map_owner.owns(p_object)) { if (map_owner.owns(p_object)) {
NavMap3D *map = map_owner.get_or_null(p_object); NavMap3D *map = map_owner.get_or_null(p_object);

2
modules/navigation_3d/3d/godot_navigation_server_3d.h
View file

@ -280,7 +280,7 @@ public:
virtual Vector<Vector3> simplify_path(const Vector<Vector3> &p_path, real_t p_epsilon) override; virtual Vector<Vector3> simplify_path(const Vector<Vector3> &p_path, real_t p_epsilon) override;
public: public:
COMMAND_1(free, RID, p_object); COMMAND_1(free_rid, RID, p_object);
virtual void set_active(bool p_active) override; virtual void set_active(bool p_active) override;

8
modules/navigation_3d/editor/navigation_obstacle_3d_editor_plugin.cpp
View file

@ -882,20 +882,20 @@ NavigationObstacle3DEditorPlugin::~NavigationObstacle3DEditorPlugin() {
ERR_FAIL_NULL(rs); ERR_FAIL_NULL(rs);
if (point_lines_instance_rid.is_valid()) { if (point_lines_instance_rid.is_valid()) {
rs->free(point_lines_instance_rid); rs->free_rid(point_lines_instance_rid);
point_lines_instance_rid = RID(); point_lines_instance_rid = RID();
} }
if (point_lines_mesh_rid.is_valid()) { if (point_lines_mesh_rid.is_valid()) {
rs->free(point_lines_mesh_rid); rs->free_rid(point_lines_mesh_rid);
point_lines_mesh_rid = RID(); point_lines_mesh_rid = RID();
} }
if (point_handles_instance_rid.is_valid()) { if (point_handles_instance_rid.is_valid()) {
rs->free(point_handles_instance_rid); rs->free_rid(point_handles_instance_rid);
point_handles_instance_rid = RID(); point_handles_instance_rid = RID();
} }
if (point_handle_mesh_rid.is_valid()) { if (point_handle_mesh_rid.is_valid()) {
rs->free(point_handle_mesh_rid); rs->free_rid(point_handle_mesh_rid);
point_handle_mesh_rid = RID(); point_handle_mesh_rid = RID();
} }
} }

2
modules/noise/noise_texture_2d.cpp
View file

@ -41,7 +41,7 @@ NoiseTexture2D::NoiseTexture2D() {
NoiseTexture2D::~NoiseTexture2D() { NoiseTexture2D::~NoiseTexture2D() {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
if (texture.is_valid()) { if (texture.is_valid()) {
RS::get_singleton()->free(texture); RS::get_singleton()->free_rid(texture);
} }
if (noise_thread.is_started()) { if (noise_thread.is_started()) {
noise_thread.wait_to_finish(); noise_thread.wait_to_finish();

2
modules/noise/noise_texture_3d.cpp
View file

@ -41,7 +41,7 @@ NoiseTexture3D::NoiseTexture3D() {
NoiseTexture3D::~NoiseTexture3D() { NoiseTexture3D::~NoiseTexture3D() {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
if (texture.is_valid()) { if (texture.is_valid()) {
RS::get_singleton()->free(texture); RS::get_singleton()->free_rid(texture);
} }
if (noise_thread.is_started()) { if (noise_thread.is_started()) {
noise_thread.wait_to_finish(); noise_thread.wait_to_finish();

6
modules/openxr/extensions/openxr_visibility_mask_extension.cpp
View file

@ -120,19 +120,19 @@ void OpenXRVisibilityMaskExtension::on_session_destroyed() {
// Free our mesh. // Free our mesh.
if (mesh.is_valid()) { if (mesh.is_valid()) {
rendering_server->free(mesh); rendering_server->free_rid(mesh);
mesh = RID(); mesh = RID();
} }
// Free our material. // Free our material.
if (material.is_valid()) { if (material.is_valid()) {
rendering_server->free(material); rendering_server->free_rid(material);
material = RID(); material = RID();
} }
// Free our shader. // Free our shader.
if (shader.is_valid()) { if (shader.is_valid()) {
rendering_server->free(shader); rendering_server->free_rid(shader);
shader = RID(); shader = RID();
} }

2
modules/openxr/extensions/platform/openxr_d3d12_extension.cpp
View file

@ -306,7 +306,7 @@ void OpenXRD3D12Extension::cleanup_swapchain_graphics_data(void **p_swapchain_gr
for (const RID &texture_rid : data->texture_rids) { for (const RID &texture_rid : data->texture_rids) {
// This should clean up our RIDs and associated texture objects but shouldn't destroy the images, they are owned by our XrSwapchain. // This should clean up our RIDs and associated texture objects but shouldn't destroy the images, they are owned by our XrSwapchain.
rendering_device->free(texture_rid); rendering_device->free_rid(texture_rid);
} }
data->texture_rids.clear(); data->texture_rids.clear();

2
modules/openxr/extensions/platform/openxr_metal_extension.mm
View file

@ -289,7 +289,7 @@ void OpenXRMetalExtension::cleanup_swapchain_graphics_data(void **p_swapchain_gr
ERR_FAIL_NULL(rendering_device); ERR_FAIL_NULL(rendering_device);
for (const RID &texture_rid : data->texture_rids) { for (const RID &texture_rid : data->texture_rids) {
rendering_device->free(texture_rid); rendering_device->free_rid(texture_rid);
} }
data->texture_rids.clear(); data->texture_rids.clear();

4
modules/openxr/extensions/platform/openxr_vulkan_extension.cpp
View file

@ -459,13 +459,13 @@ void OpenXRVulkanExtension::cleanup_swapchain_graphics_data(void **p_swapchain_g
for (const RID &texture_rid : data->texture_rids) { for (const RID &texture_rid : data->texture_rids) {
// This should clean up our RIDs and associated texture objects but shouldn't destroy the images, they are owned by our XrSwapchain. // This should clean up our RIDs and associated texture objects but shouldn't destroy the images, they are owned by our XrSwapchain.
rendering_device->free(texture_rid); rendering_device->free_rid(texture_rid);
} }
data->texture_rids.clear(); data->texture_rids.clear();
for (int i = 0; i < data->density_map_rids.size(); i++) { for (int i = 0; i < data->density_map_rids.size(); i++) {
if (data->density_map_rids[i].is_valid()) { if (data->density_map_rids[i].is_valid()) {
rendering_device->free(data->density_map_rids[i]); rendering_device->free_rid(data->density_map_rids[i]);
} }
} }
data->density_map_rids.clear(); data->density_map_rids.clear();

4
scene/2d/cpu_particles_2d.cpp
View file

@ -1696,6 +1696,6 @@ CPUParticles2D::CPUParticles2D() {
CPUParticles2D::~CPUParticles2D() { CPUParticles2D::~CPUParticles2D() {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
RS::get_singleton()->free(multimesh); RS::get_singleton()->free_rid(multimesh);
RS::get_singleton()->free(mesh); RS::get_singleton()->free_rid(mesh);
} }

4
scene/2d/gpu_particles_2d.cpp
View file

@ -1011,6 +1011,6 @@ GPUParticles2D::GPUParticles2D() {
GPUParticles2D::~GPUParticles2D() { GPUParticles2D::~GPUParticles2D() {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
RS::get_singleton()->free(particles); RS::get_singleton()->free_rid(particles);
RS::get_singleton()->free(mesh); RS::get_singleton()->free_rid(mesh);
} }

2
scene/2d/light_2d.cpp
View file

@ -335,7 +335,7 @@ Light2D::Light2D() {
Light2D::~Light2D() { Light2D::~Light2D() {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
RenderingServer::get_singleton()->free(canvas_light); RenderingServer::get_singleton()->free_rid(canvas_light);
} }
////////////////////////////// //////////////////////////////

4
scene/2d/light_occluder_2d.cpp
View file

@ -150,7 +150,7 @@ OccluderPolygon2D::OccluderPolygon2D() {
OccluderPolygon2D::~OccluderPolygon2D() { OccluderPolygon2D::~OccluderPolygon2D() {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
RS::get_singleton()->free(occ_polygon); RS::get_singleton()->free_rid(occ_polygon);
} }
void LightOccluder2D::_poly_changed() { void LightOccluder2D::_poly_changed() {
@ -310,5 +310,5 @@ LightOccluder2D::LightOccluder2D() {
LightOccluder2D::~LightOccluder2D() { LightOccluder2D::~LightOccluder2D() {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
RS::get_singleton()->free(occluder); RS::get_singleton()->free_rid(occluder);
} }

4
scene/2d/navigation/navigation_agent_2d.cpp
View file

@ -349,7 +349,7 @@ NavigationAgent2D::NavigationAgent2D() {
NavigationAgent2D::~NavigationAgent2D() { NavigationAgent2D::~NavigationAgent2D() {
ERR_FAIL_NULL(NavigationServer2D::get_singleton()); ERR_FAIL_NULL(NavigationServer2D::get_singleton());
NavigationServer2D::get_singleton()->free(agent); NavigationServer2D::get_singleton()->free_rid(agent);
agent = RID(); // Pointless agent = RID(); // Pointless
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
@ -357,7 +357,7 @@ NavigationAgent2D::~NavigationAgent2D() {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
if (debug_path_instance.is_valid()) { if (debug_path_instance.is_valid()) {
RenderingServer::get_singleton()->free(debug_path_instance); RenderingServer::get_singleton()->free_rid(debug_path_instance);
} }
#endif // DEBUG_ENABLED #endif // DEBUG_ENABLED
} }

2
scene/2d/navigation/navigation_link_2d.cpp
View file

@ -440,6 +440,6 @@ NavigationLink2D::NavigationLink2D() {
NavigationLink2D::~NavigationLink2D() { NavigationLink2D::~NavigationLink2D() {
ERR_FAIL_NULL(NavigationServer2D::get_singleton()); ERR_FAIL_NULL(NavigationServer2D::get_singleton());
NavigationServer2D::get_singleton()->free(link); NavigationServer2D::get_singleton()->free_rid(link);
link = RID(); link = RID();
} }

6
scene/2d/navigation/navigation_obstacle_2d.cpp
View file

@ -198,16 +198,16 @@ NavigationObstacle2D::NavigationObstacle2D() {
NavigationObstacle2D::~NavigationObstacle2D() { NavigationObstacle2D::~NavigationObstacle2D() {
ERR_FAIL_NULL(NavigationServer2D::get_singleton()); ERR_FAIL_NULL(NavigationServer2D::get_singleton());
NavigationServer2D::get_singleton()->free(obstacle); NavigationServer2D::get_singleton()->free_rid(obstacle);
obstacle = RID(); obstacle = RID();
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
if (debug_mesh_rid.is_valid()) { if (debug_mesh_rid.is_valid()) {
RenderingServer::get_singleton()->free(debug_mesh_rid); RenderingServer::get_singleton()->free_rid(debug_mesh_rid);
debug_mesh_rid = RID(); debug_mesh_rid = RID();
} }
if (debug_canvas_item.is_valid()) { if (debug_canvas_item.is_valid()) {
RenderingServer::get_singleton()->free(debug_canvas_item); RenderingServer::get_singleton()->free_rid(debug_canvas_item);
debug_canvas_item = RID(); debug_canvas_item = RID();
} }
#endif // DEBUG_ENABLED #endif // DEBUG_ENABLED

6
scene/2d/navigation/navigation_region_2d.cpp
View file

@ -394,16 +394,16 @@ NavigationRegion2D::NavigationRegion2D() {
NavigationRegion2D::~NavigationRegion2D() { NavigationRegion2D::~NavigationRegion2D() {
ERR_FAIL_NULL(NavigationServer2D::get_singleton()); ERR_FAIL_NULL(NavigationServer2D::get_singleton());
NavigationServer2D::get_singleton()->free(region); NavigationServer2D::get_singleton()->free_rid(region);
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
NavigationServer2D::get_singleton()->disconnect(SNAME("map_changed"), callable_mp(this, &NavigationRegion2D::_navigation_map_changed)); NavigationServer2D::get_singleton()->disconnect(SNAME("map_changed"), callable_mp(this, &NavigationRegion2D::_navigation_map_changed));
NavigationServer2D::get_singleton()->disconnect(SNAME("navigation_debug_changed"), callable_mp(this, &NavigationRegion2D::_navigation_debug_changed)); NavigationServer2D::get_singleton()->disconnect(SNAME("navigation_debug_changed"), callable_mp(this, &NavigationRegion2D::_navigation_debug_changed));
if (debug_instance_rid.is_valid()) { if (debug_instance_rid.is_valid()) {
RS::get_singleton()->free(debug_instance_rid); RS::get_singleton()->free_rid(debug_instance_rid);
} }
if (debug_mesh_rid.is_valid()) { if (debug_mesh_rid.is_valid()) {
RS::get_singleton()->free(debug_mesh_rid); RS::get_singleton()->free_rid(debug_mesh_rid);
} }
#endif // DEBUG_ENABLED #endif // DEBUG_ENABLED
} }

4
scene/2d/path_2d.cpp
View file

@ -127,11 +127,11 @@ void Path2D::_debug_free() {
ERR_FAIL_NULL(RS::get_singleton()); ERR_FAIL_NULL(RS::get_singleton());
if (debug_instance.is_valid()) { if (debug_instance.is_valid()) {
RS::get_singleton()->free(debug_instance); RS::get_singleton()->free_rid(debug_instance);
debug_instance = RID(); debug_instance = RID();
} }
if (debug_mesh_rid.is_valid()) { if (debug_mesh_rid.is_valid()) {
RS::get_singleton()->free(debug_mesh_rid); RS::get_singleton()->free_rid(debug_mesh_rid);
debug_mesh_rid = RID(); debug_mesh_rid = RID();
} }
} }

2
scene/2d/physics/collision_object_2d.cpp
View file

@ -682,5 +682,5 @@ CollisionObject2D::CollisionObject2D() {
CollisionObject2D::~CollisionObject2D() { CollisionObject2D::~CollisionObject2D() {
ERR_FAIL_NULL(PhysicsServer2D::get_singleton()); ERR_FAIL_NULL(PhysicsServer2D::get_singleton());
PhysicsServer2D::get_singleton()->free(rid); PhysicsServer2D::get_singleton()->free_rid(rid);
} }

2
scene/2d/physics/joints/joint_2d.cpp
View file

@ -253,5 +253,5 @@ Joint2D::Joint2D() {
Joint2D::~Joint2D() { Joint2D::~Joint2D() {
ERR_FAIL_NULL(PhysicsServer2D::get_singleton()); ERR_FAIL_NULL(PhysicsServer2D::get_singleton());
PhysicsServer2D::get_singleton()->free(joint); PhysicsServer2D::get_singleton()->free_rid(joint);
} }

2
scene/2d/polygon_2d.cpp
View file

@ -731,5 +731,5 @@ Polygon2D::~Polygon2D() {
// This will free the internally-allocated mesh instance, if allocated. // This will free the internally-allocated mesh instance, if allocated.
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
RS::get_singleton()->canvas_item_attach_skeleton(get_canvas_item(), RID()); RS::get_singleton()->canvas_item_attach_skeleton(get_canvas_item(), RID());
RS::get_singleton()->free(mesh); RS::get_singleton()->free_rid(mesh);
} }

4
scene/2d/skeleton_2d.cpp
View file

@ -504,7 +504,7 @@ Bone2D::~Bone2D() {
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
if (!editor_gizmo_rid.is_null()) { if (!editor_gizmo_rid.is_null()) {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
RenderingServer::get_singleton()->free(editor_gizmo_rid); RenderingServer::get_singleton()->free_rid(editor_gizmo_rid);
} }
#endif // TOOLS_ENABLED #endif // TOOLS_ENABLED
} }
@ -838,5 +838,5 @@ Skeleton2D::Skeleton2D() {
Skeleton2D::~Skeleton2D() { Skeleton2D::~Skeleton2D() {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
RS::get_singleton()->free(skeleton); RS::get_singleton()->free_rid(skeleton);
} }

34
scene/2d/tile_map_layer.cpp
View file

@ -73,10 +73,10 @@ void TileMapLayer::_debug_update(bool p_force_cleanup) {
// Free the quadrant. // Free the quadrant.
Ref<DebugQuadrant> &debug_quadrant = kv.value; Ref<DebugQuadrant> &debug_quadrant = kv.value;
if (debug_quadrant->canvas_item.is_valid()) { if (debug_quadrant->canvas_item.is_valid()) {
rs->free(debug_quadrant->canvas_item); rs->free_rid(debug_quadrant->canvas_item);
} }
if (debug_quadrant->physics_mesh.is_valid()) { if (debug_quadrant->physics_mesh.is_valid()) {
rs->free(debug_quadrant->physics_mesh); rs->free_rid(debug_quadrant->physics_mesh);
} }
} }
debug_quadrant_map.clear(); debug_quadrant_map.clear();
@ -192,7 +192,7 @@ void TileMapLayer::_debug_update(bool p_force_cleanup) {
if (!debug_quadrant->drawn_to) { if (!debug_quadrant->drawn_to) {
// Free the quadrant. // Free the quadrant.
if (ci.is_valid()) { if (ci.is_valid()) {
rs->free(ci); rs->free_rid(ci);
} }
debug_quadrant_map.erase(quadrant_coords); debug_quadrant_map.erase(quadrant_coords);
} }
@ -244,7 +244,7 @@ void TileMapLayer::_rendering_update(bool p_force_cleanup) {
for (const KeyValue<Vector2i, Ref<RenderingQuadrant>> &kv : rendering_quadrant_map) { for (const KeyValue<Vector2i, Ref<RenderingQuadrant>> &kv : rendering_quadrant_map) {
for (const RID &ci : kv.value->canvas_items) { for (const RID &ci : kv.value->canvas_items) {
if (ci.is_valid()) { if (ci.is_valid()) {
rs->free(ci); rs->free_rid(ci);
} }
} }
kv.value->cells.clear(); kv.value->cells.clear();
@ -291,7 +291,7 @@ void TileMapLayer::_rendering_update(bool p_force_cleanup) {
// First, clear the quadrant's canvas items. // First, clear the quadrant's canvas items.
for (RID &ci : rendering_quadrant->canvas_items) { for (RID &ci : rendering_quadrant->canvas_items) {
rs->free(ci); rs->free_rid(ci);
} }
rendering_quadrant->canvas_items.clear(); rendering_quadrant->canvas_items.clear();
@ -387,7 +387,7 @@ void TileMapLayer::_rendering_update(bool p_force_cleanup) {
// Free the quadrant. // Free the quadrant.
for (const RID &ci : rendering_quadrant->canvas_items) { for (const RID &ci : rendering_quadrant->canvas_items) {
if (ci.is_valid()) { if (ci.is_valid()) {
rs->free(ci); rs->free_rid(ci);
} }
} }
rendering_quadrant->cells.clear(); rendering_quadrant->cells.clear();
@ -601,7 +601,7 @@ void TileMapLayer::_rendering_occluders_clear_cell(CellData &r_cell_data) {
// Free the occluders. // Free the occluders.
for (const LocalVector<RID> &polygons : r_cell_data.occluders) { for (const LocalVector<RID> &polygons : r_cell_data.occluders) {
for (const RID &rid : polygons) { for (const RID &rid : polygons) {
rs->free(rid); rs->free_rid(rid);
} }
} }
r_cell_data.occluders.clear(); r_cell_data.occluders.clear();
@ -614,7 +614,7 @@ void TileMapLayer::_rendering_occluders_update_cell(CellData &r_cell_data) {
for (uint32_t i = tile_set->get_occlusion_layers_count(); i < r_cell_data.occluders.size(); i++) { for (uint32_t i = tile_set->get_occlusion_layers_count(); i < r_cell_data.occluders.size(); i++) {
for (const RID &occluder_id : r_cell_data.occluders[i]) { for (const RID &occluder_id : r_cell_data.occluders[i]) {
if (occluder_id.is_valid()) { if (occluder_id.is_valid()) {
rs->free(occluder_id); rs->free_rid(occluder_id);
} }
} }
} }
@ -649,7 +649,7 @@ void TileMapLayer::_rendering_occluders_update_cell(CellData &r_cell_data) {
for (uint32_t i = tile_data->get_occluder_polygons_count(occlusion_layer_index); i < r_cell_data.occluders[occlusion_layer_index].size(); i++) { for (uint32_t i = tile_data->get_occluder_polygons_count(occlusion_layer_index); i < r_cell_data.occluders[occlusion_layer_index].size(); i++) {
RID occluder_id = occluders[i]; RID occluder_id = occluders[i];
if (occluder_id.is_valid()) { if (occluder_id.is_valid()) {
rs->free(occluder_id); rs->free_rid(occluder_id);
} }
} }
occluders.resize(tile_data->get_occluder_polygons_count(occlusion_layer_index)); occluders.resize(tile_data->get_occluder_polygons_count(occlusion_layer_index));
@ -676,7 +676,7 @@ void TileMapLayer::_rendering_occluders_update_cell(CellData &r_cell_data) {
} else { } else {
// Clear occluder. // Clear occluder.
if (occluder.is_valid()) { if (occluder.is_valid()) {
rs->free(occluder); rs->free_rid(occluder);
occluder = RID(); occluder = RID();
} }
} }
@ -764,7 +764,7 @@ void TileMapLayer::_physics_update(bool p_force_cleanup) {
for (KeyValue<PhysicsQuadrant::PhysicsBodyKey, PhysicsQuadrant::PhysicsBodyValue> &kvbody : kv.value->bodies) { for (KeyValue<PhysicsQuadrant::PhysicsBodyKey, PhysicsQuadrant::PhysicsBodyValue> &kvbody : kv.value->bodies) {
if (kvbody.value.body.is_valid()) { if (kvbody.value.body.is_valid()) {
bodies_coords.erase(kvbody.value.body); bodies_coords.erase(kvbody.value.body);
ps->free(kvbody.value.body); ps->free_rid(kvbody.value.body);
} }
} }
kv.value->bodies.clear(); kv.value->bodies.clear();
@ -817,7 +817,7 @@ void TileMapLayer::_physics_update(bool p_force_cleanup) {
RID &body = kvbody.value.body; RID &body = kvbody.value.body;
if (body.is_valid()) { if (body.is_valid()) {
bodies_coords.erase(body); bodies_coords.erase(body);
ps->free(body); ps->free_rid(body);
body = RID(); body = RID();
} }
} }
@ -940,7 +940,7 @@ void TileMapLayer::_physics_update(bool p_force_cleanup) {
RID &body = kv.value.body; RID &body = kv.value.body;
if (body.is_valid()) { if (body.is_valid()) {
bodies_coords.erase(body); bodies_coords.erase(body);
ps->free(body); ps->free_rid(body);
} }
} }
physics_quadrant->bodies.clear(); physics_quadrant->bodies.clear();
@ -1296,7 +1296,7 @@ void TileMapLayer::_navigation_update(bool p_force_cleanup) {
if (tile_map_node) { if (tile_map_node) {
if (forced_cleanup) { if (forced_cleanup) {
if (navigation_map_override.is_valid()) { if (navigation_map_override.is_valid()) {
ns->free(navigation_map_override); ns->free_rid(navigation_map_override);
navigation_map_override = RID(); navigation_map_override = RID();
} }
} else { } else {
@ -1367,7 +1367,7 @@ void TileMapLayer::_navigation_clear_cell(CellData &r_cell_data) {
const RID &region = r_cell_data.navigation_regions[i]; const RID &region = r_cell_data.navigation_regions[i];
if (region.is_valid()) { if (region.is_valid()) {
ns->region_set_map(region, RID()); ns->region_set_map(region, RID());
ns->free(region); ns->free_rid(region);
} }
} }
r_cell_data.navigation_regions.clear(); r_cell_data.navigation_regions.clear();
@ -1406,7 +1406,7 @@ void TileMapLayer::_navigation_update_cell(CellData &r_cell_data) {
RID &region = r_cell_data.navigation_regions[i]; RID &region = r_cell_data.navigation_regions[i];
if (region.is_valid()) { if (region.is_valid()) {
ns->region_set_map(region, RID()); ns->region_set_map(region, RID());
ns->free(region); ns->free_rid(region);
region = RID(); region = RID();
} }
} }
@ -1434,7 +1434,7 @@ void TileMapLayer::_navigation_update_cell(CellData &r_cell_data) {
// Clear region. // Clear region.
if (region.is_valid()) { if (region.is_valid()) {
ns->region_set_map(region, RID()); ns->region_set_map(region, RID());
ns->free(region); ns->free_rid(region);
region = RID(); region = RID();
} }
} }

4
scene/3d/camera_3d.cpp
View file

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

2
scene/3d/cpu_particles_3d.cpp
View file

@ -1822,5 +1822,5 @@ CPUParticles3D::CPUParticles3D() {
CPUParticles3D::~CPUParticles3D() { CPUParticles3D::~CPUParticles3D() {
ERR_FAIL_NULL(RenderingServer::get_singleton()); 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() { Decal::~Decal() {
ERR_FAIL_NULL(RenderingServer::get_singleton()); 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() { FogVolume::~FogVolume() {
ERR_FAIL_NULL(RenderingServer::get_singleton()); 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() { GPUParticles3D::~GPUParticles3D() {
ERR_FAIL_NULL(RenderingServer::get_singleton()); 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() { GPUParticlesCollision3D::~GPUParticlesCollision3D() {
ERR_FAIL_NULL(RenderingServer::get_singleton()); 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() { GPUParticlesAttractor3D::~GPUParticlesAttractor3D() {
ERR_FAIL_NULL(RenderingServer::get_singleton()); 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. // Clear materials.
for (const KeyValue<SurfaceKey, SurfaceData> &E : surfaces) { for (const KeyValue<SurfaceKey, SurfaceData> &E : surfaces) {
RenderingServer::get_singleton()->free(E.value.material); RenderingServer::get_singleton()->free_rid(E.value.material);
} }
surfaces.clear(); surfaces.clear();
@ -1105,9 +1105,9 @@ Label3D::~Label3D() {
TS->free_rid(text_rid); TS->free_rid(text_rid);
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
RenderingServer::get_singleton()->free(mesh); RenderingServer::get_singleton()->free_rid(mesh);
for (KeyValue<SurfaceKey, SurfaceData> E : surfaces) { for (KeyValue<SurfaceKey, SurfaceData> E : surfaces) {
RenderingServer::get_singleton()->free(E.value.material); RenderingServer::get_singleton()->free_rid(E.value.material);
} }
surfaces.clear(); 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()); RS::get_singleton()->instance_set_base(get_instance(), RID());
if (light.is_valid()) { 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() { LightmapGIData::~LightmapGIData() {
ERR_FAIL_NULL(RenderingServer::get_singleton()); 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() { NavigationAgent3D::~NavigationAgent3D() {
ERR_FAIL_NULL(NavigationServer3D::get_singleton()); ERR_FAIL_NULL(NavigationServer3D::get_singleton());
NavigationServer3D::get_singleton()->free(agent); NavigationServer3D::get_singleton()->free_rid(agent);
agent = RID(); // Pointless agent = RID(); // Pointless
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
@ -391,10 +391,10 @@ NavigationAgent3D::~NavigationAgent3D() {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
if (debug_path_instance.is_valid()) { 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()) { 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 #endif // DEBUG_ENABLED
} }

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

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

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

@ -232,7 +232,7 @@ NavigationObstacle3D::~NavigationObstacle3D() {
NavigationServer3D *ns3d = NavigationServer3D::get_singleton(); NavigationServer3D *ns3d = NavigationServer3D::get_singleton();
ERR_FAIL_NULL(ns3d); ERR_FAIL_NULL(ns3d);
ns3d->free(obstacle); ns3d->free_rid(obstacle);
obstacle = RID(); obstacle = RID();
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
@ -242,19 +242,19 @@ NavigationObstacle3D::~NavigationObstacle3D() {
RenderingServer *rs = RenderingServer::get_singleton(); RenderingServer *rs = RenderingServer::get_singleton();
ERR_FAIL_NULL(rs); ERR_FAIL_NULL(rs);
if (fake_agent_radius_debug_instance_rid.is_valid()) { 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(); fake_agent_radius_debug_instance_rid = RID();
} }
if (fake_agent_radius_debug_mesh_rid.is_valid()) { 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(); fake_agent_radius_debug_mesh_rid = RID();
} }
if (static_obstacle_debug_instance_rid.is_valid()) { 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(); static_obstacle_debug_instance_rid = RID();
} }
if (static_obstacle_debug_mesh_rid.is_valid()) { 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(); static_obstacle_debug_mesh_rid = RID();
} }
#endif // DEBUG_ENABLED #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)); navigation_mesh->disconnect_changed(callable_mp(this, &NavigationRegion3D::_navigation_mesh_changed));
} }
ERR_FAIL_NULL(NavigationServer3D::get_singleton()); ERR_FAIL_NULL(NavigationServer3D::get_singleton());
NavigationServer3D::get_singleton()->free(region); NavigationServer3D::get_singleton()->free_rid(region);
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
NavigationServer3D::get_singleton()->disconnect(SNAME("map_changed"), callable_mp(this, &NavigationRegion3D::_navigation_map_changed)); 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()); ERR_FAIL_NULL(RenderingServer::get_singleton());
if (debug_instance.is_valid()) { if (debug_instance.is_valid()) {
RenderingServer::get_singleton()->free(debug_instance); RenderingServer::get_singleton()->free_rid(debug_instance);
} }
if (debug_mesh.is_valid()) { 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()) { 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()) { 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 #endif // DEBUG_ENABLED
} }

2
scene/3d/occluder_instance_3d.cpp
View file

@ -136,7 +136,7 @@ Occluder3D::Occluder3D() {
Occluder3D::~Occluder3D() { Occluder3D::~Occluder3D() {
if (occluder.is_valid()) { if (occluder.is_valid()) {
ERR_FAIL_NULL(RenderingServer::get_singleton()); 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() { Path3D::~Path3D() {
if (debug_instance.is_valid()) { if (debug_instance.is_valid()) {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
RS::get_singleton()->free(debug_instance); RS::get_singleton()->free_rid(debug_instance);
} }
if (debug_mesh.is_valid()) { if (debug_mesh.is_valid()) {
ERR_FAIL_NULL(RenderingServer::get_singleton()); 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]; ShapeData::ShapeBase &s = shape_bases[i];
if (s.shape.is_null() || shapedata.disabled) { if (s.shape.is_null() || shapedata.disabled) {
if (s.debug_shape.is_valid()) { 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(); s.debug_shape = RID();
--debug_shapes_count; --debug_shapes_count;
} }
@ -418,7 +418,7 @@ void CollisionObject3D::_clear_debug_shapes() {
for (int i = 0; i < shapedata.shapes.size(); i++) { for (int i = 0; i < shapedata.shapes.size(); i++) {
ShapeData::ShapeBase &s = shape_bases[i]; ShapeData::ShapeBase &s = shape_bases[i];
if (s.debug_shape.is_valid()) { 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(); s.debug_shape = RID();
if (s.shape.is_valid()) { if (s.shape.is_valid()) {
s.shape->disconnect_changed(callable_mp(this, &CollisionObject3D::_update_shape_data)); 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()) { 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()) { if (s.shape.is_valid()) {
s.shape->disconnect_changed(callable_mp(this, &CollisionObject3D::_shape_changed)); s.shape->disconnect_changed(callable_mp(this, &CollisionObject3D::_shape_changed));
} }
@ -757,5 +757,5 @@ CollisionObject3D::CollisionObject3D() {
CollisionObject3D::~CollisionObject3D() { CollisionObject3D::~CollisionObject3D() {
ERR_FAIL_NULL(PhysicsServer3D::get_singleton()); 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() { Joint3D::~Joint3D() {
ERR_FAIL_NULL(PhysicsServer3D::get_singleton()); 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); memdelete(joint_data);
} }
ERR_FAIL_NULL(PhysicsServer3D::get_singleton()); ERR_FAIL_NULL(PhysicsServer3D::get_singleton());
PhysicsServer3D::get_singleton()->free(joint); PhysicsServer3D::get_singleton()->free_rid(joint);
} }
void PhysicalBone3D::update_bone_id() { 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() { void RayCast3D::_clear_debug_shape() {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
if (debug_instance.is_valid()) { if (debug_instance.is_valid()) {
RenderingServer::get_singleton()->free(debug_instance); RenderingServer::get_singleton()->free_rid(debug_instance);
debug_instance = RID(); debug_instance = RID();
} }
if (debug_mesh.is_valid()) { 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>(); 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() { void ShapeCast3D::_clear_debug_shape() {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
if (debug_instance.is_valid()) { if (debug_instance.is_valid()) {
RenderingServer::get_singleton()->free(debug_instance); RenderingServer::get_singleton()->free_rid(debug_instance);
debug_instance = RID(); debug_instance = RID();
} }
if (debug_mesh.is_valid()) { 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>(); debug_mesh = Ref<ArrayMesh>();
} }
} }

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

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

2
scene/3d/reflection_probe.cpp
View file

@ -309,5 +309,5 @@ ReflectionProbe::ReflectionProbe() {
ReflectionProbe::~ReflectionProbe() { ReflectionProbe::~ReflectionProbe() {
ERR_FAIL_NULL(RenderingServer::get_singleton()); 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) { if (skeleton_node) {
skeleton_node->skin_bindings.erase(this); 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() { SpriteBase3D::~SpriteBase3D() {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
RenderingServer::get_singleton()->free(mesh); RenderingServer::get_singleton()->free_rid(mesh);
RenderingServer::get_singleton()->free(material); 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(); RID base_old = get_base();
set_base(RID()); set_base(RID());
ERR_FAIL_NULL(RenderingServer::get_singleton()); 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() { VisualInstance3D::~VisualInstance3D() {
ERR_FAIL_NULL(RenderingServer::get_singleton()); 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) { 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() { VoxelGIData::~VoxelGIData() {
ERR_FAIL_NULL(RenderingServer::get_singleton()); 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() { VoxelGI::~VoxelGI() {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
RS::get_singleton()->free(voxel_gi); RS::get_singleton()->free_rid(voxel_gi);
} }

6
scene/debugger/scene_debugger.cpp
View file

@ -1501,9 +1501,9 @@ RuntimeNodeSelect::~RuntimeNodeSelect() {
} }
if (draw_canvas.is_valid()) { if (draw_canvas.is_valid()) {
RS::get_singleton()->free(sel_drag_ci); RS::get_singleton()->free_rid(sel_drag_ci);
RS::get_singleton()->free(sbox_2d_ci); RS::get_singleton()->free_rid(sbox_2d_ci);
RS::get_singleton()->free(draw_canvas); RS::get_singleton()->free_rid(draw_canvas);
} }
} }

8
scene/debugger/scene_debugger.h
View file

@ -355,10 +355,10 @@ private:
~SelectionBox3D() { ~SelectionBox3D() {
if (instance.is_valid()) { if (instance.is_valid()) {
RS::get_singleton()->free(instance); RS::get_singleton()->free_rid(instance);
RS::get_singleton()->free(instance_ofs); RS::get_singleton()->free_rid(instance_ofs);
RS::get_singleton()->free(instance_xray); RS::get_singleton()->free_rid(instance_xray);
RS::get_singleton()->free(instance_xray_ofs); RS::get_singleton()->free_rid(instance_xray_ofs);
} }
} }
}; };

2
scene/gui/text_edit.cpp
View file

@ -9324,5 +9324,5 @@ TextEdit::TextEdit(const String &p_placeholder) {
} }
TextEdit::~TextEdit() { TextEdit::~TextEdit() {
RS::get_singleton()->free(text_ci); RS::get_singleton()->free_rid(text_ci);
} }

4
scene/main/canvas_item.cpp
View file

@ -1780,7 +1780,7 @@ CanvasItem::CanvasItem() :
CanvasItem::~CanvasItem() { CanvasItem::~CanvasItem() {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
RenderingServer::get_singleton()->free(canvas_item); RenderingServer::get_singleton()->free_rid(canvas_item);
} }
/////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////
@ -1962,5 +1962,5 @@ CanvasTexture::CanvasTexture() {
} }
CanvasTexture::~CanvasTexture() { CanvasTexture::~CanvasTexture() {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
RS::get_singleton()->free(canvas_texture); RS::get_singleton()->free_rid(canvas_texture);
} }

2
scene/main/canvas_layer.cpp
View file

@ -359,5 +359,5 @@ CanvasLayer::CanvasLayer() {
CanvasLayer::~CanvasLayer() { CanvasLayer::~CanvasLayer() {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
RS::get_singleton()->free(canvas); RS::get_singleton()->free_rid(canvas);
} }

18
scene/main/viewport.cpp
View file

@ -203,7 +203,7 @@ void ViewportTexture::_setup_local_to_scene(const Node *p_loc_scene) {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
if (proxy_ph.is_valid()) { if (proxy_ph.is_valid()) {
RS::get_singleton()->texture_proxy_update(proxy, vp->texture_rid); RS::get_singleton()->texture_proxy_update(proxy, vp->texture_rid);
RS::get_singleton()->free(proxy_ph); RS::get_singleton()->free_rid(proxy_ph);
proxy_ph = RID(); proxy_ph = RID();
} else { } else {
ERR_FAIL_COND(proxy.is_valid()); // Should be invalid. ERR_FAIL_COND(proxy.is_valid()); // Should be invalid.
@ -233,10 +233,10 @@ ViewportTexture::~ViewportTexture() {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
if (proxy_ph.is_valid()) { if (proxy_ph.is_valid()) {
RS::get_singleton()->free(proxy_ph); RS::get_singleton()->free_rid(proxy_ph);
} }
if (proxy.is_valid()) { if (proxy.is_valid()) {
RS::get_singleton()->free(proxy); RS::get_singleton()->free_rid(proxy);
} }
} }
@ -466,11 +466,11 @@ void Viewport::_sub_window_remove(Window *p_window) {
sw.window->_mouse_leave_viewport(); sw.window->_mouse_leave_viewport();
gui.subwindow_over = nullptr; gui.subwindow_over = nullptr;
} }
RS::get_singleton()->free(sw.canvas_item); RS::get_singleton()->free_rid(sw.canvas_item);
gui.sub_windows.remove_at(index); gui.sub_windows.remove_at(index);
if (gui.sub_windows.is_empty()) { if (gui.sub_windows.is_empty()) {
RS::get_singleton()->free(subwindow_canvas); RS::get_singleton()->free_rid(subwindow_canvas);
subwindow_canvas = RID(); subwindow_canvas = RID();
} }
@ -633,15 +633,15 @@ void Viewport::_notification(int p_what) {
RenderingServer::get_singleton()->viewport_remove_canvas(viewport, current_canvas); RenderingServer::get_singleton()->viewport_remove_canvas(viewport, current_canvas);
#ifndef PHYSICS_2D_DISABLED #ifndef PHYSICS_2D_DISABLED
if (contact_2d_debug.is_valid()) { if (contact_2d_debug.is_valid()) {
RenderingServer::get_singleton()->free(contact_2d_debug); RenderingServer::get_singleton()->free_rid(contact_2d_debug);
contact_2d_debug = RID(); contact_2d_debug = RID();
} }
#endif // PHYSICS_2D_DISABLED #endif // PHYSICS_2D_DISABLED
#ifndef PHYSICS_3D_DISABLED #ifndef PHYSICS_3D_DISABLED
if (contact_3d_debug_multimesh.is_valid()) { if (contact_3d_debug_multimesh.is_valid()) {
RenderingServer::get_singleton()->free(contact_3d_debug_multimesh); RenderingServer::get_singleton()->free_rid(contact_3d_debug_multimesh);
RenderingServer::get_singleton()->free(contact_3d_debug_instance); RenderingServer::get_singleton()->free_rid(contact_3d_debug_instance);
contact_3d_debug_instance = RID(); contact_3d_debug_instance = RID();
contact_3d_debug_multimesh = RID(); contact_3d_debug_multimesh = RID();
} }
@ -5338,7 +5338,7 @@ Viewport::~Viewport() {
world_2d->remove_viewport(this); world_2d->remove_viewport(this);
} }
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
RenderingServer::get_singleton()->free(viewport); RenderingServer::get_singleton()->free_rid(viewport);
} }
///////////////////////////////// /////////////////////////////////

2
scene/resources/2d/shape_2d.cpp
View file

@ -119,5 +119,5 @@ Shape2D::Shape2D(const RID &p_rid) {
Shape2D::~Shape2D() { Shape2D::~Shape2D() {
ERR_FAIL_NULL(PhysicsServer2D::get_singleton()); ERR_FAIL_NULL(PhysicsServer2D::get_singleton());
PhysicsServer2D::get_singleton()->free(shape); PhysicsServer2D::get_singleton()->free_rid(shape);
} }

2
scene/resources/3d/fog_material.cpp
View file

@ -133,7 +133,7 @@ void FogMaterial::_bind_methods() {
void FogMaterial::cleanup_shader() { void FogMaterial::cleanup_shader() {
if (shader.is_valid()) { if (shader.is_valid()) {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
RS::get_singleton()->free(shader); RS::get_singleton()->free_rid(shader);
} }
} }

2
scene/resources/3d/primitive_meshes.cpp
View file

@ -372,7 +372,7 @@ PrimitiveMesh::PrimitiveMesh() {
PrimitiveMesh::~PrimitiveMesh() { PrimitiveMesh::~PrimitiveMesh() {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
RenderingServer::get_singleton()->free(mesh); RenderingServer::get_singleton()->free_rid(mesh);
ERR_FAIL_NULL(ProjectSettings::get_singleton()); ERR_FAIL_NULL(ProjectSettings::get_singleton());
ProjectSettings *project_settings = ProjectSettings::get_singleton(); ProjectSettings *project_settings = ProjectSettings::get_singleton();

2
scene/resources/3d/shape_3d.cpp
View file

@ -165,5 +165,5 @@ Shape3D::Shape3D(RID p_shape) :
Shape3D::~Shape3D() { Shape3D::~Shape3D() {
ERR_FAIL_NULL(PhysicsServer3D::get_singleton()); ERR_FAIL_NULL(PhysicsServer3D::get_singleton());
PhysicsServer3D::get_singleton()->free(shape); PhysicsServer3D::get_singleton()->free_rid(shape);
} }

6
scene/resources/3d/sky_material.cpp
View file

@ -288,7 +288,7 @@ void ProceduralSkyMaterial::_bind_methods() {
void ProceduralSkyMaterial::cleanup_shader() { void ProceduralSkyMaterial::cleanup_shader() {
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
if (shader_cache[i].is_valid()) { if (shader_cache[i].is_valid()) {
RS::get_singleton()->free(shader_cache[i]); RS::get_singleton()->free_rid(shader_cache[i]);
} }
} }
} }
@ -478,7 +478,7 @@ RID PanoramaSkyMaterial::shader_cache[2];
void PanoramaSkyMaterial::cleanup_shader() { void PanoramaSkyMaterial::cleanup_shader() {
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2; i++) {
if (shader_cache[i].is_valid()) { if (shader_cache[i].is_valid()) {
RS::get_singleton()->free(shader_cache[i]); RS::get_singleton()->free_rid(shader_cache[i]);
} }
} }
} }
@ -720,7 +720,7 @@ void PhysicalSkyMaterial::_bind_methods() {
void PhysicalSkyMaterial::cleanup_shader() { void PhysicalSkyMaterial::cleanup_shader() {
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
if (shader_cache[i].is_valid()) { if (shader_cache[i].is_valid()) {
RS::get_singleton()->free(shader_cache[i]); RS::get_singleton()->free_rid(shader_cache[i]);
} }
} }
} }

6
scene/resources/3d/world_3d.cpp
View file

@ -194,17 +194,17 @@ World3D::~World3D() {
ERR_FAIL_NULL(NavigationServer3D::get_singleton()); ERR_FAIL_NULL(NavigationServer3D::get_singleton());
#endif // NAVIGATION_3D_DISABLED #endif // NAVIGATION_3D_DISABLED
RenderingServer::get_singleton()->free(scenario); RenderingServer::get_singleton()->free_rid(scenario);
#ifndef PHYSICS_3D_DISABLED #ifndef PHYSICS_3D_DISABLED
if (space.is_valid()) { if (space.is_valid()) {
PhysicsServer3D::get_singleton()->free(space); PhysicsServer3D::get_singleton()->free_rid(space);
} }
#endif // PHYSICS_3D_DISABLED #endif // PHYSICS_3D_DISABLED
#ifndef NAVIGATION_3D_DISABLED #ifndef NAVIGATION_3D_DISABLED
if (navigation_map.is_valid()) { if (navigation_map.is_valid()) {
NavigationServer3D::get_singleton()->free(navigation_map); NavigationServer3D::get_singleton()->free_rid(navigation_map);
} }
#endif // NAVIGATION_3D_DISABLED #endif // NAVIGATION_3D_DISABLED
} }

4
scene/resources/animated_texture.cpp
View file

@ -286,6 +286,6 @@ AnimatedTexture::AnimatedTexture() {
AnimatedTexture::~AnimatedTexture() { AnimatedTexture::~AnimatedTexture() {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
RS::get_singleton()->free(proxy); RS::get_singleton()->free_rid(proxy);
RS::get_singleton()->free(proxy_ph); RS::get_singleton()->free_rid(proxy_ph);
} }

2
scene/resources/camera_attributes.cpp
View file

@ -139,7 +139,7 @@ CameraAttributes::CameraAttributes() {
CameraAttributes::~CameraAttributes() { CameraAttributes::~CameraAttributes() {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
RS::get_singleton()->free(camera_attributes); RS::get_singleton()->free_rid(camera_attributes);
} }
////////////////////////////////////////////////////// //////////////////////////////////////////////////////

2
scene/resources/camera_texture.cpp
View file

@ -152,6 +152,6 @@ CameraTexture::CameraTexture() {
CameraTexture::~CameraTexture() { CameraTexture::~CameraTexture() {
if (_texture.is_valid()) { if (_texture.is_valid()) {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
RenderingServer::get_singleton()->free(_texture); RenderingServer::get_singleton()->free_rid(_texture);
} }
} }

4
scene/resources/canvas_item_material.cpp
View file

@ -62,7 +62,7 @@ void CanvasItemMaterial::_update_shader() {
shader_map[current_key].users--; shader_map[current_key].users--;
if (shader_map[current_key].users == 0) { if (shader_map[current_key].users == 0) {
//deallocate shader, as it's no longer in use //deallocate shader, as it's no longer in use
RS::get_singleton()->free(shader_map[current_key].shader); RS::get_singleton()->free_rid(shader_map[current_key].shader);
shader_map.erase(current_key); shader_map.erase(current_key);
} }
} }
@ -298,7 +298,7 @@ CanvasItemMaterial::~CanvasItemMaterial() {
shader_map[current_key].users--; shader_map[current_key].users--;
if (shader_map[current_key].users == 0) { if (shader_map[current_key].users == 0) {
//deallocate shader, as it's no longer in use //deallocate shader, as it's no longer in use
RS::get_singleton()->free(shader_map[current_key].shader); RS::get_singleton()->free_rid(shader_map[current_key].shader);
shader_map.erase(current_key); shader_map.erase(current_key);
} }

4
scene/resources/compositor.cpp
View file

@ -193,7 +193,7 @@ CompositorEffect::CompositorEffect() {
CompositorEffect::~CompositorEffect() { CompositorEffect::~CompositorEffect() {
RenderingServer *rs = RenderingServer::get_singleton(); RenderingServer *rs = RenderingServer::get_singleton();
if (rs != nullptr && rid.is_valid()) { if (rs != nullptr && rid.is_valid()) {
rs->free(rid); rs->free_rid(rid);
} }
} }
@ -217,7 +217,7 @@ Compositor::Compositor() {
Compositor::~Compositor() { Compositor::~Compositor() {
RenderingServer *rs = RenderingServer::get_singleton(); RenderingServer *rs = RenderingServer::get_singleton();
if (rs != nullptr && compositor.is_valid()) { if (rs != nullptr && compositor.is_valid()) {
rs->free(compositor); rs->free_rid(compositor);
} }
} }

6
scene/resources/compressed_texture.cpp
View file

@ -458,7 +458,7 @@ void CompressedTexture2D::_bind_methods() {
CompressedTexture2D::~CompressedTexture2D() { CompressedTexture2D::~CompressedTexture2D() {
if (texture.is_valid()) { if (texture.is_valid()) {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
RS::get_singleton()->free(texture); RS::get_singleton()->free_rid(texture);
} }
} }
@ -642,7 +642,7 @@ void CompressedTexture3D::_bind_methods() {
CompressedTexture3D::~CompressedTexture3D() { CompressedTexture3D::~CompressedTexture3D() {
if (texture.is_valid()) { if (texture.is_valid()) {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
RS::get_singleton()->free(texture); RS::get_singleton()->free_rid(texture);
} }
} }
@ -835,7 +835,7 @@ CompressedTextureLayered::CompressedTextureLayered(LayeredType p_type) {
CompressedTextureLayered::~CompressedTextureLayered() { CompressedTextureLayered::~CompressedTextureLayered() {
if (texture.is_valid()) { if (texture.is_valid()) {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
RS::get_singleton()->free(texture); RS::get_singleton()->free_rid(texture);
} }
} }

4
scene/resources/curve_texture.cpp
View file

@ -166,7 +166,7 @@ RID CurveTexture::get_rid() const {
CurveTexture::~CurveTexture() { CurveTexture::~CurveTexture() {
if (_texture.is_valid()) { if (_texture.is_valid()) {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
RS::get_singleton()->free(_texture); RS::get_singleton()->free_rid(_texture);
} }
} }
@ -361,6 +361,6 @@ RID CurveXYZTexture::get_rid() const {
CurveXYZTexture::~CurveXYZTexture() { CurveXYZTexture::~CurveXYZTexture() {
if (_texture.is_valid()) { if (_texture.is_valid()) {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
RS::get_singleton()->free(_texture); RS::get_singleton()->free_rid(_texture);
} }
} }

6
scene/resources/dpi_texture.cpp
View file

@ -155,7 +155,7 @@ void DPITexture::_remove_scale(double p_scale) {
RID *rid = texture_cache.getptr(p_scale); RID *rid = texture_cache.getptr(p_scale);
if (rid) { if (rid) {
if (rid->is_valid()) { if (rid->is_valid()) {
RenderingServer::get_singleton()->free(*rid); RenderingServer::get_singleton()->free_rid(*rid);
} }
texture_cache.erase(p_scale); texture_cache.erase(p_scale);
} }
@ -230,12 +230,12 @@ RID DPITexture::_load_at_scale(double p_scale, bool p_set_size) const {
void DPITexture::_clear() { void DPITexture::_clear() {
for (KeyValue<double, RID> &tx : texture_cache) { for (KeyValue<double, RID> &tx : texture_cache) {
if (tx.value.is_valid()) { if (tx.value.is_valid()) {
RenderingServer::get_singleton()->free(tx.value); RenderingServer::get_singleton()->free_rid(tx.value);
} }
} }
texture_cache.clear(); texture_cache.clear();
if (base_texture.is_valid()) { if (base_texture.is_valid()) {
RenderingServer::get_singleton()->free(base_texture); RenderingServer::get_singleton()->free_rid(base_texture);
} }
base_texture = RID(); base_texture = RID();
alpha_cache.unref(); alpha_cache.unref();

2
scene/resources/environment.cpp
View file

@ -1596,5 +1596,5 @@ Environment::Environment() {
Environment::~Environment() { Environment::~Environment() {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
RS::get_singleton()->free(environment); RS::get_singleton()->free_rid(environment);
} }

2
scene/resources/external_texture.cpp
View file

@ -105,6 +105,6 @@ ExternalTexture::ExternalTexture() {
ExternalTexture::~ExternalTexture() { ExternalTexture::~ExternalTexture() {
if (texture.is_valid()) { if (texture.is_valid()) {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
RenderingServer::get_singleton()->free(texture); RenderingServer::get_singleton()->free_rid(texture);
} }
} }

4
scene/resources/gradient_texture.cpp
View file

@ -39,7 +39,7 @@ GradientTexture1D::GradientTexture1D() {
GradientTexture1D::~GradientTexture1D() { GradientTexture1D::~GradientTexture1D() {
if (texture.is_valid()) { if (texture.is_valid()) {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
RS::get_singleton()->free(texture); RS::get_singleton()->free_rid(texture);
} }
} }
@ -194,7 +194,7 @@ GradientTexture2D::GradientTexture2D() {
GradientTexture2D::~GradientTexture2D() { GradientTexture2D::~GradientTexture2D() {
if (texture.is_valid()) { if (texture.is_valid()) {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
RS::get_singleton()->free(texture); RS::get_singleton()->free_rid(texture);
} }
} }

6
scene/resources/image_texture.cpp
View file

@ -243,7 +243,7 @@ void ImageTexture::_bind_methods() {
ImageTexture::~ImageTexture() { ImageTexture::~ImageTexture() {
if (texture.is_valid()) { if (texture.is_valid()) {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
RenderingServer::get_singleton()->free(texture); RenderingServer::get_singleton()->free_rid(texture);
} }
} }
@ -385,7 +385,7 @@ ImageTextureLayered::ImageTextureLayered(LayeredType p_layered_type) {
ImageTextureLayered::~ImageTextureLayered() { ImageTextureLayered::~ImageTextureLayered() {
if (texture.is_valid()) { if (texture.is_valid()) {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
RS::get_singleton()->free(texture); RS::get_singleton()->free_rid(texture);
} }
} }
@ -533,7 +533,7 @@ ImageTexture3D::ImageTexture3D() {
ImageTexture3D::~ImageTexture3D() { ImageTexture3D::~ImageTexture3D() {
if (texture.is_valid()) { if (texture.is_valid()) {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
RS::get_singleton()->free(texture); RS::get_singleton()->free_rid(texture);
} }
} }

2
scene/resources/immediate_mesh.cpp
View file

@ -420,5 +420,5 @@ ImmediateMesh::ImmediateMesh() {
} }
ImmediateMesh::~ImmediateMesh() { ImmediateMesh::~ImmediateMesh() {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
RS::get_singleton()->free(mesh); RS::get_singleton()->free_rid(mesh);
} }

8
scene/resources/material.cpp
View file

@ -183,7 +183,7 @@ Material::Material() {
Material::~Material() { Material::~Material() {
if (material.is_valid()) { if (material.is_valid()) {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
RenderingServer::get_singleton()->free(material); RenderingServer::get_singleton()->free_rid(material);
} }
} }
@ -700,7 +700,7 @@ void BaseMaterial3D::_update_shader() {
if (v->users == 0) { if (v->users == 0) {
// Deallocate shader which is no longer in use. // Deallocate shader which is no longer in use.
shader_rid = RID(); shader_rid = RID();
RS::get_singleton()->free(v->shader); RS::get_singleton()->free_rid(v->shader);
shader_map.erase(current_key); shader_map.erase(current_key);
} }
} }
@ -2067,7 +2067,7 @@ void fragment() {)";
if (unlikely(v)) { if (unlikely(v)) {
// We raced and managed to create the same key concurrently, so we'll free the shader we just created, // We raced and managed to create the same key concurrently, so we'll free the shader we just created,
// given we know it isn't used, and use the winner. // given we know it isn't used, and use the winner.
RS::get_singleton()->free(new_shader); RS::get_singleton()->free_rid(new_shader);
} else { } else {
ShaderData shader_data; ShaderData shader_data;
shader_data.shader = new_shader; shader_data.shader = new_shader;
@ -4004,7 +4004,7 @@ BaseMaterial3D::~BaseMaterial3D() {
shader_map[current_key].users--; shader_map[current_key].users--;
if (shader_map[current_key].users == 0) { if (shader_map[current_key].users == 0) {
// Deallocate shader which is no longer in use. // Deallocate shader which is no longer in use.
RS::get_singleton()->free(shader_map[current_key].shader); RS::get_singleton()->free_rid(shader_map[current_key].shader);
shader_map.erase(current_key); shader_map.erase(current_key);
} }
} }

4
scene/resources/mesh.cpp
View file

@ -2361,7 +2361,7 @@ ArrayMesh::ArrayMesh() {
ArrayMesh::~ArrayMesh() { ArrayMesh::~ArrayMesh() {
if (mesh.is_valid()) { if (mesh.is_valid()) {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
RenderingServer::get_singleton()->free(mesh); RenderingServer::get_singleton()->free_rid(mesh);
} }
} }
/////////////// ///////////////
@ -2377,5 +2377,5 @@ PlaceholderMesh::PlaceholderMesh() {
PlaceholderMesh::~PlaceholderMesh() { PlaceholderMesh::~PlaceholderMesh() {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
RS::get_singleton()->free(rid); RS::get_singleton()->free_rid(rid);
} }

2
scene/resources/multimesh.cpp
View file

@ -433,5 +433,5 @@ MultiMesh::MultiMesh() {
MultiMesh::~MultiMesh() { MultiMesh::~MultiMesh() {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
RenderingServer::get_singleton()->free(multimesh); RenderingServer::get_singleton()->free_rid(multimesh);
} }

6
scene/resources/particle_process_material.cpp
View file

@ -164,7 +164,7 @@ void ParticleProcessMaterial::_update_shader() {
v->users--; v->users--;
if (v->users == 0) { if (v->users == 0) {
// Deallocate shader, as it's no longer in use. // Deallocate shader, as it's no longer in use.
RS::get_singleton()->free(v->shader); RS::get_singleton()->free_rid(v->shader);
shader_map.erase(current_key); shader_map.erase(current_key);
shader_rid = RID(); shader_rid = RID();
} }
@ -1199,7 +1199,7 @@ void ParticleProcessMaterial::_update_shader() {
if (unlikely(v)) { if (unlikely(v)) {
// We raced and managed to create the same key concurrently, so we'll free the shader we just created, // We raced and managed to create the same key concurrently, so we'll free the shader we just created,
// given we know it isn't used, and use the winner. // given we know it isn't used, and use the winner.
RS::get_singleton()->free(new_shader); RS::get_singleton()->free_rid(new_shader);
} else { } else {
ShaderData shader_data; ShaderData shader_data;
shader_data.shader = new_shader; shader_data.shader = new_shader;
@ -2448,7 +2448,7 @@ ParticleProcessMaterial::~ParticleProcessMaterial() {
shader_map[current_key].users--; shader_map[current_key].users--;
if (shader_map[current_key].users == 0) { if (shader_map[current_key].users == 0) {
//deallocate shader, as it's no longer in use //deallocate shader, as it's no longer in use
RS::get_singleton()->free(shader_map[current_key].shader); RS::get_singleton()->free_rid(shader_map[current_key].shader);
shader_map.erase(current_key); shader_map.erase(current_key);
} }

6
scene/resources/placeholder_textures.cpp
View file

@ -70,7 +70,7 @@ PlaceholderTexture2D::PlaceholderTexture2D() {
PlaceholderTexture2D::~PlaceholderTexture2D() { PlaceholderTexture2D::~PlaceholderTexture2D() {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
if (rid.is_valid()) { if (rid.is_valid()) {
RS::get_singleton()->free(rid); RS::get_singleton()->free_rid(rid);
} }
} }
@ -127,7 +127,7 @@ PlaceholderTexture3D::PlaceholderTexture3D() {
PlaceholderTexture3D::~PlaceholderTexture3D() { PlaceholderTexture3D::~PlaceholderTexture3D() {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
if (rid.is_valid()) { if (rid.is_valid()) {
RS::get_singleton()->free(rid); RS::get_singleton()->free_rid(rid);
} }
} }
@ -195,6 +195,6 @@ PlaceholderTextureLayered::PlaceholderTextureLayered(LayeredType p_type) {
PlaceholderTextureLayered::~PlaceholderTextureLayered() { PlaceholderTextureLayered::~PlaceholderTextureLayered() {
ERR_FAIL_NULL(RenderingServer::get_singleton()); ERR_FAIL_NULL(RenderingServer::get_singleton());
if (rid.is_valid()) { if (rid.is_valid()) {
RS::get_singleton()->free(rid); RS::get_singleton()->free_rid(rid);
} }
} }

Some files were not shown because too many files have changed in this diff Show more