Fix #127205: OptiX error with OSL material using wavelength node #129372

Patrick Mours · 2024-10-24T13:38:58+02:00

Patrick Mours commented

2024-10-24 13:38:58 +02:00

The osl_wavelength_color_vf intrinsic was missing an implementation for OptiX, causing a link error when attempting to load OSL shaders using the wavelength node. This fixes that by simply copying over the implementation of svm_node_wavelength.

The `osl_wavelength_color_vf` intrinsic was missing an implementation for OptiX, causing a link error when attempting to load OSL shaders using the wavelength node. This fixes that by simply copying over the implementation of `svm_node_wavelength`.

Patrick Mours added 1 commit 2024-10-24 13:39:12 +02:00

Implement "osl_wavelength_color_vf" intrinsic 5a26dd2146

Patrick Mours added this to the Render & Cycles project 2024-10-24 13:39:18 +02:00

Patrick Mours requested review from Sergey Sharybin 2024-10-24 13:40:00 +02:00

Sergey Sharybin commented

2024-10-25 07:29:33 +02:00

Thanks for looking into this!

The only suggestion I have is to avoid duplication and move the logic that does not depend on the shading backend to intern/cycles/kernel/svm/math_util.h (similarly to the svm_math_blackbody_color_rec709). So, i.e., SVM implementation can look like:

  const float lambda_nm = stack_load_float(stack, wavelength);
  const float3 color = svm_math_wavelenght_to_color(kg, lambda_nm);
  stack_store_float3(stack, color_out, color);

Not sure if you've tried following this root. There might be some obstacles avoid duplication that are not immediately obvious?

Thanks for looking into this! The only suggestion I have is to avoid duplication and move the logic that does not depend on the shading backend to `intern/cycles/kernel/svm/math_util.h` (similarly to the `svm_math_blackbody_color_rec709`). So, i.e., SVM implementation can look like: ``` const float lambda_nm = stack_load_float(stack, wavelength); const float3 color = svm_math_wavelenght_to_color(kg, lambda_nm); stack_store_float3(stack, color_out, color); ``` Not sure if you've tried following this root. There might be some obstacles avoid duplication that are not immediately obvious?

Patrick Mours added 1 commit 2024-10-25 18:19:58 +02:00

Move wavelength to color code into utility function

buildbot/vexp-code-patch-lint Build done.

Details

buildbot/vexp-code-patch-darwin-arm64 Build done.

Details

buildbot/vexp-code-patch-darwin-x86_64 Build done.

Details

buildbot/vexp-code-patch-linux-x86_64 Build done.

Details

buildbot/vexp-code-patch-coordinator Build done.

Details

buildbot/vexp-code-patch-windows-amd64 Build done.

Details

799660e94b

Patrick Mours commented

2024-10-25 18:25:06 +02:00

Moved the majority into an utility function (hadn't it originally to keep the change smaller, but it's certainly nicer this way). It's a bit more difficult to move the whole thing unfortunately, since xyz_to_rgb relies on the KernelGlobals type declaration, but intern/cycles/kernel/svm/math_util.h is also included in intern/cycles/scene/shader_nodes.cpp, where that type is not available (and it feels wrong to add an include just for this there).

Moved the majority into an utility function (hadn't it originally to keep the change smaller, but it's certainly nicer this way). It's a bit more difficult to move the whole thing unfortunately, since `xyz_to_rgb` relies on the `KernelGlobals` type declaration, but `intern/cycles/kernel/svm/math_util.h` is also included in `intern/cycles/scene/shader_nodes.cpp`, where that type is not available (and it feels wrong to add an include just for this there).

Sergey Sharybin commented

2024-10-29 11:31:28 +01:00

@blender-bot package

Blender Bot commented

2024-10-29 11:31:32 +01:00

Package build started. Download here when ready.

Package build started. [Download here](https://builder.blender.org/download/patch/PR129372) when ready.

Sergey Sharybin approved these changes 2024-10-31 12:44:56 +01:00

Sergey Sharybin left a comment

Tested on Win11 with 6000 Ada, seems to work great!

Sergey Sharybin merged commit 3a36d638a5 into blender-v4.3-release

2024-10-31 12:47:58 +01:00

Sergey Sharybin referenced this issue from a commit

2024-10-31 12:47:58 +01:00

Fix #127205: OptiX error with OSL material using wavelength node

Sergey Sharybin deleted branch fix_optix_osl_wavelength_node

2024-10-31 12:48:06 +01:00

Sign in to join this conversation.

No reviewers

No Label

Download

What's New

Blender Studio

Manual

Developers Blog

Documentation

Benchmark

Blender Conference

Development Fund

One-time Donations

Fix #127205: OptiX error with OSL material using wavelength node #129372