blender
/
blender
133
398
Fork 579
Code Issues 6.3k Pull Requests 747 Projects 19 Wiki Activity

Fix Light Tree option causing wrong renders on macOS AMD #105022

Merged
Sergey Sharybin merged 3 commits from Sergey/blender:cycles_fix_light_tree_apple_amd into blender-v3.5-release 2023-02-21 16:50:20 +01:00
Conversation 2 Commits 3 Files Changed 3 +9 -5
Sergey Sharybin commented 2023-02-21 14:19:06 +01:00
Owner
Copy Link

The light tree itself is disabled on the AMD GPUs due to a compiler issue.

There are couple of places where this was not fully checked:

  • The light_sample function in the kernel.
  • The light threshold during synchronization

The former one is solved as easy as just adding an ifdef block.

The latter one is solved by delaying the threshold assignment for
later on. There is some duplication of the the use_light_tree assignment
for the kintegrator->use_light_tree (happens in the integrator.cpp
and light.cpp). Not sure what the initial intent for the source of truth
was, but it seems safer than having two non-match assignments in different
places.

The light tree itself is disabled on the AMD GPUs due to a compiler issue. There are couple of places where this was not fully checked: - The `light_sample` function in the kernel. - The light threshold during synchronization The former one is solved as easy as just adding an ifdef block. The latter one is solved by delaying the threshold assignment for later on. There is some duplication of the the use_light_tree assignment for the `kintegrator->use_light_tree` (happens in the integrator.cpp and light.cpp). Not sure what the initial intent for the source of truth was, but it seems safer than having two non-match assignments in different places.
❤️ 1
Sergey Sharybin added the
Interest
Render & Cycles
Module
Render & Cycles
Interest
Cycles
 labels 2023-02-21 14:19:06 +01:00
Sergey Sharybin added 1 commit 2023-02-21 14:19:22 +01:00
buildbot/vexp-code-patch-coordinator Build done. Details
ab83466180 Fix Light Tree option causing wrong renders on macOS AMD 
The light tree itself is disabled on the AMD GPUs due to a compiler issue.

There are couple of places where this was not fully checked:

- The `light_sample` function in the kernel.
- The light threshold during synchronization

The former one is solved as easy as just adding an ifdef block.

The latter one is solved by delaying the threshold assignment for
later on. There is some duplication of the the use_light_tree assignment
for the `kintegrator->use_light_tree` (happens in the integrator.cpp
and light.cpp). Not sure what the initial intent for the source of truth
was, but it seems safer than having two non-match assignments in different
places.
Sergey Sharybin commented 2023-02-21 14:19:34 +01:00
Author
Owner
Copy Link

@blender-bot build

@blender-bot build
Sergey Sharybin requested review from Brecht Van Lommel 2023-02-21 14:19:41 +01:00
Sergey Sharybin requested review from Weizhen Huang 2023-02-21 14:19:56 +01:00
Brecht Van Lommel approved these changes 2023-02-21 14:21:52 +01:00
Weizhen Huang reviewed 2023-02-21 15:16:03 +01:00
intern/cycles/scene/integrator.cpp
@ -257,3 +257,2 @@
kintegrator->use_light_tree = scene->integrator->use_light_tree;
if (light_sampling_threshold > 0.0f) {
kintegrator->use_light_tree = scene->integrator->get_use_light_tree() &&
Weizhen Huang commented 2023-02-21 15:14:19 +01:00
Member
Copy Link

I think this line can be deleted.

I think this line can be deleted.
Sergey Sharybin commented 2023-02-21 15:38:48 +01:00
Author
Owner
Copy Link

The previous logic was focing the light_sampling_threshold to be 0 if when using the light tree. If we remove the kintegrator->use_light_tree = ... from here we would not be able to know if the light trees are actually used or not (the light manager is updated after the integrator).

There is possibility of adding checks in the kernel itself around access light_inv_rr_threshold but those are quite few places to cover.

Another possibility is to remove kintegrator->use_light_tree = ... from the light.cpp. Would make more sense to update integrator from the integrator.cpp. Seems safe, but not sure its safe enough for 3.5.

The previous logic was focing the `light_sampling_threshold` to be 0 if when using the light tree. If we remove the `kintegrator->use_light_tree = ...` from here we would not be able to know if the light trees are actually used or not (the light manager is updated after the integrator). There is possibility of adding checks in the kernel itself around access `light_inv_rr_threshold` but those are quite few places to cover. Another possibility is to remove `kintegrator->use_light_tree = ...` from the `light.cpp`. Would make more sense to update integrator from the `integrator.cpp`. Seems safe, but not sure its safe enough for 3.5.
Weizhen Huang commented 2023-02-21 15:49:36 +01:00
Member
Copy Link

But according to scene.cpp the light manager is updated before the integrator?
If light manager is updated after the integrator I agree it would be better to remove the other one. But yes if this goes into 3.5 it might be safer to keep the duplication for now.

But according to `scene.cpp` the light manager is updated before the integrator? If light manager is updated after the integrator I agree it would be better to remove the other one. But yes if this goes into 3.5 it might be safer to keep the duplication for now.
Sergey Sharybin commented 2023-02-21 16:12:05 +01:00
Author
Owner
Copy Link

Ah, you're right. I've misread integrator->tag_modified(); in almost the beginning as something else.

Ah, you're right. I've misread `integrator->tag_modified();` in almost the beginning as something else.
Weizhen Huang commented 2023-02-21 16:18:29 +01:00
Member
Copy Link

Typo in the comment :DD

Typo in the comment :DD
Sergey Sharybin commented 2023-02-21 16:19:36 +01:00
Author
Owner
Copy Link

Fixed a typo. Not sure if there is anything else. The VS Code spell checker does not show anything ;)

