[Bf-blender-cvs] [1252de028f3] cycles_oneapi: Merge branch 'master' into cycles_oneapi

[Werner, Stefan]

Commit: 1252de028f3370d522e16dfa77a1f28f0f0b006b
Author: Werner, Stefan
Date:   Tue Apr 26 15:34:42 2022 +0200
Branches: cycles_oneapi
https://developer.blender.org/rB1252de028f3370d522e16dfa77a1f28f0f0b006b

Merge branch 'master' into cycles_oneapi

===================================================================



===================================================================

diff --cc intern/cycles/blender/addon/properties.py
index 2e7057bd9ad,a0ceb9c3c29..6bdced1d81f
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@@@ -1511,16 -1516,12 +1520,19 @@@ class CyclesPreferences(bpy.types.Addon
                  col.label(text="and NVIDIA driver version 470 or newer", icon='BLANK1')
              elif device_type == 'HIP':
                  import sys
-                 col.label(text="Requires discrete AMD GPU with RDNA architecture", icon='BLANK1')
                  if sys.platform[:3] == "win":
+                     col.label(text="Requires discrete AMD GPU with RDNA architecture", icon='BLANK1')
                      col.label(text="and AMD Radeon Pro 21.Q4 driver or newer", icon='BLANK1')
+                 elif sys.platform.startswith("linux"):
+                     col.label(text="Requires discrete AMD GPU with RDNA architecture", icon='BLANK1')
+                     col.label(text="and AMD driver version 22.10 or newer", icon='BLANK1')
 +            elif device_type == 'ONEAPI':
 +                import sys
 +                col.label(text="Requires Intel GPU with Xe architecture", icon='BLANK1')
 +                if sys.platform.startswith("win"):
 +                    col.label(text="and Windows driver version 101.1660 or newer", icon='BLANK1')
 +                elif sys.platform.startswith("linux"):
 +                    col.label(text="and Linux driver version xx.xx.20066 or newer", icon='BLANK1')
              elif device_type == 'METAL':
                  col.label(text="Requires Apple Silicon with macOS 12.2 or newer", icon='BLANK1')
                  col.label(text="or AMD with macOS 12.3 or newer", icon='BLANK1')