Commit: 83258b5c9f082467b463c63e8b5ed64c3aa13b4d
Author: Xavier Hallade
Date: Wed Jun 29 09:31:26 2022 +0200
Branches: cycles_oneapi
https://developer.blender.org/rB83258b5c9f082467b463c63e8b5ed64c3aa13b4d
Merge branch 'master' into cycles_oneapi
===================================================================
===================================================================
diff --cc intern/cycles/blender/addon/properties.py
index bafbbc99479,17f05f6da34..7d7ca78c15a
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@@@ -1549,18 -1545,11 +1549,18 @@@ class CyclesPreferences(bpy.types.Addon
elif device_type == 'HIP':
import sys
if sys.platform[:3] == "win":
- col.label(text="Requires discrete AMD GPU with RDNA
architecture", icon='BLANK1')
+ col.label(text="Requires AMD GPU with Vega or 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="Requires AMD GPU with Vega or 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-HPG 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')
diff --cc intern/cycles/util/math.h
index 88bb122dc3b,f1f627588c5..af2f1ea092d
--- a/intern/cycles/util/math.h
+++ b/intern/cycles/util/math.h
@@@ -799,8 -793,9 +799,11 @@@ ccl_device_inline uint popcount(uint x
return i & 1;
}
# endif
+#elif defined(__KERNEL_ONEAPI__)
+# define popcount(x) sycl::popcount(x)
+ #elif defined(__KERNEL_HIP__)
+ /* Use popcll to support 64-bit wave for pre-RDNA AMD GPUs */
+ # define popcount(x) __popcll(x)
#elif !defined(__KERNEL_METAL__)
# define popcount(x) __popc(x)
#endif
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
