diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-29 12:22:53 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-29 13:01:08 +0300 |
| commit | 73aac1b919eba438f2a452087c8817aa44ae3e71 (patch) | |
| tree | 4490af6bf717c807cdce231f901ec3acd5b8f999 /source | |
| parent | 3478d66b285b44de3a36a14db7436254bab84995 (diff) | |
Draw manager: Cleanup, indentation in preprocessor
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/draw/engines/clay/clay_engine.c | 2 | ||||
| -rw-r--r-- | source/blender/draw/engines/eevee/eevee_private.h | 6 | ||||
| -rw-r--r-- | source/blender/draw/intern/draw_manager.c | 18 |
3 files changed, 13 insertions, 13 deletions
diff --git a/source/blender/draw/engines/clay/clay_engine.c b/source/blender/draw/engines/clay/clay_engine.c index 27ae4639e8b..c7c591555d5 100644 --- a/source/blender/draw/engines/clay/clay_engine.c +++ b/source/blender/draw/engines/clay/clay_engine.c @@ -932,4 +932,4 @@ RenderEngineType DRW_engine_viewport_clay_type = { #undef CLAY_ENGINE -#endif +#endif /* WITH_CLAY_ENGINE */ diff --git a/source/blender/draw/engines/eevee/eevee_private.h b/source/blender/draw/engines/eevee/eevee_private.h index 281e9e2fce1..f039ac3eabb 100644 --- a/source/blender/draw/engines/eevee/eevee_private.h +++ b/source/blender/draw/engines/eevee/eevee_private.h @@ -47,11 +47,11 @@ extern struct DrawEngineType draw_engine_eevee_type; #define IRRADIANCE_HL2 #if defined(IRRADIANCE_SH_L2) -#define SHADER_IRRADIANCE "#define IRRADIANCE_SH_L2\n" +# define SHADER_IRRADIANCE "#define IRRADIANCE_SH_L2\n" #elif defined(IRRADIANCE_CUBEMAP) -#define SHADER_IRRADIANCE "#define IRRADIANCE_CUBEMAP\n" +# define SHADER_IRRADIANCE "#define IRRADIANCE_CUBEMAP\n" #elif defined(IRRADIANCE_HL2) -#define SHADER_IRRADIANCE "#define IRRADIANCE_HL2\n" +# define SHADER_IRRADIANCE "#define IRRADIANCE_HL2\n" #endif #define SHADER_DEFINES \ diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index 0986e4c48b4..ca36e054613 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -101,29 +101,29 @@ #define USE_PROFILE #ifdef USE_PROFILE -#include "PIL_time.h" +# include "PIL_time.h" -#define PROFILE_TIMER_FALLOFF 0.1 +# define PROFILE_TIMER_FALLOFF 0.1 -#define PROFILE_START(time_start) \ +# define PROFILE_START(time_start) \ double time_start = PIL_check_seconds_timer(); -#define PROFILE_END_ACCUM(time_accum, time_start) { \ +# define PROFILE_END_ACCUM(time_accum, time_start) { \ time_accum += (PIL_check_seconds_timer() - time_start) * 1e3; \ } ((void)0) /* exp average */ -#define PROFILE_END_UPDATE(time_update, time_start) { \ +# define PROFILE_END_UPDATE(time_update, time_start) { \ double _time_delta = (PIL_check_seconds_timer() - time_start) * 1e3; \ time_update = (time_update * (1.0 - PROFILE_TIMER_FALLOFF)) + \ (_time_delta * PROFILE_TIMER_FALLOFF); \ } ((void)0) -#else +#else /* USE_PROFILE */ -#define PROFILE_START(time_start) ((void)0) -#define PROFILE_END_ACCUM(time_accum, time_start) ((void)0) -#define PROFILE_END_UPDATE(time_update, time_start) ((void)0) +# define PROFILE_START(time_start) ((void)0) +# define PROFILE_END_ACCUM(time_accum, time_start) ((void)0) +# define PROFILE_END_UPDATE(time_update, time_start) ((void)0) #endif /* USE_PROFILE */ |