diff options
Diffstat (limited to 'source/blender/draw')
15 files changed, 56 insertions, 63 deletions
diff --git a/source/blender/draw/engines/clay/clay_engine.c b/source/blender/draw/engines/clay/clay_engine.c index c4d4ff1a56d..760ecab12d3 100644 --- a/source/blender/draw/engines/clay/clay_engine.c +++ b/source/blender/draw/engines/clay/clay_engine.c @@ -19,7 +19,9 @@ * */ -#include "DRW_render.h" +#include "BLI_utildefines.h" +#include "BLI_dynstr.h" +#include "BLI_rand.h" #include "DNA_particle_types.h" @@ -28,9 +30,6 @@ #include "BKE_main.h" #include "BKE_particle.h" -#include "BLI_dynstr.h" -#include "BLI_rand.h" - #include "GPU_shader.h" #include "IMB_imbuf.h" @@ -39,6 +38,8 @@ #include "UI_resources.h" #include "UI_interface_icons.h" +#include "DRW_render.h" + #include "clay_engine.h" #ifdef WITH_CLAY_ENGINE diff --git a/source/blender/draw/engines/eevee/eevee_bloom.c b/source/blender/draw/engines/eevee/eevee_bloom.c index 1bb3878278a..21fba216fb7 100644 --- a/source/blender/draw/engines/eevee/eevee_bloom.c +++ b/source/blender/draw/engines/eevee/eevee_bloom.c @@ -19,19 +19,18 @@ * */ -/* Eevee's bloom shader - */ - /** \file eevee_bloom.c * \ingroup draw_engine + * + * Eevee's bloom shader. */ #include "DRW_render.h" -#include "BKE_global.h" /* for G.debug_value */ - #include "BLI_dynstr.h" +#include "BKE_global.h" /* for G.debug_value */ + #include "eevee_private.h" #include "GPU_extensions.h" #include "GPU_texture.h" diff --git a/source/blender/draw/engines/eevee/eevee_data.c b/source/blender/draw/engines/eevee/eevee_data.c index 92a992f578b..1faffe3bb17 100644 --- a/source/blender/draw/engines/eevee/eevee_data.c +++ b/source/blender/draw/engines/eevee/eevee_data.c @@ -19,11 +19,10 @@ * */ -/* All specific data handler for Objects, Lights, SceneLayers, ... - */ - /** \file eevee_data.c * \ingroup draw_engine + * + * All specific data handler for Objects, Lights, SceneLayers, ... */ #include "DRW_render.h" diff --git a/source/blender/draw/engines/eevee/eevee_depth_of_field.c b/source/blender/draw/engines/eevee/eevee_depth_of_field.c index c5836c75406..275be6efa39 100644 --- a/source/blender/draw/engines/eevee/eevee_depth_of_field.c +++ b/source/blender/draw/engines/eevee/eevee_depth_of_field.c @@ -19,15 +19,17 @@ * */ -/* Depth of field post process effect - */ - /** \file eevee_depth_of_field.c * \ingroup draw_engine + * + * Depth of field post process effect. */ #include "DRW_render.h" +#include "BLI_dynstr.h" +#include "BLI_rand.h" + #include "DNA_anim_types.h" #include "DNA_camera_types.h" #include "DNA_object_force.h" @@ -42,18 +44,15 @@ #include "BKE_animsys.h" #include "BKE_screen.h" -#include "ED_screen.h" - #include "DEG_depsgraph.h" -#include "BLI_dynstr.h" -#include "BLI_rand.h" - #include "eevee_private.h" #include "GPU_extensions.h" #include "GPU_framebuffer.h" #include "GPU_texture.h" +#include "ED_screen.h" + static struct { /* Depth Of Field */ struct GPUShader *dof_downsample_sh; diff --git a/source/blender/draw/engines/eevee/eevee_effects.c b/source/blender/draw/engines/eevee/eevee_effects.c index 86d767df313..603fc1aa14a 100644 --- a/source/blender/draw/engines/eevee/eevee_effects.c +++ b/source/blender/draw/engines/eevee/eevee_effects.c @@ -19,11 +19,10 @@ * */ -/* Gather all screen space effects technique such as Bloom, Motion Blur, DoF, SSAO, SSR, ... - */ - /** \file eevee_effects.c * \ingroup draw_engine + * + * Gather all screen space effects technique such as Bloom, Motion Blur, DoF, SSAO, SSR, ... */ #include "DRW_render.h" diff --git a/source/blender/draw/engines/eevee/eevee_engine.c b/source/blender/draw/engines/eevee/eevee_engine.c index 4ca59aaa39e..72ebfe94f16 100644 --- a/source/blender/draw/engines/eevee/eevee_engine.c +++ b/source/blender/draw/engines/eevee/eevee_engine.c @@ -23,7 +23,6 @@ * \ingroup draw_engine */ -#include "DNA_world_types.h" #include "DRW_render.h" #include "BLI_dynstr.h" @@ -31,6 +30,8 @@ #include "BKE_object.h" +#include "DNA_world_types.h" + #include "GPU_material.h" #include "GPU_glew.h" diff --git a/source/blender/draw/engines/eevee/eevee_lightprobes.c b/source/blender/draw/engines/eevee/eevee_lightprobes.c index aa5624646f3..a8b9b963cb1 100644 --- a/source/blender/draw/engines/eevee/eevee_lightprobes.c +++ b/source/blender/draw/engines/eevee/eevee_lightprobes.c @@ -23,6 +23,12 @@ * \ingroup DNA */ +#include "DRW_render.h" + +#include "BLI_utildefines.h" +#include "BLI_dynstr.h" +#include "BLI_rand.h" + #include "DNA_world_types.h" #include "DNA_texture_types.h" #include "DNA_image_types.h" @@ -31,20 +37,15 @@ #include "BKE_object.h" -#include "BLI_dynstr.h" -#include "BLI_rand.h" - -#include "ED_screen.h" - #include "GPU_material.h" #include "GPU_texture.h" #include "GPU_glew.h" -#include "DRW_render.h" - #include "eevee_engine.h" #include "eevee_private.h" +#include "ED_screen.h" + #define IRRADIANCE_POOL_SIZE 1024 static struct { diff --git a/source/blender/draw/engines/eevee/eevee_lights.c b/source/blender/draw/engines/eevee/eevee_lights.c index 6c1ed277005..9c30ecba03f 100644 --- a/source/blender/draw/engines/eevee/eevee_lights.c +++ b/source/blender/draw/engines/eevee/eevee_lights.c @@ -1058,4 +1058,4 @@ void EEVEE_lights_free(void) DRW_SHADER_FREE_SAFE(e_data.shadow_copy_cube_sh[i]); DRW_SHADER_FREE_SAFE(e_data.shadow_copy_cascade_sh[i]); } -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c index b0e30109a7f..6721547e2b0 100644 --- a/source/blender/draw/engines/eevee/eevee_materials.c +++ b/source/blender/draw/engines/eevee/eevee_materials.c @@ -25,10 +25,6 @@ #include "DRW_render.h" -#include "DNA_world_types.h" -#include "DNA_modifier_types.h" -#include "DNA_view3d_types.h" - #include "BLI_dynstr.h" #include "BLI_ghash.h" #include "BLI_alloca.h" @@ -37,6 +33,10 @@ #include "BKE_paint.h" #include "BKE_pbvh.h" +#include "DNA_world_types.h" +#include "DNA_modifier_types.h" +#include "DNA_view3d_types.h" + #include "GPU_material.h" #include "eevee_engine.h" diff --git a/source/blender/draw/engines/eevee/eevee_motion_blur.c b/source/blender/draw/engines/eevee/eevee_motion_blur.c index 5ca2dfe1949..b9ec1f8b186 100644 --- a/source/blender/draw/engines/eevee/eevee_motion_blur.c +++ b/source/blender/draw/engines/eevee/eevee_motion_blur.c @@ -19,25 +19,24 @@ * */ -/* Gather all screen space effects technique such as Bloom, Motion Blur, DoF, SSAO, SSR, ... - */ - /** \file eevee_effects.c * \ingroup draw_engine + * + * Gather all screen space effects technique such as Bloom, Motion Blur, DoF, SSAO, SSR, ... */ #include "DRW_render.h" -#include "DNA_anim_types.h" -#include "DNA_camera_types.h" -#include "DNA_screen_types.h" - #include "BKE_global.h" /* for G.debug_value */ #include "BKE_camera.h" #include "BKE_object.h" #include "BKE_animsys.h" #include "BKE_screen.h" +#include "DNA_anim_types.h" +#include "DNA_camera_types.h" +#include "DNA_screen_types.h" + #include "ED_screen.h" #include "DEG_depsgraph.h" diff --git a/source/blender/draw/engines/eevee/eevee_occlusion.c b/source/blender/draw/engines/eevee/eevee_occlusion.c index 86a9fb2ff1a..a6b35ce1b16 100644 --- a/source/blender/draw/engines/eevee/eevee_occlusion.c +++ b/source/blender/draw/engines/eevee/eevee_occlusion.c @@ -19,21 +19,20 @@ * */ -/* Implementation of the screen space Ground Truth Ambient Occlusion. - */ - /** \file eevee_occlusion.c * \ingroup draw_engine + * + * Implementation of the screen space Ground Truth Ambient Occlusion. */ #include "DRW_render.h" +#include "BLI_dynstr.h" + #include "DNA_anim_types.h" #include "BKE_global.h" /* for G.debug_value */ -#include "BLI_dynstr.h" - #include "eevee_private.h" static struct { diff --git a/source/blender/draw/engines/eevee/eevee_screen_raytrace.c b/source/blender/draw/engines/eevee/eevee_screen_raytrace.c index e287ba6fc14..c6162f1d693 100644 --- a/source/blender/draw/engines/eevee/eevee_screen_raytrace.c +++ b/source/blender/draw/engines/eevee/eevee_screen_raytrace.c @@ -19,11 +19,10 @@ * */ -/* Screen space reflections and refractions techniques. - */ - /** \file eevee_screen_raytrace.c * \ingroup draw_engine + * + * Screen space reflections and refractions techniques. */ #include "DRW_render.h" diff --git a/source/blender/draw/engines/eevee/eevee_subsurface.c b/source/blender/draw/engines/eevee/eevee_subsurface.c index 2784125ca58..6827d44aea4 100644 --- a/source/blender/draw/engines/eevee/eevee_subsurface.c +++ b/source/blender/draw/engines/eevee/eevee_subsurface.c @@ -19,11 +19,10 @@ * */ -/* Screen space subsurface scattering technique. - */ - /** \file eevee_subsurface.c * \ingroup draw_engine + * + * Screen space subsurface scattering technique. */ #include "DRW_render.h" diff --git a/source/blender/draw/engines/eevee/eevee_temporal_sampling.c b/source/blender/draw/engines/eevee/eevee_temporal_sampling.c index 6e70ba45edf..d5580c21a1f 100644 --- a/source/blender/draw/engines/eevee/eevee_temporal_sampling.c +++ b/source/blender/draw/engines/eevee/eevee_temporal_sampling.c @@ -19,11 +19,10 @@ * */ -/* Temporal super sampling technique - */ - /** \file eevee_temporal_sampling.c * \ingroup draw_engine + * + * Temporal super sampling technique */ #include "DRW_render.h" diff --git a/source/blender/draw/engines/eevee/eevee_volumes.c b/source/blender/draw/engines/eevee/eevee_volumes.c index 4ee50cfb082..760205f4937 100644 --- a/source/blender/draw/engines/eevee/eevee_volumes.c +++ b/source/blender/draw/engines/eevee/eevee_volumes.c @@ -19,15 +19,17 @@ * */ -/* Volumetric effects rendering using frostbite approach. - */ - /** \file eevee_volume.c * \ingroup draw_engine + * + * Volumetric effects rendering using frostbite approach. */ #include "DRW_render.h" +#include "BLI_dynstr.h" +#include "BLI_rand.h" + #include "DNA_object_force.h" #include "DNA_smoke_types.h" #include "DNA_world_types.h" @@ -39,9 +41,6 @@ #include "ED_screen.h" -#include "BLI_dynstr.h" -#include "BLI_rand.h" - #include "eevee_private.h" #include "GPU_draw.h" #include "GPU_texture.h" |