Differential D3479

Cycles: Replace ambient occlusion BSDF with a node that output a value
ClosedPublic
Actions

Authored by Lukas Stockner (lukasstockner97) on Jun 15 2018, 12:05 AM.

Tags

None

Subscribers

Jason Clarke (jtheninja)

Details

Reviewers

Brecht Van Lommel (brecht)
Sergey Sharybin (sergey)

Commits

rC02da203ed0fe: change Ambient Occlusion shader to output colors
rBS799779d43230: Cycles: change Ambient Occlusion shader to output colors.
rB799779d43230: Cycles: change Ambient Occlusion shader to output colors.

Summary

This allows to use the output to influence other BSDFs, which has been requested for a long time.
Compatibility with the old node is preserved since value outputs connected to shader inputs now automatically get an Emission Closure for conversion.

There still are some things to do:

There's no GPU shader yet. I don't know whether that's possible, but we should look into it.
OSL isn't supported yet, maybe time for yet another texture name hack?
In some cases there is some clearly visible banding in the first few samples, which suggests a RNG problem.

One downside of this is that if there is an AO node and the AO pass is enabled, the two will no longer share the computation.

Also, for full compatibility, if there was something connected to the color input, a MixRGB node has to be inserted by versioning.

Diff Detail

Repository

Branch

arcpatch-D3479

Build Status

Buildable 1757
Build 1757: arc lint + arc unit

Event Timeline

Lukas Stockner (lukasstockner97) created this revision.Jun 15 2018, 12:05 AM

Jason Clarke (jtheninja) added a subscriber: Jason Clarke (jtheninja).Jun 15 2018, 6:53 AM

Keep Color input and add Color output, for convenience and backwards compat.
Default to Only Local, it's faster and sufficient for most cases.
Rename Radius to Distance.
Add OSL support. Quite ugly but we have no better solution in the OSL API.
Placeholder GPU shader for master, will need more work when merging into 2.8 for Eevee.
Don't use SVM AO code for global and baking AO. These support transparency which the new node does not, I prefer to keep that feature available at least for baking.
Remove VNDF code since sampling it is quite noisy and the discontinuous sampling is quite visible with low number of samples. I also don't see really bad artifacts when just sampling the hemisphere around the smooth normal.

Harbormaster completed remote builds in B1757: Diff 11251.Jun 15 2018, 3:05 PM

Tested performance on CPU/CUDA GTX 1080, found no significant slowdown.

This revision is now accepted and ready to land.Jun 15 2018, 10:13 PM

Closed by commit rB799779d43230: Cycles: change Ambient Occlusion shader to output colors. (authored by Lukas Stockner (lukasstockner97), committed by Brecht Van Lommel (brecht)). · Explain WhyJun 15 2018, 10:31 PM

This revision was automatically updated to reflect the committed changes.

Garry R. Osgood (grosgood) mentioned this in T77106: Crash when baking diffuse map. (EXCEPTION_ACCESS_VIOLATION).May 30 2020, 6:37 PM

Revision Contents
Changeset List

Path

Size

intern/

cycles/

blender/

addon/

version_update.py

53 lines

blender_shader.cpp

7 lines

kernel/

1 line

bvh/

2 lines

59 lines

58 lines

geom/

geom_motion_triangle_intersect.h

20 lines

geom_triangle_intersect.h

20 lines

4 lines

kernel_path_branched.h

2 lines

kernel_shader.h

4 lines

3 lines

osl/

26 lines

2 lines

osl_closures.cpp

2 lines

1 line

osl_services.cpp

20 lines

shaders/

node_ambient_occlusion.osl

19 lines

split/

kernel_holdout_emission_blurring_pathtermination_ao.h

2 lines

svm/

7 lines

111 lines

18 lines

10 lines

render/

12 lines

38 lines

release/

scripts/

startup/

nodeitems_builtins.py

2 lines

source/

blender/

blenkernel/

BKE_blender_version.h

2 lines

blenloader/

intern/

versioning_270.c

2 lines

editors/

space_node/

10 lines

gpu/

shaders/

gpu_shader_material.glsl

5 lines

makesdna/

DNA_node_types.h

3 lines

makesrna/

intern/

21 lines

nodes/

NOD_static_types.h

2 lines

shader/

nodes/

node_shader_ambient_occlusion.c

15 lines

Diff 11251

intern/cycles/blender/addon/version_update.py

Loading...

intern/cycles/blender/blender_shader.cpp

Loading...

intern/cycles/kernel/CMakeLists.txt

Loading...

intern/cycles/kernel/bvh/bvh.h

Loading...

intern/cycles/kernel/bvh/bvh_local.h

Loading...

intern/cycles/kernel/bvh/qbvh_local.h

Loading...

intern/cycles/kernel/geom/geom_motion_triangle_intersect.h

Loading...

intern/cycles/kernel/geom/geom_triangle_intersect.h

Loading...

intern/cycles/kernel/kernel_path.h

Loading...

intern/cycles/kernel/kernel_path_branched.h

Loading...

intern/cycles/kernel/kernel_shader.h

Loading...

intern/cycles/kernel/kernel_types.h

Loading...

intern/cycles/kernel/osl/background.cpp

Loading...

intern/cycles/kernel/osl/osl_closures.h

Loading...

intern/cycles/kernel/osl/osl_closures.cpp

Loading...

intern/cycles/kernel/osl/osl_services.h

Loading...

intern/cycles/kernel/osl/osl_services.cpp

Loading...

intern/cycles/kernel/shaders/node_ambient_occlusion.osl

Loading...

intern/cycles/kernel/split/kernel_holdout_emission_blurring_pathtermination_ao.h

Loading...

intern/cycles/kernel/svm/svm.h

Loading...

intern/cycles/kernel/svm/svm_ao.h

Loading...

intern/cycles/kernel/svm/svm_closure.h

Loading...

intern/cycles/kernel/svm/svm_types.h

Loading...

intern/cycles/render/nodes.h

Loading...

intern/cycles/render/nodes.cpp

Loading...

release/scripts/startup/nodeitems_builtins.py

Loading...

source/blender/blenkernel/BKE_blender_version.h

Loading...

source/blender/blenloader/intern/versioning_270.c

Loading...

source/blender/editors/space_node/drawnode.c

Loading...

source/blender/gpu/shaders/gpu_shader_material.glsl

Loading...

source/blender/makesdna/DNA_node_types.h

Loading...

source/blender/makesrna/intern/rna_nodetree.c

Loading...

source/blender/nodes/NOD_static_types.h

Loading...

source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.c

Loading...