Fixed a typo. Not sure if there is anything else. The VS Code spell checker does not show anything ;)
Weizhen Huang approved these changes 2023-02-21 16:13:24 +01:00
Sergey Sharybin added 1 commit 2023-02-21 16:16:03 +01:00
buildbot/vexp-code-patch-coordinator Build done. Details
cbd2b17b7d Remove duplicated assignment of kintegrator->use_light_tree 
Also added comment why this is fine.
Sergey Sharybin commented 2023-02-21 16:16:14 +01:00
Author
Owner
Copy Link

@blender-bot build

@blender-bot build
Sergey Sharybin added 1 commit 2023-02-21 16:19:24 +01:00
Sergey Sharybin merged commit dd65e9901f into blender-v3.5-release 2023-02-21 16:50:20 +01:00
Sergey Sharybin deleted branch cycles_fix_light_tree_apple_amd 2023-02-21 16:50:20 +01:00
Sign in to join this conversation.
Reviewers
No reviewers
Brecht Van Lommel
Weizhen Huang
Labels
Clear labels   
Interest
Alembic

  
Interest
Animation & Rigging

  
Interest
Asset Browser

  
Interest
Asset Browser Project Overview

  
Interest
Audio

  
Interest
Automated Testing

  
Interest
Blender Asset Bundle

  
Interest
BlendFile

  
Interest
Collada

  
Interest
Compatibility
This issue affects/is about backward or forward compatibility

  
Interest
Compositing

  
Interest
Core

  
Interest
Cycles

  
Interest
Dependency Graph

  
Interest
Development Management

  
Interest
EEVEE

  
Interest
EEVEE & Viewport

  
Interest
Freestyle

  
Interest
Geometry Nodes

  
Interest
Grease Pencil

  
Interest
ID Management

  
Interest
Images & Movies

  
Interest
Import Export

  
Interest
Line Art

  
Interest
Masking

  
Interest
Metal

  
Interest
Modeling

  
Interest
Modifiers

  
Interest
Motion Tracking

  
Interest
Nodes & Physics

  
Interest
OpenGL

  
Interest
Overlay

  
Interest
Overrides

  
Interest
Performance

  
Interest
Physics

  
Interest
Pipeline, Assets & IO

  
Interest
Platforms, Builds & Tests

  
Interest
Python API

  
Interest
Render & Cycles

  
Interest
Render Pipeline

  
Interest
Sculpt, Paint & Texture

  
Interest
Text Editor

  
Interest
Translations

  
Interest
Triaging

  
Interest
Undo

  
Interest
USD

  
Interest
User Interface

  
Interest
UV Editing

  
Interest
VFX & Video

  
Interest
Video Sequencer

  
Interest
Virtual Reality

  
Interest
Vulkan

  
Interest
Wayland
Issues relating to Wayland windowing support.

  
Interest
Workbench

  
Interest: X11

