griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Draw manager: Cleanup, indentation in preprocessor

Browse Source
This commit is contained in:
Sergey Sharybin
2017-11-29 10:22:53 +01:00
parent 3478d66b28
commit 73aac1b919
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/draw/engines/clay/clay_engine.c
View File

@@ -932,4 +932,4 @@ RenderEngineType DRW_engine_viewport_clay_type = {
#undef CLAY_ENGINE
#endif
#endif /* WITH_CLAY_ENGINE */

6
source/blender/draw/engines/eevee/eevee_private.h
View File

@@ -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 \

18
source/blender/draw/intern/draw_manager.c
View File

@@ -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 */