Blender Git Loki
Git Commits -> Revision b18c2a3
Revision b18c2a3 by Clément Foucault (master) June 2, 2020, 14:58 (GMT) |
EEVEE: Refactor of eevee_material.c These are the modifications: -With DRW modification we reduce the number of passes we need to populate. -Rename passes for consistent naming. -Reduce complexity in code compilation -Cleanup how renderpass accumulation passes are setup, using pass instances. -Make sculpt mode compatible with shadows -Make hair passes compatible with SSS -Error shader and lookdev materials now use standalone materials. -Support default shader (world and material) using a default nodetree internally. -Change BLEND_CLIP to be emulated by gpu nodetree. Making less shader variations. -Use BLI_memblock for cache memory allocation. -Renderpasses are handled by switching a UBO ref bind. One major hack in this patch is the use of modified pointer as ghash keys. This rely on the assumption that the keys will never overlap because the number of options per key will never be bigger than the pointed struct. The use of one single nodetree to support default material is also a bit hacky since it won't support concurent usage of this nodetree. (see EEVEE_shader_default_surface_nodetree) Another change is that objects with shader errors now appear solid magenta instead of shaded magenta. This is only because of code reuse purpose but could be changed if really needed. Reviewed By: jbakker Differential Revision: https://developer.blender.org/D7642 |
Commit Details:
Full Hash: b18c2a3c413b7741b2a854b7bd25721352be2589
Parent Commit: b82cb0a
Lines Changed: +1696, -2304
1 Added Path:
/source/blender/draw/engines/eevee/eevee_lut_gen.c (+198, -0) (View)
35 Modified Paths:
/source/blender/draw/CMakeLists.txt (+1, -0) (Diff)
/source/blender/draw/engines/eevee/eevee_data.c (+13, -2) (Diff)
/source/blender/draw/engines/eevee/eevee_effects.c (+1, -2) (Diff)
/source/blender/draw/engines/eevee/eevee_engine.c (+7, -9) (Diff)
/source/blender/draw/engines/eevee/eevee_lightcache.c (+1, -1) (Diff)
/source/blender/draw/engines/eevee/eevee_lightprobes.c (+29, -62) (Diff)
/source/blender/draw/engines/eevee/eevee_lookdev.c (+42, -2) (Diff)
/source/blender/draw/engines/eevee/eevee_materials.c (+538, -1850) (Diff)
/source/blender/draw/engines/eevee/eevee_mist.c (+1, -2) (Diff)
/source/blender/draw/engines/eevee/eevee_occlusion.c (+4, -8) (Diff)
/source/blender/draw/engines/eevee/eevee_private.h (+82, -88) (Diff)
/source/blender/draw/engines/eevee/eevee_render.c (+7, -9) (Diff)
/source/blender/draw/engines/eevee/eevee_renderpasses.c (+22, -22) (Diff)
/source/blender/draw/engines/eevee/eevee_screen_raytrace.c (+2, -4) (Diff)
/source/blender/draw/engines/eevee/eevee_shaders.c (+483, -5) (Diff)
/source/blender/draw/engines/eevee/eevee_shadows.c (+1, -43) (Diff)
/source/blender/draw/engines/eevee/eevee_subsurface.c (+67, -58) (Diff)
/source/blender/draw/engines/eevee/eevee_temporal_sampling.c (+1, -2) (Diff)
/source/blender/draw/engines/eevee/eevee_volumes.c (+10, -19) (Diff)
/source/blender/draw/engines/eevee/shaders/ambient_occlusion_lib.glsl (+3, -7) (Diff)
/source/blender/draw/engines/eevee/shaders/bsdf_common_lib.glsl (+6, -2) (Diff)
/source/blender/draw/engines/eevee/shaders/lit_surface_frag.glsl (+1, -1) (Diff)
/source/blender/draw/engines/eevee/shaders/lit_surface_vert.glsl (+17, -10) (Diff)
/source/blender/draw/engines/eevee/shaders/prepass_frag.glsl (+6, -15) (Diff)
/source/blender/draw/intern/draw_common.h (+0, -12) (Diff)
/source/blender/draw/intern/draw_hair.c (+5, -48) (Diff)
/source/blender/draw/intern/draw_manager.h (+10, -0) (Diff)
/source/blender/draw/intern/draw_manager_data.c (+59, -10) (Diff)
/source/blender/draw/intern/draw_manager_exec.c (+24, -1) (Diff)
/source/blender/draw/intern/draw_manager_shader.c (+6, -4) (Diff)
/source/blender/draw/intern/DRW_render.h (+20, -3) (Diff)
/source/blender/gpu/GPU_material.h (+1, -0) (Diff)
/source/blender/gpu/intern/gpu_material.c (+8, -0) (Diff)
/source/blender/gpu/shaders/material/gpu_shader_material_output_material.glsl (+9, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_output_material.c (+11, -2) (Diff)
/source/blender/draw/engines/eevee/eevee_data.c (+13, -2) (Diff)
/source/blender/draw/engines/eevee/eevee_effects.c (+1, -2) (Diff)
/source/blender/draw/engines/eevee/eevee_engine.c (+7, -9) (Diff)
/source/blender/draw/engines/eevee/eevee_lightcache.c (+1, -1) (Diff)
/source/blender/draw/engines/eevee/eevee_lightprobes.c (+29, -62) (Diff)
/source/blender/draw/engines/eevee/eevee_lookdev.c (+42, -2) (Diff)
/source/blender/draw/engines/eevee/eevee_materials.c (+538, -1850) (Diff)
/source/blender/draw/engines/eevee/eevee_mist.c (+1, -2) (Diff)
/source/blender/draw/engines/eevee/eevee_occlusion.c (+4, -8) (Diff)
/source/blender/draw/engines/eevee/eevee_private.h (+82, -88) (Diff)
/source/blender/draw/engines/eevee/eevee_render.c (+7, -9) (Diff)
/source/blender/draw/engines/eevee/eevee_renderpasses.c (+22, -22) (Diff)
/source/blender/draw/engines/eevee/eevee_screen_raytrace.c (+2, -4) (Diff)
/source/blender/draw/engines/eevee/eevee_shaders.c (+483, -5) (Diff)
/source/blender/draw/engines/eevee/eevee_shadows.c (+1, -43) (Diff)
/source/blender/draw/engines/eevee/eevee_subsurface.c (+67, -58) (Diff)
/source/blender/draw/engines/eevee/eevee_temporal_sampling.c (+1, -2) (Diff)
/source/blender/draw/engines/eevee/eevee_volumes.c (+10, -19) (Diff)
/source/blender/draw/engines/eevee/shaders/ambient_occlusion_lib.glsl (+3, -7) (Diff)
/source/blender/draw/engines/eevee/shaders/bsdf_common_lib.glsl (+6, -2) (Diff)
/source/blender/draw/engines/eevee/shaders/lit_surface_frag.glsl (+1, -1) (Diff)
/source/blender/draw/engines/eevee/shaders/lit_surface_vert.glsl (+17, -10) (Diff)
/source/blender/draw/engines/eevee/shaders/prepass_frag.glsl (+6, -15) (Diff)
/source/blender/draw/intern/draw_common.h (+0, -12) (Diff)
/source/blender/draw/intern/draw_hair.c (+5, -48) (Diff)
/source/blender/draw/intern/draw_manager.h (+10, -0) (Diff)
/source/blender/draw/intern/draw_manager_data.c (+59, -10) (Diff)
/source/blender/draw/intern/draw_manager_exec.c (+24, -1) (Diff)
/source/blender/draw/intern/draw_manager_shader.c (+6, -4) (Diff)
/source/blender/draw/intern/DRW_render.h (+20, -3) (Diff)
/source/blender/gpu/GPU_material.h (+1, -0) (Diff)
/source/blender/gpu/intern/gpu_material.c (+8, -0) (Diff)
/source/blender/gpu/shaders/material/gpu_shader_material_output_material.glsl (+9, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_output_material.c (+11, -2) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021