diff options
author | Jeroen Bakker <j.bakker@atmind.nl> | 2019-11-29 11:39:28 +0300 |
---|---|---|
committer | Jeroen Bakker <j.bakker@atmind.nl> | 2019-11-29 11:39:28 +0300 |
commit | e7e074235bdc47af424539c38a43cc9a5511d66a (patch) | |
tree | ece59ccbaf2421d57da32294f251993f7bfe0d7e /source | |
parent | 53f27cdc205327739e81e0980c5beb356c5dd793 (diff) |
EEVEE: Cleanup
Remove redundant defines.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/draw/engines/eevee/eevee_private.h | 8 | ||||
-rw-r--r-- | source/blender/draw/engines/eevee/eevee_renderpasses.c | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_private.h b/source/blender/draw/engines/eevee/eevee_private.h index bbe68aec190..97bde2e5f2e 100644 --- a/source/blender/draw/engines/eevee/eevee_private.h +++ b/source/blender/draw/engines/eevee/eevee_private.h @@ -63,14 +63,6 @@ extern struct DrawEngineType draw_engine_eevee_type; # define SHADER_IRRADIANCE "#define IRRADIANCE_HL2\n" #endif -#define EEVEE_RENDERPASSES_SUPPORTED \ - (SCE_PASS_COMBINED | SCE_PASS_Z | SCE_PASS_MIST | SCE_PASS_NORMAL | SCE_PASS_AO | \ - SCE_PASS_SUBSURFACE_COLOR | SCE_PASS_SUBSURFACE_DIRECT) - -#define EEVEE_RENDERPASSES_WITH_POST_PROCESSING \ - (SCE_PASS_Z | SCE_PASS_MIST | SCE_PASS_NORMAL | SCE_PASS_AO | SCE_PASS_SUBSURFACE_COLOR | \ - SCE_PASS_SUBSURFACE_DIRECT) - /* Macro causes over indentation. */ /* clang-format off */ #define SHADER_DEFINES \ diff --git a/source/blender/draw/engines/eevee/eevee_renderpasses.c b/source/blender/draw/engines/eevee/eevee_renderpasses.c index 9b7bd34c9fa..927ff70a52b 100644 --- a/source/blender/draw/engines/eevee/eevee_renderpasses.c +++ b/source/blender/draw/engines/eevee/eevee_renderpasses.c @@ -236,7 +236,7 @@ void EEVEE_renderpasses_draw(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata) const DRWContextState *draw_ctx = DRW_context_state_get(); const Scene *scene_eval = DEG_get_evaluated_scene(draw_ctx->depsgraph); - bool is_valid = (render_pass & EEVEE_RENDERPASSES_SUPPORTED) > 0; + bool is_valid = (render_pass & EEVEE_RENDERPASSES_ALL) > 0; bool needs_color_transfer = (render_pass & EEVEE_RENDERPASSES_COLOR_PASS) > 0 && DRW_state_is_opengl_render(); |