griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: DRW: Replace DRW_TEXTURE_FREE_SAFE by GPU_TEXTURE_FREE_SAFE

Browse Source
This commit is contained in:
Clément Foucault
2024-12-09 23:23:43 +01:00
parent 74a2b61fb5
commit 2e0f4eea66
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/draw/engines/select/select_engine.cc
View File

@@ -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);
}

4
source/blender/draw/intern/draw_cache_impl_particles.cc
View File

@@ -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++) {

2
source/blender/draw/intern/draw_cache_impl_volume.cc
View File

@@ -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);

2
source/blender/draw/intern/draw_common.cc
View File

@@ -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) {

6
source/blender/draw/intern/draw_manager_c.cc
View File

@@ -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();
}