godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-03 18:11:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Aaron Franke
2025-06-05 00:49:35 -07:00
parent 4d231b5bf8
commit 9fbf5808a0
158 changed files with 724 additions and 696 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scene/resources/material.cpp
View File

@@ -183,7 +183,7 @@ Material::Material() {
Material::~Material() {
if (material.is_valid()) {
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) {
// Deallocate shader which is no longer in use.
shader_rid = RID();
RS::get_singleton()->free(v->shader);
RS::get_singleton()->free_rid(v->shader);
shader_map.erase(current_key);
}
}
@@ -2067,7 +2067,7 @@ void fragment() {)";
if (unlikely(v)) {
// 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.
RS::get_singleton()->free(new_shader);
RS::get_singleton()->free_rid(new_shader);
} else {
ShaderData shader_data;
shader_data.shader = new_shader;
@@ -4004,7 +4004,7 @@ BaseMaterial3D::~BaseMaterial3D() {
shader_map[current_key].users--;
if (shader_map[current_key].users == 0) {
// 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);
}
}