blender
/
blender
134
398
Fork 581
Code Issues 6.3k Pull Requests 754 Projects 19 Wiki Activity

EEVEE Next: Subsurface Scattering #107407

Merged
Miguel Pozo merged 24 commits from pragma37/blender:pull-eevee-next-sss into main 2023-06-15 15:49:12 +02:00
Conversation 1 Commits 24 Files Changed 20 +28 -21
4 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1d28e81235 - Show all commits

21
source/blender/draw/engines/eevee_next/eevee_pipeline.cc
View File

@ -365,7 +365,6 @@ void DeferredLayer::begin_sync()
void DeferredLayer::end_sync()
{
if (closure_bits_ & (CLOSURE_DIFFUSE | CLOSURE_REFLECTION)) {
const bool is_last_eval_pass = !(closure_bits_ & CLOSURE_SSS);
@ -393,24 +392,6 @@ void DeferredLayer::end_sync()
eval_light_ps_.barrier(GPU_BARRIER_TEXTURE_FETCH | GPU_BARRIER_SHADER_IMAGE_ACCESS);
eval_light_ps_.draw_procedural(GPU_PRIM_TRIS, 1, 3);
}
if (closure_bits_ & CLOSURE_SSS) {
inst_.subsurface.end_sync();
subsurface_ps_.init();
subsurface_ps_.state_set(DRW_STATE_WRITE_COLOR | DRW_STATE_STENCIL_EQUAL |
DRW_STATE_BLEND_ADD_FULL);
subsurface_ps_.state_stencil(0x00u, 0xFFu, CLOSURE_SSS);
subsurface_ps_.shader_set(inst_.shaders.static_shader_get(SUBSURFACE_EVAL));
inst_.subsurface.bind_resources(&subsurface_ps_);
inst_.hiz_buffer.bind_resources(&subsurface_ps_);
subsurface_ps_.bind_texture("radiance_tx", &diffuse_light_tx_);
subsurface_ps_.bind_texture("gbuffer_closure_tx", &inst_.gbuffer.closure_tx);
subsurface_ps_.bind_texture("gbuffer_color_tx", &inst_.gbuffer.color_tx);
subsurface_ps_.barrier(GPU_BARRIER_TEXTURE_FETCH);
subsurface_ps_.draw_procedural(GPU_PRIM_TRIS, 1, 3);
}
}
PassMain::Sub *DeferredLayer::prepass_add(::Material *blender_mat,
@ -464,7 +445,7 @@ void DeferredLayer::render(View &view,
inst_.manager->submit(eval_light_ps_, view);
if (closure_bits_ & CLOSURE_SSS) {
inst_.manager->submit(subsurface_ps_, view);
inst_.subsurface.render(view, combined_fb, diffuse_light_tx_);
}
diffuse_light_tx_.release();

1
source/blender/draw/engines/eevee_next/eevee_pipeline.hh
View File

@ -132,7 +132,6 @@ class DeferredLayer {
PassMain::Sub *gbuffer_double_sided_ps_ = nullptr;
PassSimple eval_light_ps_ = {"EvalLights"};
PassSimple subsurface_ps_ = {"Subsurface"};
/* Closures bits from the materials in this pass. */
eClosureBits closure_bits_;

21
source/blender/draw/engines/eevee_next/eevee_subsurface.cc
View File

@ -38,6 +38,27 @@ void SubsurfaceModule::end_sync()
precompute_samples_location();
data_.push_update();
subsurface_ps_.init();
subsurface_ps_.state_set(DRW_STATE_WRITE_COLOR | DRW_STATE_STENCIL_EQUAL |
DRW_STATE_BLEND_ADD_FULL);
subsurface_ps_.state_stencil(0x00u, 0xFFu, CLOSURE_SSS);
subsurface_ps_.shader_set(inst_.shaders.static_shader_get(SUBSURFACE_EVAL));
inst_.subsurface.bind_resources(&subsurface_ps_);
inst_.hiz_buffer.bind_resources(&subsurface_ps_);
subsurface_ps_.bind_texture("radiance_tx", &diffuse_light_tx_);
subsurface_ps_.bind_texture("gbuffer_closure_tx", &inst_.gbuffer.closure_tx);
subsurface_ps_.bind_texture("gbuffer_color_tx", &inst_.gbuffer.color_tx);
subsurface_ps_.barrier(GPU_BARRIER_TEXTURE_FETCH);
pragma37 marked this conversation as resolved
Clément Foucault commented 2023-06-14 14:57:15 +02:00
Review
Copy Link

Also bind RBUFS_VALUE_SLOT otherwise it will trigger a warning / validation error.

Also bind `RBUFS_VALUE_SLOT` otherwise it will trigger a warning / validation error.
subsurface_ps_.draw_procedural(GPU_PRIM_TRIS, 1, 3);
}
void SubsurfaceModule::render(View &view, Framebuffer &fb, Texture &diffuse_light_tx)
{
fb.bind();
diffuse_light_tx_ = *&diffuse_light_tx;
inst_.manager->submit(subsurface_ps_, view);
}
void SubsurfaceModule::precompute_samples_location()

6
source/blender/draw/engines/eevee_next/eevee_subsurface.hh
View File

@ -37,6 +37,10 @@ struct SubsurfaceModule {
SubsurfaceDataBuf data_;
/** Contains translucence profile for a single color channel. */
Texture transmittance_tx_;
/** Scene diffuse irradiance. Pointer binded at sync time, set at render time. */
GPUTexture *diffuse_light_tx_;
/** Subsurface eval pass. Runs after the deferred pass. */
PassSimple subsurface_ps_ = {"Subsurface"};
public:
SubsurfaceModule(Instance &inst) : inst_(inst)
@ -49,6 +53,8 @@ struct SubsurfaceModule {
void end_sync();
void render(View &view, Framebuffer &fb, Texture &diffuse_light_tx);
template<typename T> void bind_resources(draw::detail::PassBase<T> *pass)
{
pass->bind_ubo("sss_buf", data_);