diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2018-06-08 16:51:25 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2018-06-08 17:20:34 +0300 |
commit | 856a79e1fbfef207ef53200d102e00b413279c6c (patch) | |
tree | 8b42d96b13919abec751ccbf3b5591ddcfab6236 /source | |
parent | cbbf8bbbb4fac21d5148201d45053e4f85ed778f (diff) |
Rename: GPU_texture_orphans
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/gpu/GPU_texture.h | 6 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_init_exit.c | 4 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_texture.c | 8 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_window.c | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/gpu/GPU_texture.h b/source/blender/gpu/GPU_texture.h index cc1a26f57f7..09b351a544a 100644 --- a/source/blender/gpu/GPU_texture.h +++ b/source/blender/gpu/GPU_texture.h @@ -173,10 +173,10 @@ void GPU_invalid_tex_free(void); void GPU_texture_free(GPUTexture *tex); -void GPU_texture_init_orphans(void); -void GPU_texture_exit_orphans(void); +void GPU_texture_orphans_init(void); +void GPU_texture_orphans_exit(void); /* This has to be called from a thread with an ogl context bound. */ -void GPU_texture_delete_orphans(void); +void GPU_texture_orphans_delete(void); void GPU_texture_ref(GPUTexture *tex); void GPU_texture_bind(GPUTexture *tex, int number); diff --git a/source/blender/gpu/intern/gpu_init_exit.c b/source/blender/gpu/intern/gpu_init_exit.c index 7b596e6d76b..0d624bbb15c 100644 --- a/source/blender/gpu/intern/gpu_init_exit.c +++ b/source/blender/gpu/intern/gpu_init_exit.c @@ -57,7 +57,7 @@ void GPU_init(void) gpu_extensions_init(); /* must come first */ - GPU_texture_init_orphans(); + GPU_texture_orphans_init(); gpu_codegen_init(); if (G.debug & G_DEBUG_GPU) @@ -82,7 +82,7 @@ void GPU_exit(void) gpu_batch_exit(); - GPU_texture_exit_orphans(); + GPU_texture_orphans_exit(); if (G.debug & G_DEBUG_GPU) gpu_debug_exit(); diff --git a/source/blender/gpu/intern/gpu_texture.c b/source/blender/gpu/intern/gpu_texture.c index dadd8c441f4..aac75014b3e 100644 --- a/source/blender/gpu/intern/gpu_texture.c +++ b/source/blender/gpu/intern/gpu_texture.c @@ -1124,12 +1124,12 @@ void GPU_texture_free(GPUTexture *tex) } } -void GPU_texture_init_orphans(void) +void GPU_texture_orphans_init(void) { BLI_mutex_init(&g_orphan_lock); } -void GPU_texture_delete_orphans(void) +void GPU_texture_orphans_delete(void) { BLI_mutex_lock(&g_orphan_lock); LinkData *link; @@ -1140,9 +1140,9 @@ void GPU_texture_delete_orphans(void) BLI_mutex_unlock(&g_orphan_lock); } -void GPU_texture_exit_orphans(void) +void GPU_texture_orphans_exit(void) { - GPU_texture_delete_orphans(); + GPU_texture_orphans_delete(); BLI_mutex_end(&g_orphan_lock); } diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index 5bc4b060425..84b9539eff1 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -2028,7 +2028,7 @@ void wm_window_raise(wmWindow *win) void wm_window_swap_buffers(wmWindow *win) { - GPU_texture_delete_orphans(); /* XXX should be done elsewhere. */ + GPU_texture_orphans_delete(); /* XXX should be done elsewhere. */ GHOST_SwapWindowBuffers(win->ghostwin); } |