From 2d472b70e5ae22ece199003f51742a72f485fd87 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 12 Apr 2022 19:17:47 +0200 Subject: Revert "Cycles: enable HIP for Vega and Vega II (Radeon 7) GPUs on Windows" This is not currently working, reverting until the driver/compiler has a fix. This reverts commit c46e58817cd72d1481967d32e3c6f47f42933d39. --- intern/cycles/blender/addon/properties.py | 2 +- intern/cycles/device/hip/util.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'intern') diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py index ee051766c50..ed054b041d8 100644 --- a/intern/cycles/blender/addon/properties.py +++ b/intern/cycles/blender/addon/properties.py @@ -1507,7 +1507,7 @@ class CyclesPreferences(bpy.types.AddonPreferences): 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 Vega architecture", icon='BLANK1') + col.label(text="Requires discrete AMD GPU with RDNA architecture", icon='BLANK1') if sys.platform[:3] == "win": col.label(text="and AMD Radeon Pro 21.Q4 driver or newer", icon='BLANK1') elif device_type == 'METAL': diff --git a/intern/cycles/device/hip/util.h b/intern/cycles/device/hip/util.h index 4e4906171d1..adb68a2d44c 100644 --- a/intern/cycles/device/hip/util.h +++ b/intern/cycles/device/hip/util.h @@ -51,7 +51,7 @@ static inline bool hipSupportsDevice(const int hipDevId) hipDeviceGetAttribute(&major, hipDeviceAttributeComputeCapabilityMajor, hipDevId); hipDeviceGetAttribute(&minor, hipDeviceAttributeComputeCapabilityMinor, hipDevId); - return (major >= 9); + return (major > 10) || (major == 10 && minor >= 1); } CCL_NAMESPACE_END -- cgit v1.2.3