Issues relating to Xorg/X11 support.

  
Legacy
Blender 2.8 Project

  
Legacy
Milestone 1: Basic, Local Asset Browser

  
Legacy
OpenGL Error

  
Meta
Good First Issue

  
Meta
Papercut

  
Meta
Retrospective

  
Meta
Security
Issues relating to security: https://wiki.blender.org/wiki/Process/Vulnerability_Reports

  
Module
Animation & Rigging

  
Module
Core

  
Module
Development Management

  
Module
EEVEE & Viewport

  
Module
Grease Pencil

  
Module
Modeling

  
Module
Nodes & Physics

  
Module
Pipeline, Assets & IO

  
Module
Platforms, Builds & Tests

  
Module
Python API

  
Module
Render & Cycles

  
Module
Sculpt, Paint & Texture

  
Module
Triaging

  
Module
User Interface

  
Module
VFX & Video

  
Platform
FreeBSD

  
Platform
Linux

  
Platform
macOS

  
Platform
Windows

  
Priority
High

  
Priority
Low

  
Priority
Normal

  
Priority
Unbreak Now!

  
Status
Archived

  
Status
Confirmed

  
Status
Duplicate

  
Status
Needs Info from Developers

  
Status
Needs Information from User

  
Status
Needs Triage

  
Status
Resolved

  
Type
Bug

  
Type
Design

  
Type
Known Issue

  
Type
Patch

  
Type
Report

  
Type
To Do

No Label
Interest
Alembic
Interest
Animation & Rigging
Interest
Asset Browser
Interest
Asset Browser Project Overview
Interest
Audio
Interest
Automated Testing
Interest
Blender Asset Bundle
Interest
BlendFile
Interest
Collada
Interest
Compatibility
Interest
Compositing
Interest
Core
Interest
Cycles
Interest
Dependency Graph
Interest
Development Management
Interest
EEVEE
Interest
EEVEE & Viewport
Interest
Freestyle
Interest
Geometry Nodes
Interest
Grease Pencil
Interest
ID Management
Interest
Images & Movies
Interest
Import Export
Interest
Line Art
Interest
Masking
Interest
Metal
Interest
Modeling
Interest
Modifiers
Interest
Motion Tracking
Interest
Nodes & Physics
Interest
OpenGL
Interest
Overlay
Interest
Overrides
Interest
Performance
Interest
Physics
Interest
Pipeline, Assets & IO
Interest
Platforms, Builds & Tests
Interest
Python API
Interest
Render & Cycles
Interest
Render Pipeline
Interest
Sculpt, Paint & Texture
Interest
Text Editor
Interest
Translations
Interest
Triaging
Interest
Undo
Interest
USD
Interest
User Interface
Interest
UV Editing
Interest
VFX & Video
Interest
Video Sequencer
Interest
Virtual Reality
Interest
Vulkan
Interest
Wayland
Interest
Workbench
Interest: X11
Legacy
Blender 2.8 Project
Legacy
Milestone 1: Basic, Local Asset Browser
Legacy
OpenGL Error
Meta
Good First Issue
Meta
Papercut
Meta
Retrospective
Meta
Security
Module
Animation & Rigging
Module
Core
Module
Development Management
Module
EEVEE & Viewport
Module
Grease Pencil
Module
Modeling
Module
Nodes & Physics
Module
Pipeline, Assets & IO
Module
Platforms, Builds & Tests
Module
Python API
Module
Render & Cycles
Module
Sculpt, Paint & Texture
Module
Triaging
Module
User Interface
Module
VFX & Video
Platform
FreeBSD
Platform
Linux
Platform
macOS
Platform
Windows
Priority
High
Priority
Low
Priority
Normal
Priority
Unbreak Now!
Status
Archived
Status
Confirmed
Status
Duplicate
Status
Needs Info from Developers
Status
Needs Information from User
Status
Needs Triage
Status
Resolved
Type
Bug
Type
Design
Type
Known Issue
Type
Patch
Type
Report
Type
To Do
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
3 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: blender/blender#105022
No description provided.
Delete Branch "Sergey/blender:cycles_fix_light_tree_apple_amd"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?