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

EEVEE-Next: Remove Unused Resources in Probe Capture Pipeline

Browse Source 
The probe capture pipeline still had some bindings from the previous
implementation. This could result in overwriting the `gbuf_header_tx`
with the incorrect texture as it was sharing the same binding.

This PR removes the unused light probe bindings.

Pull Request: https://projects.blender.org/blender/blender/pulls/113276
This commit is contained in:
Jeroen Bakker
2023-10-05 10:52:47 +02:00
parent 3d1da2532b
commit f1c0ec3c4b
4 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -788,12 +788,6 @@ void DeferredProbeLayer::begin_sync()
gbuffer_single_sided_ps_ = &gbuffer_ps_.sub("SingleSided");
gbuffer_single_sided_ps_->state_set(state | DRW_STATE_CULL_BACK);
}
/* Light evaluate resources. */
{
eGPUTextureUsage usage = GPU_TEXTURE_USAGE_SHADER_READ | GPU_TEXTURE_USAGE_SHADER_WRITE;
dummy_light_tx_.ensure_2d(GPU_RGBA16F, int2(1), usage);
}
}
void DeferredProbeLayer::end_sync()
@@ -814,7 +808,6 @@ void DeferredProbeLayer::end_sync()
inst_.shadows.bind_resources(&pass);
inst_.sampling.bind_resources(&pass);
inst_.hiz_buffer.bind_resources(&pass);
inst_.reflection_probes.bind_resources(&pass);
inst_.irradiance_cache.bind_resources(&pass);
pass.barrier(GPU_BARRIER_TEXTURE_FETCH | GPU_BARRIER_SHADER_IMAGE_ACCESS);
pass.draw_procedural(GPU_PRIM_TRIS, 1, 3);

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

@@ -303,8 +303,6 @@ class DeferredProbeLayer {
/* Closures bits from the materials in this pass. */
eClosureBits closure_bits_;
Texture dummy_light_tx_ = {"dummy_light_accum_tx"};
public:
DeferredProbeLayer(Instance &inst) : inst_(inst){};

1
source/blender/draw/engines/eevee_next/shaders/eevee_deferred_capture_frag.glsl
View File

@@ -9,7 +9,6 @@
#pragma BLENDER_REQUIRE(eevee_gbuffer_lib.glsl)
#pragma BLENDER_REQUIRE(common_view_lib.glsl)
#pragma BLENDER_REQUIRE(eevee_light_eval_lib.glsl)
#pragma BLENDER_REQUIRE(eevee_lightprobe_eval_lib.glsl)
void main()
{

1
source/blender/draw/engines/eevee_next/shaders/infos/eevee_deferred_info.hh
View File

@@ -66,7 +66,6 @@ GPU_SHADER_CREATE_INFO(eevee_deferred_capture_eval)
"eevee_utility_texture",
"eevee_sampling_data",
"eevee_light_data",
"eevee_lightprobe_data",
"eevee_shadow_data",
"eevee_hiz_data",
"draw_view",