diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/draw/engines/eevee/eevee_data.c | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/draw/engines/eevee/eevee_data.c')
-rw-r--r-- | source/blender/draw/engines/eevee/eevee_data.c | 193 |
1 files changed, 92 insertions, 101 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_data.c b/source/blender/draw/engines/eevee/eevee_data.c index 78bfb543bb1..b7b8702b41a 100644 --- a/source/blender/draw/engines/eevee/eevee_data.c +++ b/source/blender/draw/engines/eevee/eevee_data.c @@ -29,177 +29,168 @@ void EEVEE_view_layer_data_free(void *storage) { - EEVEE_ViewLayerData *sldata = (EEVEE_ViewLayerData *)storage; - - /* Lights */ - MEM_SAFE_FREE(sldata->lights); - DRW_UBO_FREE_SAFE(sldata->light_ubo); - DRW_UBO_FREE_SAFE(sldata->shadow_ubo); - DRW_UBO_FREE_SAFE(sldata->shadow_render_ubo); - GPU_FRAMEBUFFER_FREE_SAFE(sldata->shadow_cube_target_fb); - GPU_FRAMEBUFFER_FREE_SAFE(sldata->shadow_cube_store_fb); - GPU_FRAMEBUFFER_FREE_SAFE(sldata->shadow_cascade_target_fb); - GPU_FRAMEBUFFER_FREE_SAFE(sldata->shadow_cascade_store_fb); - DRW_TEXTURE_FREE_SAFE(sldata->shadow_cube_target); - DRW_TEXTURE_FREE_SAFE(sldata->shadow_cube_blur); - DRW_TEXTURE_FREE_SAFE(sldata->shadow_cube_pool); - DRW_TEXTURE_FREE_SAFE(sldata->shadow_cascade_target); - DRW_TEXTURE_FREE_SAFE(sldata->shadow_cascade_blur); - DRW_TEXTURE_FREE_SAFE(sldata->shadow_cascade_pool); - MEM_SAFE_FREE(sldata->shcasters_buffers[0].shadow_casters); - MEM_SAFE_FREE(sldata->shcasters_buffers[0].flags); - MEM_SAFE_FREE(sldata->shcasters_buffers[1].shadow_casters); - MEM_SAFE_FREE(sldata->shcasters_buffers[1].flags); - - if (sldata->fallback_lightcache) { - EEVEE_lightcache_free(sldata->fallback_lightcache); - sldata->fallback_lightcache = NULL; - } - - /* Probes */ - MEM_SAFE_FREE(sldata->probes); - DRW_UBO_FREE_SAFE(sldata->probe_ubo); - DRW_UBO_FREE_SAFE(sldata->grid_ubo); - DRW_UBO_FREE_SAFE(sldata->planar_ubo); - DRW_UBO_FREE_SAFE(sldata->common_ubo); - DRW_UBO_FREE_SAFE(sldata->clip_ubo); + EEVEE_ViewLayerData *sldata = (EEVEE_ViewLayerData *)storage; + + /* Lights */ + MEM_SAFE_FREE(sldata->lights); + DRW_UBO_FREE_SAFE(sldata->light_ubo); + DRW_UBO_FREE_SAFE(sldata->shadow_ubo); + DRW_UBO_FREE_SAFE(sldata->shadow_render_ubo); + GPU_FRAMEBUFFER_FREE_SAFE(sldata->shadow_cube_target_fb); + GPU_FRAMEBUFFER_FREE_SAFE(sldata->shadow_cube_store_fb); + GPU_FRAMEBUFFER_FREE_SAFE(sldata->shadow_cascade_target_fb); + GPU_FRAMEBUFFER_FREE_SAFE(sldata->shadow_cascade_store_fb); + DRW_TEXTURE_FREE_SAFE(sldata->shadow_cube_target); + DRW_TEXTURE_FREE_SAFE(sldata->shadow_cube_blur); + DRW_TEXTURE_FREE_SAFE(sldata->shadow_cube_pool); + DRW_TEXTURE_FREE_SAFE(sldata->shadow_cascade_target); + DRW_TEXTURE_FREE_SAFE(sldata->shadow_cascade_blur); + DRW_TEXTURE_FREE_SAFE(sldata->shadow_cascade_pool); + MEM_SAFE_FREE(sldata->shcasters_buffers[0].shadow_casters); + MEM_SAFE_FREE(sldata->shcasters_buffers[0].flags); + MEM_SAFE_FREE(sldata->shcasters_buffers[1].shadow_casters); + MEM_SAFE_FREE(sldata->shcasters_buffers[1].flags); + + if (sldata->fallback_lightcache) { + EEVEE_lightcache_free(sldata->fallback_lightcache); + sldata->fallback_lightcache = NULL; + } + + /* Probes */ + MEM_SAFE_FREE(sldata->probes); + DRW_UBO_FREE_SAFE(sldata->probe_ubo); + DRW_UBO_FREE_SAFE(sldata->grid_ubo); + DRW_UBO_FREE_SAFE(sldata->planar_ubo); + DRW_UBO_FREE_SAFE(sldata->common_ubo); + DRW_UBO_FREE_SAFE(sldata->clip_ubo); } EEVEE_ViewLayerData *EEVEE_view_layer_data_get(void) { - return (EEVEE_ViewLayerData *)DRW_view_layer_engine_data_get( - &draw_engine_eevee_type); + return (EEVEE_ViewLayerData *)DRW_view_layer_engine_data_get(&draw_engine_eevee_type); } EEVEE_ViewLayerData *EEVEE_view_layer_data_ensure_ex(struct ViewLayer *view_layer) { - EEVEE_ViewLayerData **sldata = (EEVEE_ViewLayerData **)DRW_view_layer_engine_data_ensure_ex( - view_layer, &draw_engine_eevee_type, &EEVEE_view_layer_data_free); + EEVEE_ViewLayerData **sldata = (EEVEE_ViewLayerData **)DRW_view_layer_engine_data_ensure_ex( + view_layer, &draw_engine_eevee_type, &EEVEE_view_layer_data_free); - if (*sldata == NULL) { - *sldata = MEM_callocN(sizeof(**sldata), "EEVEE_ViewLayerData"); - } + if (*sldata == NULL) { + *sldata = MEM_callocN(sizeof(**sldata), "EEVEE_ViewLayerData"); + } - return *sldata; + return *sldata; } EEVEE_ViewLayerData *EEVEE_view_layer_data_ensure(void) { - EEVEE_ViewLayerData **sldata = (EEVEE_ViewLayerData **)DRW_view_layer_engine_data_ensure( - &draw_engine_eevee_type, &EEVEE_view_layer_data_free); + EEVEE_ViewLayerData **sldata = (EEVEE_ViewLayerData **)DRW_view_layer_engine_data_ensure( + &draw_engine_eevee_type, &EEVEE_view_layer_data_free); - if (*sldata == NULL) { - *sldata = MEM_callocN(sizeof(**sldata), "EEVEE_ViewLayerData"); - } + if (*sldata == NULL) { + *sldata = MEM_callocN(sizeof(**sldata), "EEVEE_ViewLayerData"); + } - return *sldata; + return *sldata; } /* Object data. */ static void eevee_object_data_init(DrawData *dd) { - EEVEE_ObjectEngineData *eevee_data = (EEVEE_ObjectEngineData *)dd; - eevee_data->shadow_caster_id = -1; + EEVEE_ObjectEngineData *eevee_data = (EEVEE_ObjectEngineData *)dd; + eevee_data->shadow_caster_id = -1; } EEVEE_ObjectEngineData *EEVEE_object_data_get(Object *ob) { - if (ELEM(ob->type, OB_LIGHTPROBE, OB_LAMP)) { - return NULL; - } - return (EEVEE_ObjectEngineData *)DRW_drawdata_get( - &ob->id, &draw_engine_eevee_type); + if (ELEM(ob->type, OB_LIGHTPROBE, OB_LAMP)) { + return NULL; + } + return (EEVEE_ObjectEngineData *)DRW_drawdata_get(&ob->id, &draw_engine_eevee_type); } EEVEE_ObjectEngineData *EEVEE_object_data_ensure(Object *ob) { - BLI_assert(!ELEM(ob->type, OB_LIGHTPROBE, OB_LAMP)); - return (EEVEE_ObjectEngineData *)DRW_drawdata_ensure( - &ob->id, - &draw_engine_eevee_type, - sizeof(EEVEE_ObjectEngineData), - eevee_object_data_init, - NULL); + BLI_assert(!ELEM(ob->type, OB_LIGHTPROBE, OB_LAMP)); + return (EEVEE_ObjectEngineData *)DRW_drawdata_ensure(&ob->id, + &draw_engine_eevee_type, + sizeof(EEVEE_ObjectEngineData), + eevee_object_data_init, + NULL); } /* Light probe data. */ static void eevee_lightprobe_data_init(DrawData *dd) { - EEVEE_LightProbeEngineData *ped = (EEVEE_LightProbeEngineData *)dd; - ped->need_update = false; + EEVEE_LightProbeEngineData *ped = (EEVEE_LightProbeEngineData *)dd; + ped->need_update = false; } EEVEE_LightProbeEngineData *EEVEE_lightprobe_data_get(Object *ob) { - if (ob->type != OB_LIGHTPROBE) { - return NULL; - } - return (EEVEE_LightProbeEngineData *)DRW_drawdata_get( - &ob->id, &draw_engine_eevee_type); + if (ob->type != OB_LIGHTPROBE) { + return NULL; + } + return (EEVEE_LightProbeEngineData *)DRW_drawdata_get(&ob->id, &draw_engine_eevee_type); } EEVEE_LightProbeEngineData *EEVEE_lightprobe_data_ensure(Object *ob) { - BLI_assert(ob->type == OB_LIGHTPROBE); - return (EEVEE_LightProbeEngineData *)DRW_drawdata_ensure( - &ob->id, - &draw_engine_eevee_type, - sizeof(EEVEE_LightProbeEngineData), - eevee_lightprobe_data_init, - NULL); + BLI_assert(ob->type == OB_LIGHTPROBE); + return (EEVEE_LightProbeEngineData *)DRW_drawdata_ensure(&ob->id, + &draw_engine_eevee_type, + sizeof(EEVEE_LightProbeEngineData), + eevee_lightprobe_data_init, + NULL); } /* Light data. */ static void eevee_light_data_init(DrawData *dd) { - EEVEE_LightEngineData *led = (EEVEE_LightEngineData *)dd; - led->need_update = true; - led->prev_cube_shadow_id = -1; + EEVEE_LightEngineData *led = (EEVEE_LightEngineData *)dd; + led->need_update = true; + led->prev_cube_shadow_id = -1; } EEVEE_LightEngineData *EEVEE_light_data_get(Object *ob) { - if (ob->type != OB_LAMP) { - return NULL; - } - return (EEVEE_LightEngineData *)DRW_drawdata_get( - &ob->id, &draw_engine_eevee_type); + if (ob->type != OB_LAMP) { + return NULL; + } + return (EEVEE_LightEngineData *)DRW_drawdata_get(&ob->id, &draw_engine_eevee_type); } EEVEE_LightEngineData *EEVEE_light_data_ensure(Object *ob) { - BLI_assert(ob->type == OB_LAMP); - return (EEVEE_LightEngineData *)DRW_drawdata_ensure( - &ob->id, - &draw_engine_eevee_type, - sizeof(EEVEE_LightEngineData), - eevee_light_data_init, - NULL); + BLI_assert(ob->type == OB_LAMP); + return (EEVEE_LightEngineData *)DRW_drawdata_ensure(&ob->id, + &draw_engine_eevee_type, + sizeof(EEVEE_LightEngineData), + eevee_light_data_init, + NULL); } /* World data. */ static void eevee_world_data_init(DrawData *dd) { - EEVEE_WorldEngineData *wed = (EEVEE_WorldEngineData *)dd; - wed->dd.recalc |= 1; + EEVEE_WorldEngineData *wed = (EEVEE_WorldEngineData *)dd; + wed->dd.recalc |= 1; } EEVEE_WorldEngineData *EEVEE_world_data_get(World *wo) { - return (EEVEE_WorldEngineData *)DRW_drawdata_get( - &wo->id, &draw_engine_eevee_type); + return (EEVEE_WorldEngineData *)DRW_drawdata_get(&wo->id, &draw_engine_eevee_type); } EEVEE_WorldEngineData *EEVEE_world_data_ensure(World *wo) { - return (EEVEE_WorldEngineData *)DRW_drawdata_ensure( - &wo->id, - &draw_engine_eevee_type, - sizeof(EEVEE_WorldEngineData), - eevee_world_data_init, - NULL); + return (EEVEE_WorldEngineData *)DRW_drawdata_ensure(&wo->id, + &draw_engine_eevee_type, + sizeof(EEVEE_WorldEngineData), + eevee_world_data_init, + NULL); } |