From 66bd96e0bb927f9cd529048a4a2219fede956c6e Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 17 Aug 2019 01:17:30 +1000 Subject: Cleanup: remove gawain reference --- source/blender/draw/DRW_engine.h | 4 ++-- source/blender/draw/engines/eevee/eevee_lightcache.c | 14 +++++++------- source/blender/draw/intern/draw_manager.c | 10 +++++----- 3 files changed, 14 insertions(+), 14 deletions(-) (limited to 'source/blender') diff --git a/source/blender/draw/DRW_engine.h b/source/blender/draw/DRW_engine.h index 6cae9ceb7d6..58cf0c2a8e0 100644 --- a/source/blender/draw/DRW_engine.h +++ b/source/blender/draw/DRW_engine.h @@ -166,8 +166,8 @@ void DRW_opengl_context_disable_ex(bool restore); void DRW_opengl_render_context_enable(void *re_gl_context); void DRW_opengl_render_context_disable(void *re_gl_context); -void DRW_gawain_render_context_enable(void *re_gpu_context); -void DRW_gawain_render_context_disable(void *re_gpu_context); +void DRW_gpu_render_context_enable(void *re_gpu_context); +void DRW_gpu_render_context_disable(void *re_gpu_context); void DRW_deferred_shader_remove(struct GPUMaterial *mat); diff --git a/source/blender/draw/engines/eevee/eevee_lightcache.c b/source/blender/draw/engines/eevee/eevee_lightcache.c index c82a112b343..275e185a0e4 100644 --- a/source/blender/draw/engines/eevee/eevee_lightcache.c +++ b/source/blender/draw/engines/eevee/eevee_lightcache.c @@ -80,8 +80,8 @@ extern void DRW_opengl_context_disable(void); extern void DRW_opengl_render_context_enable(void *re_gl_context); extern void DRW_opengl_render_context_disable(void *re_gl_context); -extern void DRW_gawain_render_context_enable(void *re_gpu_context); -extern void DRW_gawain_render_context_disable(void *re_gpu_context); +extern void DRW_gpu_render_context_enable(void *re_gpu_context); +extern void DRW_gpu_render_context_disable(void *re_gpu_context); typedef struct EEVEE_LightBake { Depsgraph *depsgraph; @@ -412,7 +412,7 @@ static void eevee_lightbake_context_enable(EEVEE_LightBake *lbake) if (lbake->gpu_context == NULL) { lbake->gpu_context = GPU_context_create(0); } - DRW_gawain_render_context_enable(lbake->gpu_context); + DRW_gpu_render_context_enable(lbake->gpu_context); } else { DRW_opengl_context_enable(); @@ -422,7 +422,7 @@ static void eevee_lightbake_context_enable(EEVEE_LightBake *lbake) static void eevee_lightbake_context_disable(EEVEE_LightBake *lbake) { if (lbake->gl_context) { - DRW_gawain_render_context_disable(lbake->gpu_context); + DRW_gpu_render_context_disable(lbake->gpu_context); DRW_opengl_render_context_disable(lbake->gl_context); } else { @@ -654,7 +654,7 @@ static void eevee_lightbake_delete_resources(EEVEE_LightBake *lbake) if (lbake->gl_context) { DRW_opengl_render_context_enable(lbake->gl_context); - DRW_gawain_render_context_enable(lbake->gpu_context); + DRW_gpu_render_context_enable(lbake->gpu_context); } else if (!lbake->resource_only) { DRW_opengl_context_enable(); @@ -675,8 +675,8 @@ static void eevee_lightbake_delete_resources(EEVEE_LightBake *lbake) } if (lbake->gpu_context) { - DRW_gawain_render_context_disable(lbake->gpu_context); - DRW_gawain_render_context_enable(lbake->gpu_context); + DRW_gpu_render_context_disable(lbake->gpu_context); + DRW_gpu_render_context_enable(lbake->gpu_context); GPU_context_discard(lbake->gpu_context); } diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index a2bbb368caa..b03240886ca 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -1864,7 +1864,7 @@ void DRW_render_gpencil(struct RenderEngine *engine, struct Depsgraph *depsgraph DRW_opengl_render_context_enable(re_gl_context); /* We need to query gpu context after a gl context has been bound. */ re_gpu_context = RE_gpu_context_get(render); - DRW_gawain_render_context_enable(re_gpu_context); + DRW_gpu_render_context_enable(re_gpu_context); } else { DRW_opengl_context_enable(); @@ -1949,7 +1949,7 @@ void DRW_render_to_image(RenderEngine *engine, struct Depsgraph *depsgraph) DRW_opengl_render_context_enable(re_gl_context); /* We need to query gpu context after a gl context has been bound. */ re_gpu_context = RE_gpu_context_get(render); - DRW_gawain_render_context_enable(re_gpu_context); + DRW_gpu_render_context_enable(re_gpu_context); } else { DRW_opengl_context_enable(); @@ -2040,7 +2040,7 @@ void DRW_render_to_image(RenderEngine *engine, struct Depsgraph *depsgraph) /* Changing Context */ if (re_gl_context != NULL) { - DRW_gawain_render_context_disable(re_gpu_context); + DRW_gpu_render_context_disable(re_gpu_context); DRW_opengl_render_context_disable(re_gl_context); } else { @@ -3019,7 +3019,7 @@ void DRW_opengl_render_context_disable(void *re_gl_context) } /* Needs to be called AFTER DRW_opengl_render_context_enable() */ -void DRW_gawain_render_context_enable(void *re_gpu_context) +void DRW_gpu_render_context_enable(void *re_gpu_context) { /* If thread is main you should use DRW_opengl_context_enable(). */ BLI_assert(!BLI_thread_is_main()); @@ -3029,7 +3029,7 @@ void DRW_gawain_render_context_enable(void *re_gpu_context) } /* Needs to be called BEFORE DRW_opengl_render_context_disable() */ -void DRW_gawain_render_context_disable(void *UNUSED(re_gpu_context)) +void DRW_gpu_render_context_disable(void *UNUSED(re_gpu_context)) { DRW_shape_cache_reset(); /* XXX fix that too. */ GPU_context_active_set(NULL); -- cgit v1.2.3