From 2e0f4eea660ea875fbfa2185c0a4c0ce5c8bdc74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cle=CC=81ment=20Foucault?= Date: Mon, 9 Dec 2024 23:23:43 +0100 Subject: [PATCH] Cleanup: DRW: Replace DRW_TEXTURE_FREE_SAFE by GPU_TEXTURE_FREE_SAFE --- source/blender/draw/engines/select/select_engine.cc | 2 +- source/blender/draw/intern/draw_cache_impl_particles.cc | 4 ++-- source/blender/draw/intern/draw_cache_impl_volume.cc | 2 +- source/blender/draw/intern/draw_common.cc | 2 +- source/blender/draw/intern/draw_manager_c.cc | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/source/blender/draw/engines/select/select_engine.cc b/source/blender/draw/engines/select/select_engine.cc index 4302058d544..30d8d9e9331 100644 --- a/source/blender/draw/engines/select/select_engine.cc +++ b/source/blender/draw/engines/select/select_engine.cc @@ -309,7 +309,7 @@ static void select_engine_free() DRW_SHADER_FREE_SAFE(sh_data->select_id_uniform); } - DRW_TEXTURE_FREE_SAFE(e_data.texture_u32); + GPU_TEXTURE_FREE_SAFE(e_data.texture_u32); GPU_FRAMEBUFFER_FREE_SAFE(e_data.framebuffer_select_id); } diff --git a/source/blender/draw/intern/draw_cache_impl_particles.cc b/source/blender/draw/intern/draw_cache_impl_particles.cc index 4438cfbbd98..0f988455b5b 100644 --- a/source/blender/draw/intern/draw_cache_impl_particles.cc +++ b/source/blender/draw/intern/draw_cache_impl_particles.cc @@ -184,11 +184,11 @@ static void particle_batch_cache_clear_hair(ParticleHairCache *hair_cache) for (int i = 0; i < MAX_MTFACE; i++) { GPU_VERTBUF_DISCARD_SAFE(hair_cache->proc_uv_buf[i]); - DRW_TEXTURE_FREE_SAFE(hair_cache->uv_tex[i]); + GPU_TEXTURE_FREE_SAFE(hair_cache->uv_tex[i]); } for (int i = 0; i < hair_cache->num_col_layers; i++) { GPU_VERTBUF_DISCARD_SAFE(hair_cache->proc_col_buf[i]); - DRW_TEXTURE_FREE_SAFE(hair_cache->col_tex[i]); + GPU_TEXTURE_FREE_SAFE(hair_cache->col_tex[i]); } for (int i = 0; i < MAX_HAIR_SUBDIV; i++) { diff --git a/source/blender/draw/intern/draw_cache_impl_volume.cc b/source/blender/draw/intern/draw_cache_impl_volume.cc index 181ce7ec300..79057cf483d 100644 --- a/source/blender/draw/intern/draw_cache_impl_volume.cc +++ b/source/blender/draw/intern/draw_cache_impl_volume.cc @@ -121,7 +121,7 @@ static void volume_batch_cache_clear(Volume *volume) LISTBASE_FOREACH (DRWVolumeGrid *, grid, &cache->grids) { MEM_SAFE_FREE(grid->name); - DRW_TEXTURE_FREE_SAFE(grid->texture); + GPU_TEXTURE_FREE_SAFE(grid->texture); } BLI_freelistN(&cache->grids); diff --git a/source/blender/draw/intern/draw_common.cc b/source/blender/draw/intern/draw_common.cc index c07e02b8e63..b6b5f28cd2d 100644 --- a/source/blender/draw/intern/draw_common.cc +++ b/source/blender/draw/intern/draw_common.cc @@ -258,7 +258,7 @@ void DRW_globals_update() if (weight_ramp_custom != user_weight_ramp || (user_weight_ramp && memcmp(&weight_ramp_copy, &U.coba_weight, sizeof(ColorBand)) != 0)) { - DRW_TEXTURE_FREE_SAFE(G_draw.weight_ramp); + GPU_TEXTURE_FREE_SAFE(G_draw.weight_ramp); } if (G_draw.weight_ramp == nullptr) { diff --git a/source/blender/draw/intern/draw_manager_c.cc b/source/blender/draw/intern/draw_manager_c.cc index 6a7790eba5b..d2828550761 100644 --- a/source/blender/draw/intern/draw_manager_c.cc +++ b/source/blender/draw/intern/draw_manager_c.cc @@ -2942,7 +2942,7 @@ void DRW_engines_free() DRW_gpu_context_enable(); - DRW_TEXTURE_FREE_SAFE(g_select_buffer.texture_depth); + GPU_TEXTURE_FREE_SAFE(g_select_buffer.texture_depth); GPU_FRAMEBUFFER_FREE_SAFE(g_select_buffer.framebuffer_depth_only); DRW_shaders_free(); @@ -2959,8 +2959,8 @@ void DRW_engines_free() DRW_UBO_FREE_SAFE(G_draw.block_ubo); DRW_UBO_FREE_SAFE(G_draw.view_ubo); DRW_UBO_FREE_SAFE(G_draw.clipping_ubo); - DRW_TEXTURE_FREE_SAFE(G_draw.ramp); - DRW_TEXTURE_FREE_SAFE(G_draw.weight_ramp); + GPU_TEXTURE_FREE_SAFE(G_draw.ramp); + GPU_TEXTURE_FREE_SAFE(G_draw.weight_ramp); DRW_gpu_context_disable(); }