blender/blender
151
479
Fork 711
Code Issues 6.7k Pull Requests 899 Projects 18 Wiki Activity

Fix Cycles compilation error with OIDN < 2.2 #119155

Merged
Sergey Sharybin merged 2 commits from Sergey/blender:cycles_fix_oidn_v1 into main 2024-03-07 11:13:52 +01:00
Conversation 1 Commits 2 Files Changed 1 +6 -6
Sergey Sharybin commented 2024-03-07 10:55:22 +01:00
Owner
Copy Link

The enumerator values for various GPU compute platforms were
added starting with OIDN 2.0, with the Metal GPU type added
in OIDN 2.2.

This is an alternative fix to ebb781675d, which does not lead to
unhandled cases in switch statement, and follows the configuration
of OIDN and not Cycles (as OIDN might report devices which are
disabled in local Cycles build).

The enumerator values for various GPU compute platforms were added starting with OIDN 2.0, with the Metal GPU type added in OIDN 2.2. This is an alternative fix to ebb781675dd, which does not lead to unhandled cases in switch statement, and follows the configuration of OIDN and not Cycles (as OIDN might report devices which are disabled in local Cycles build).
Sergey Sharybin added 1 commit 2024-03-07 10:55:26 +01:00
Fix Cycles compilation error with OIDN < 2.2
All checks were successful
buildbot/vexp-code-patch-lint Build done.
Details
buildbot/vexp-code-patch-darwin-arm64 Build done.
Details
buildbot/vexp-code-patch-linux-x86_64 Build done.
Details
buildbot/vexp-code-patch-windows-amd64 Build done.
Details
buildbot/vexp-code-patch-darwin-x86_64 Build done.
Details
buildbot/vexp-code-patch-coordinator Build done.
Details
7e410c3cca 
The enumerator values for various GPU compute platforms were
added starting with OIDN 2.0, with the Metal GPU type added
in OIDN 2.2.
Sergey Sharybin commented 2024-03-07 10:55:43 +01:00
Author
Owner
Copy Link

@blender-bot build

@blender-bot build
Brecht Van Lommel requested changes 2024-03-07 10:57:40 +01:00
Dismissed
intern/cycles/integrator/denoiser_oidn_gpu.cpp
@ -50,1 +47,3 @@
# ifdef OIDN_DEVICE_METAL
/* The Metal support was added in OIDN 2.2.*/
# if OIDN_VERSION_MAJOR >= 2
Brecht Van Lommel commented 2024-03-07 10:57:27 +01:00
Owner
Copy Link

I think this should be:

#if OIDN_VERSION_MAJOR > 2 || OIDN_VERSION_MINOR >= 2
I think this should be: ``` #if OIDN_VERSION_MAJOR > 2 || OIDN_VERSION_MINOR >= 2 ```
Sergey Sharybin commented 2024-03-07 11:08:32 +01:00
Author
Owner
Copy Link

It was intended to be OIDN_VERSION_MINOR >= 2 here, as the major version is checked in the parent #if. However, even the intended code was not fully correct, as was not correct correct if the OIDN version is switched to 3.0 before we removed this version check.

The #if OIDN_VERSION_MAJOR > 2 || OIDN_VERSION_MINOR >= 2 could work here, but i think it will be more clear if we remove the nested checks for OIDN_VERSION_MAJOR.

It was intended to be `OIDN_VERSION_MINOR >= 2` here, as the major version is checked in the parent `#if`. However, even the intended code was not fully correct, as was not correct correct if the OIDN version is switched to 3.0 before we removed this version check. The `#if OIDN_VERSION_MAJOR > 2 || OIDN_VERSION_MINOR >= 2` could work here, but i think it will be more clear if we remove the nested checks for `OIDN_VERSION_MAJOR`.
brecht marked this conversation as resolved
Sergey Sharybin added 1 commit 2024-03-07 11:06:09 +01:00
Brecht Van Lommel approved these changes 2024-03-07 11:08:10 +01:00
Sergey Sharybin merged commit 032a24d8ac into main 2024-03-07 11:13:52 +01:00
Sergey Sharybin deleted branch cycles_fix_oidn_v1 2024-03-07 11:13:54 +01:00
Sign in to join this conversation.
Reviewers
No reviewers
Brecht Van Lommel
Labels
Clear labels   
Interest
Alembic

  
Interest
Animation & Rigging

  
Interest
Asset System
Asset datablocks, libraries, browser and shelf

  
Interest
Audio

  
Interest
Automated Testing

  
Interest
Blender Asset Bundle

  
Interest
BlendFile

  
Interest
Collada

  
Interest
Compatibility
Backward and forward compatibility

  
Interest
Compositing

  
Interest
Core

  
Interest
Cycles

  
Interest
Dependency Graph

  
Interest
Development Management

  
Interest
EEVEE

  
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
Viewport & EEVEE

  
Interest
Virtual Reality

  
Interest
Vulkan

  
Interest
Wayland
Wayland windowing on Unix

  
Interest
Workbench

  
Interest: X11

Xorg/X11 windowing

  
Legacy
Asset Browser Project

Archived

  
Legacy
Blender 2.8 Project

Archived

  
Legacy
Milestone 1: Basic, Local Asset Browser

Archived

  
Legacy
OpenGL Error

Archived

  
Meta
Good First Issue

  
Meta
Papercut

  
Meta
Retrospective

  
Meta
Security
Related to security, https://wiki.blender.org/wiki/Process/Vulnerability_Reports

  
Module
Animation & Rigging

  
Module
Core

  
Module
Development Management

  
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

  
Module
Viewport & EEVEE

  
Platform
FreeBSD

  
Platform
Linux

  
Platform
macOS

  
Platform
Windows

  
Severity
High

  
Severity
Low

  
Severity
Normal

  
Severity
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

Archived

  
Type
Report

Archived

  
Type
To Do

No Label
Interest
Alembic
Interest
Animation & Rigging
Interest
Asset System
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
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
Viewport & EEVEE
Interest
Virtual Reality
Interest
Vulkan
Interest
Wayland
Interest
Workbench
Interest: X11
Legacy
Asset Browser Project
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
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
Module
Viewport & EEVEE
Platform
FreeBSD
Platform
Linux
Platform
macOS
Platform
Windows
Severity
High
Severity
Low
Severity
Normal
Severity
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
2 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#119155
No description provided.
Delete Branch "Sergey/blender:cycles_fix_oidn_v1"

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?