From d8aaf25c23fa10ee121dc4fdd1cafe544bcca355 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Thu, 22 Aug 2019 16:04:25 +0200 Subject: Eevee: Shadow map refactor Reviewed By: brecht Differential Revision: http://developer.blender.org/D5659 --- source/blender/draw/engines/eevee/eevee_lightprobes.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'source/blender/draw/engines/eevee/eevee_lightprobes.c') diff --git a/source/blender/draw/engines/eevee/eevee_lightprobes.c b/source/blender/draw/engines/eevee/eevee_lightprobes.c index 8b1309e8537..2d23359a175 100644 --- a/source/blender/draw/engines/eevee/eevee_lightprobes.c +++ b/source/blender/draw/engines/eevee/eevee_lightprobes.c @@ -904,7 +904,7 @@ static void lightbake_render_scene_face(int face, EEVEE_BakeRenderData *user_dat struct GPUFrameBuffer **face_fb = user_data->face_fb; /* Be sure that cascaded shadow maps are updated. */ - EEVEE_draw_shadows(sldata, user_data->vedata, views[face]); + EEVEE_shadows_draw(sldata, user_data->vedata, views[face]); GPU_framebuffer_bind(face_fb[face]); GPU_framebuffer_clear_depth(face_fb[face], 1.0f); @@ -912,11 +912,9 @@ static void lightbake_render_scene_face(int face, EEVEE_BakeRenderData *user_dat DRW_draw_pass(psl->depth_pass); DRW_draw_pass(psl->depth_pass_cull); DRW_draw_pass(psl->probe_background); - DRW_draw_pass(psl->material_pass); - DRW_draw_pass(psl->material_pass_cull); + EEVEE_materials_draw_opaque(sldata, psl); DRW_draw_pass(psl->sss_pass); /* Only output standard pass */ DRW_draw_pass(psl->sss_pass_cull); - EEVEE_draw_default_passes(psl); DRW_draw_pass(psl->transparent_pass); } @@ -964,7 +962,7 @@ static void lightbake_render_scene_reflected(int layer, EEVEE_BakeRenderData *us DRW_stats_group_start("Planar Reflection"); /* Be sure that cascaded shadow maps are updated. */ - EEVEE_draw_shadows(sldata, vedata, stl->g_data->planar_views[layer]); + EEVEE_shadows_draw(sldata, vedata, stl->g_data->planar_views[layer]); GPU_framebuffer_bind(fbl->planarref_fb); GPU_framebuffer_clear_depth(fbl->planarref_fb, 1.0); @@ -987,9 +985,7 @@ static void lightbake_render_scene_reflected(int layer, EEVEE_BakeRenderData *us GPU_framebuffer_bind(fbl->planarref_fb); /* Shading pass */ - EEVEE_draw_default_passes(psl); - DRW_draw_pass(psl->material_pass); - DRW_draw_pass(psl->material_pass_cull); + EEVEE_materials_draw_opaque(sldata, psl); DRW_draw_pass(psl->sss_pass); /* Only output standard pass */ DRW_draw_pass(psl->sss_pass_cull); DRW_draw_pass(psl->refract_pass); -- cgit v1.2.3