blender
/
blender
136
406
Fork 589
Code Issues 6.3k Pull Requests 766 Projects 19 Wiki Activity

EEVEE Next: Volumes #107176

Merged
Miguel Pozo merged 126 commits from pragma37/blender:pull-eevee-next-volumes into main 2023-08-04 16:47:22 +02:00
Conversation 5 Commits 126 Files Changed 35 +10 -18
2 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1d6d6ecdb5 - Show all commits

10
source/blender/draw/engines/eevee_next/eevee_volumes.cc
View File

@ -383,10 +383,10 @@ void Volumes::end_sync()
resolve_ps_.state_set(DRW_STATE_WRITE_COLOR | DRW_STATE_BLEND_CUSTOM);
resolve_ps_.shader_set(inst_.shaders.static_shader_get(VOLUME_RESOLVE));
bind_common_resources(resolve_ps_);
resolve_ps_.bind_texture("inScattering", &scatter_tx_.current());
resolve_ps_.bind_texture("inTransmittance", &transmit_tx_.current());
resolve_ps_.bind_texture("inScattering", &scatter_tx_.next());
resolve_ps_.bind_texture("inTransmittance", &transmit_tx_.next());
resolve_ps_.bind_texture("inSceneDepth", &inst_.render_buffers.depth_tx);
resolve_ps_.draw_procedural(GPU_PRIM_TRIS, 1, data_.tex_size.z * 3);
resolve_ps_.draw_procedural(GPU_PRIM_TRIS, 1, 3);
}
void Volumes::draw_compute(View &view)
@ -423,8 +423,8 @@ void Volumes::draw_compute(View &view)
inst_.manager->submit(scatter_ps_, view);
integration_fb_.ensure(GPU_ATTACHMENT_NONE,
GPU_ATTACHMENT_TEXTURE(scatter_tx_.previous()),
GPU_ATTACHMENT_TEXTURE(transmit_tx_.previous()));
GPU_ATTACHMENT_TEXTURE(scatter_tx_.next()),
GPU_ATTACHMENT_TEXTURE(transmit_tx_.next()));
integration_fb_.bind();
inst_.manager->submit(integration_ps_, view);

18
source/blender/draw/engines/eevee_next/shaders/infos/eevee_volume_info.hh
View File

@ -37,8 +37,7 @@ GPU_SHADER_CREATE_INFO(eevee_volume_common)
GPU_SHADER_CREATE_INFO(eevee_volume_clear)
.additional_info("eevee_volume_common")
.fragment_source("eevee_volume_clear_frag.glsl")
.do_static_compilation(true)
.auto_resource_location(true);
.do_static_compilation(true);
/* TODO (Miguel Pozo) */
#ifdef WITH_METAL_BACKEND
@ -92,8 +91,7 @@ GPU_SHADER_CREATE_INFO(eevee_volume_scatter)
.geometry_source("eevee_volume_geom.glsl")
.geometry_out(eevee_volume_geom_frag_iface)
.geometry_layout(PrimitiveIn::TRIANGLES, PrimitiveOut::TRIANGLE_STRIP, 3)
.do_static_compilation(true)
.auto_resource_location(true);
.do_static_compilation(true);
#ifdef WITH_METAL_BACKEND
GPU_SHADER_CREATE_INFO(eevee_volume_scatter_no_geom)
@ -109,8 +107,7 @@ GPU_SHADER_CREATE_INFO(eevee_volume_scatter_with_lights_common).define("VOLUME_L
GPU_SHADER_CREATE_INFO(eevee_volume_scatter_with_lights)
.additional_info("eevee_volume_scatter_with_lights_common")
.additional_info("eevee_volume_scatter")
.do_static_compilation(true)
.auto_resource_location(true);
.do_static_compilation(true);
#ifdef WITH_METAL_BACKEND
GPU_SHADER_CREATE_INFO(eevee_volume_scatter_with_lights_no_geom)
@ -145,8 +142,7 @@ GPU_SHADER_CREATE_INFO(eevee_volume_integration)
.geometry_source("eevee_volume_geom.glsl")
.geometry_out(eevee_volume_geom_frag_iface)
.geometry_layout(PrimitiveIn::TRIANGLES, PrimitiveOut::TRIANGLE_STRIP, 3)
.do_static_compilation(true)
.auto_resource_location(true);
.do_static_compilation(true);
#ifdef WITH_METAL_BACKEND
GPU_SHADER_CREATE_INFO(eevee_volume_integration_no_geom)
@ -162,14 +158,12 @@ GPU_SHADER_CREATE_INFO(eevee_volume_resolve_common)
.additional_info("draw_fullscreen")
.additional_info("eevee_volume_lib")
.sampler(0, ImageType::DEPTH_2D, "inSceneDepth")
.fragment_source("eevee_volume_resolve_frag.glsl")
.auto_resource_location(true);
.fragment_source("eevee_volume_resolve_frag.glsl");
GPU_SHADER_CREATE_INFO(eevee_volume_resolve)
.additional_info("eevee_volume_resolve_common")
.fragment_out(0, Type::VEC4, "FragColor0", DualBlend::SRC_0)
.fragment_out(0, Type::VEC4, "FragColor1", DualBlend::SRC_1)
.auto_resource_location(true)
.do_static_compilation(true);
GPU_SHADER_CREATE_INFO(eevee_volume_resolve_accum)
@ -177,7 +171,6 @@ GPU_SHADER_CREATE_INFO(eevee_volume_resolve_accum)
.additional_info("eevee_volume_resolve_common")
.fragment_out(0, Type::VEC4, "FragColor0")
.fragment_out(1, Type::VEC4, "FragColor1")
.auto_resource_location(true)
.do_static_compilation(true);
/* EEVEE_shaders_volumes_accum_sh_get */
@ -187,5 +180,4 @@ GPU_SHADER_CREATE_INFO(eevee_volume_accum)
.fragment_out(0, Type::VEC4, "FragColor0")
.fragment_out(1, Type::VEC4, "FragColor1")
.fragment_source("eevee_volume_accum_frag.glsl")
.auto_resource_location(true)
.do_static_compilation(true);