archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: use safe free macro & comments

Browse Source
This commit is contained in:
Campbell Barton
2017-09-14 01:23:18 +10:00
parent e9d8b780ae
commit 2a01fb61f8
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/draw/intern/draw_manager.c
View File

@@ -319,7 +319,7 @@ enum {
STENCIL_ACTIVE = (1 << 1),
};
/* Render State */
/** Render State: No persistent data between draw calls. */
static struct DRWGlobalState {
/* Rendering state */
GPUShader *shader;
@@ -359,7 +359,7 @@ static struct DRWGlobalState {
double cache_time;
} DST = {NULL};
/* GPU Resource State */
/** GPU Resource State: Memory storage between drawing. */
static struct DRWResourceState {
GPUTexture **bound_texs;
GPUUniformBuffer **bound_ubos;
@@ -3666,14 +3666,8 @@ void DRW_engines_free(void)
if (globals_ramp)
GPU_texture_free(globals_ramp);
if (RST.bound_texs) {
MEM_freeN(RST.bound_texs);
RST.bound_texs = NULL;
}
if (RST.bound_ubos) {
MEM_freeN(RST.bound_ubos);
RST.bound_ubos = NULL;
}
MEM_SAFE_FREE(RST.bound_texs);
MEM_SAFE_FREE(RST.bound_ubos);
#ifdef WITH_CLAY_ENGINE
BLI_remlink(&R_engines, &DRW_engine_viewport_clay_type);