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

Fix: EEVEE-Next: Planar Probe rendering broken

Browse Source 
Was caused by several small mistakes.
This commit is contained in:
Clément Foucault
2023-12-11 17:27:07 +01:00
parent 85f9758302
commit 3df81b0b86
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1354,7 +1354,9 @@ void PlanarProbePipeline::render(View &view,
GPU_framebuffer_clear_depth(gbuffer_fb, 1.0f);
inst_.manager->submit(prepass_ps_, view);
inst_.hiz_buffer.set_source(&depth_layer_tx);
/* TODO(fclem): This is the only place where we use the layer source to HiZ.
* This is because the texture layer view is still a layer texture. */
inst_.hiz_buffer.set_source(&depth_layer_tx, 0);
inst_.lights.set_view(view, extent);
inst_.shadows.set_view(view, depth_layer_tx);
inst_.irradiance_cache.set_view(view);
@@ -1362,8 +1364,14 @@ void PlanarProbePipeline::render(View &view,
/* Update for lighting pass. */
inst_.hiz_buffer.update();
GPU_framebuffer_bind(gbuffer_fb);
GPU_framebuffer_clear_color(gbuffer_fb, float4(0.0f, 0.0f, 0.0f, 1.0f));
GPU_framebuffer_bind_ex(gbuffer_fb,
{
{GPU_LOADACTION_LOAD, GPU_STOREACTION_STORE}, /* Depth */
{GPU_LOADACTION_CLEAR, GPU_STOREACTION_STORE, {0.0f}}, /* Combined */
{GPU_LOADACTION_CLEAR, GPU_STOREACTION_STORE, {0}}, /* GBuf Header */
{GPU_LOADACTION_DONT_CARE, GPU_STOREACTION_STORE}, /* GBuf Closure */
{GPU_LOADACTION_DONT_CARE, GPU_STOREACTION_STORE}, /* GBuf Color */
});
inst_.manager->submit(gbuffer_ps_, view);
GPU_framebuffer_bind(combined_fb);

2
source/blender/draw/engines/eevee_next/eevee_planar_probes.cc
View File

@@ -150,7 +150,7 @@ void PlanarProbeModule::set_view(const draw::View &main_view, int2 main_view_ext
GPU_ATTACHMENT_TEXTURE_LAYER(gbuf.closure_tx.layer_view(0), 0));
instance_.pipelines.planar.render(
res.view, depth_tx_.layer_view(resource_index), res.combined_fb, res.gbuffer_fb, extent);
res.view, depth_tx_.layer_view(resource_index), res.gbuffer_fb, res.combined_fb, extent);
if (do_display_draw_ && probe.viewport_display) {
display_data_buf_.get_or_resize(display_index++) = {probe.plane_to_world, resource_index};