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

EEVEE Next: Ambient Occlusion #108398

Merged
Miguel Pozo merged 29 commits from pragma37/blender:pull-eevee-next-ao into main 2023-06-30 19:37:37 +02:00
Conversation 4 Commits 29 Files Changed 29 +2 -22
4 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 87e9895f91 - Show all commits

8
scripts/startup/bl_ui/properties_render.py
View File

@ -154,18 +154,12 @@ class RENDER_PT_eevee_next_ambient_occlusion(RenderButtonsPanel, Panel):
def poll(cls, context):
return (context.engine in cls.COMPAT_ENGINES)
def draw_header(self, context):
scene = context.scene
props = scene.eevee
self.layout.prop(props, "use_gtao", text="")
def draw(self, context):
layout = self.layout
layout.use_property_split = True
scene = context.scene
pragma37 marked this conversation as resolved
Clément Foucault commented 2023-06-16 16:43:37 +02:00
Review
Copy Link

Do not make it optional. Always enable it if render pass is needed. It might become a core part of the raytracing module.

Do not make it optional. Always enable it if render pass is needed. It might become a core part of the raytracing module.
Miguel Pozo commented 2023-06-16 21:04:44 +02:00
Review
Copy Link

Always enable it if render pass is needed

It already works that way. See AmbientOcclusion::init.

Do you want to always enable it for the main shading too?
I think some users wouldn’t like that.

> Always enable it if render pass is needed It already works that way. See `AmbientOcclusion::init`. Do you want to always enable it for the main shading too? I think some users wouldn’t like that.
Clément Foucault commented 2023-06-27 17:45:08 +02:00
Review
Copy Link

Do you want to always enable it for the main shading too?

Kind of. If it has to be an option it would be elsewhere.

> Do you want to always enable it for the main shading too? Kind of. If it has to be an option it would be elsewhere.
props = scene.eevee
layout.active = props.use_gtao
col = layout.column()
col.prop(props, "gtao_distance")
col.prop(props, "gtao_quality")

5
source/blender/draw/engines/eevee_next/eevee_ambient_occlusion.cc
View File

@ -36,10 +36,7 @@ namespace blender::eevee {
void AmbientOcclusion::init()
{
const Scene *scene = inst_.scene;
data_.enabled = (scene->eevee.flag & SCE_EEVEE_GTAO_ENABLED) ||
(inst_.film.enabled_passes_get() & EEVEE_RENDER_PASS_AO);
render_pass_enabled_ = data_.enabled && inst_.film.enabled_passes_get() & EEVEE_RENDER_PASS_AO;
render_pass_enabled_ = inst_.film.enabled_passes_get() & EEVEE_RENDER_PASS_AO;
data_.distance = scene->eevee.gtao_distance;
data_.quality = scene->eevee.gtao_quality;

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

@ -1006,7 +1006,6 @@ BLI_STATIC_ASSERT_ALIGN(RayTracingData, 16)
* \{ */
struct AOData {
bool1 enabled;
float distance;
float quality;
int _pad0;

10
source/blender/draw/engines/eevee_next/shaders/eevee_ambient_occlusion_lib.glsl
View File

@ -142,10 +142,6 @@ OcclusionData ambient_occlusion_search(vec3 vP,
const float inverted,
const float dir_sample_count)
{
if (!ao_buf.enabled) {
return ambient_occlusion_disabled_data();
}
vec2 noise = ambient_occlusion_get_noise(texel);
vec2 dir = ambient_occlusion_get_dir(noise.x);
vec2 uv = get_uvs_from_view(vP);
@ -211,12 +207,6 @@ void ambient_occlusion_eval(OcclusionData data,
/* No error by default. */
visibility_error = 1.0;
if (!ao_buf.enabled) {
visibility = data.custom_occlusion;
bent_normal = N;
return;
}
bool early_out = (inverted != 0.0) ? (max_v4(abs(data.horizons)) == 0.0) :
(min_v4(abs(data.horizons)) == M_PI);
if (early_out) {