Page MenuHome
Differential D11326

Eevee Wavelength Node Support
ClosedPublic
Actions

Authored by Iyad Ahmed (iyadahmed2001) on May 20 2021, 1:36 PM.

Details

Reviewers
Clément Foucault (fclem)
Brecht Van Lommel (brecht)
Group Reviewers
EEVEE & Viewport
Nodes
Commits
rBa43c7538b802: Eevee Wavelength Node Support
Summary

This patch adds wavelength node support to Eevee,
similar to how Eevee Blackbody node works, thus it is a little off from Cycles

Diff Detail

Repository
rB Blender

Event Timeline

Iyad Ahmed (iyadahmed2001) requested review of this revision.May 20 2021, 1:36 PM
Iyad Ahmed (iyadahmed2001) created this revision.
Iyad Ahmed (iyadahmed2001) edited the summary of this revision. (Show Details)
Iyad Ahmed (iyadahmed2001) edited the summary of this revision. (Show Details)May 20 2021, 1:39 PM
Iyad Ahmed (iyadahmed2001) edited the summary of this revision. (Show Details)May 20 2021, 1:53 PM
Iyad Ahmed (iyadahmed2001) edited the summary of this revision. (Show Details)
Clément Foucault (fclem) requested changes to this revision.May 20 2021, 2:03 PM
Clément Foucault (fclem) added a subscriber: Clément Foucault (fclem).

I like the straightforwardness of the implementation. Not much to change before I accept this into master.

First I was going to suggest to bake everything inside the texture but realize that would slowdown shader updates.

source/blender/blenlib/intern/math_color.c
718

Comment style.

751

Comment style. (i know it's copied code but still)

source/blender/gpu/shaders/material/gpu_shader_material_color_util.glsl
115–117 ↗(On Diff #37308)

Use a mat3 multiplication. This might help the compiler to optimize.

source/blender/gpu/shaders/material/gpu_shader_material_wavelength.glsl
8

Comment style. See https://wiki.blender.org/wiki/Style_Guide/C_Cpp#Comments.

8

How was the fitting done? Eye balled? Is is fitting the whole range?

What is lg?

9

if output is never above 1.0 you can use clamp(rgb, 0.0, 1.0) which is better on some architecture.

This revision now requires changes to proceed.May 20 2021, 2:03 PM
Brecht Van Lommel (brecht) added a subscriber: Brecht Van Lommel (brecht).May 20 2021, 2:08 PM
Brecht Van Lommel (brecht) added inline comments.
source/blender/blenlib/intern/math_color.c
718

Don't reference the Cycles code, if there is anything to be explained write it here.

source/blender/gpu/shaders/material/gpu_shader_material_color_util.glsl
115–118 ↗(On Diff #37308)

Don't hardcode XYZ to RGB conversion, use the appropriate matrix depending on the OpenColorIO config like the sky texture node does.

Iyad Ahmed (iyadahmed2001) updated this revision to Diff 37319.May 20 2021, 5:29 PM
Iyad Ahmed (iyadahmed2001) marked 8 inline comments as done.
  • Fix comment style
  • Copy comment from Cycles code
  • Use mat3 multiplication for XYZ to RGB
  • Use IMB_colormangement_get_xyz_to_rgb
Iyad Ahmed (iyadahmed2001) retitled this revision from Eevee Wavelngth Node Support to Eevee Wavelength Node Support.May 20 2021, 5:29 PM
Iyad Ahmed (iyadahmed2001) added inline comments.May 20 2021, 5:33 PM
source/blender/gpu/shaders/material/gpu_shader_material_wavelength.glsl
8

I copied it from Cycles, also the comment exactly as is, not sure what lg is, same comment in original OSL code
https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/blob/1435e3a202a8648ede87c9baf73847acd9793b33/src/liboslexec/opcolor.cpp#L796

Iyad Ahmed (iyadahmed2001) added a comment.EditedMay 20 2021, 5:34 PM

Alright patch updated, I'm not sure about moving get_XYZ_to_RGB_for_gpu to node_shader_util, was it a good move?

Clément Foucault (fclem) accepted this revision.May 20 2021, 5:53 PM

Greenlight from me.

This revision is now accepted and ready to land.May 20 2021, 5:53 PM
Iyad Ahmed (iyadahmed2001) added a comment.May 20 2021, 5:58 PM
In D11326#289817, @Clément Foucault (fclem) wrote:

Greenlight from me.

Awesome!

Brecht Van Lommel (brecht) accepted this revision.May 20 2021, 6:01 PM
Closed by commit rBa43c7538b802: Eevee Wavelength Node Support (authored by Iyad Ahmed (iyadahmed2001), committed by Ankit Meel (ankitm)). · Explain WhyMay 21 2021, 6:57 AM
This revision was automatically updated to reflect the committed changes.
Ankit Meel (ankitm) added a commit: rBa43c7538b802: Eevee Wavelength Node Support.
Jeroen Bakker (jbakker) awarded a token.May 21 2021, 8:26 AM
Vyacheslav (hitrpr) awarded a token.Aug 23 2021, 11:07 PM

Revision Contents
Changeset List

PathSize
source/
blender/
blenlib/
1 line
intern/
72 lines
gpu/
1 line
intern/
7 lines
shaders/
material/
15 lines
nodes/
shader/
6 lines
14 lines
nodes/
19 lines
28 lines

Diff 37337

View Options

source/blender/blenlib/BLI_math_color.h

Loading...
View Options

source/blender/blenlib/intern/math_color.c

Loading...
View Options

source/blender/gpu/CMakeLists.txt

Loading...
View Options

source/blender/gpu/intern/gpu_material_library.c

Loading...
View Options

source/blender/gpu/shaders/material/gpu_shader_material_wavelength.glsl

Loading...
View Options

source/blender/nodes/shader/node_shader_util.h

Loading...
View Options

source/blender/nodes/shader/node_shader_util.c

Loading...
View Options

source/blender/nodes/shader/nodes/node_shader_tex_sky.c

Loading...
View Options

source/blender/nodes/shader/nodes/node_shader_wavelength.c

Loading...