diff options
author | Aaron Carlisle <carlisle.b3d@gmail.com> | 2021-11-09 19:43:18 +0300 |
---|---|---|
committer | Aaron Carlisle <carlisle.b3d@gmail.com> | 2021-11-09 19:43:18 +0300 |
commit | 7383f954438f9b6e2e5f09bf77b0389621c0dff4 (patch) | |
tree | 1e489b16f529072b6145932d56f7ee33a3c9ed2e /intern | |
parent | ed0df0f3c603cc2689bbc61a6d684b97e172d420 (diff) | |
parent | 74fe19b19395628e68eff3ae35993eac3e051b34 (diff) |
Merge branch 'blender-v3.0-release'
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/blender/addon/properties.py | 2 | ||||
-rw-r--r-- | intern/cycles/device/hip/device_impl.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/device/hip/util.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py index 8efb8e41c30..64613216be0 100644 --- a/intern/cycles/blender/addon/properties.py +++ b/intern/cycles/blender/addon/properties.py @@ -1419,7 +1419,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 RDNA2 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') return diff --git a/intern/cycles/device/hip/device_impl.cpp b/intern/cycles/device/hip/device_impl.cpp index e7772cec262..e8482772186 100644 --- a/intern/cycles/device/hip/device_impl.cpp +++ b/intern/cycles/device/hip/device_impl.cpp @@ -154,7 +154,7 @@ bool HIPDevice::support_device(const uint /*kernel_features*/) hipDeviceProp_t props; hipGetDeviceProperties(&props, hipDevId); - set_error(string_printf("HIP backend requires AMD RDNA2 graphics card or up, but found %s.", + set_error(string_printf("HIP backend requires AMD RDNA graphics card or up, but found %s.", props.name)); return false; } diff --git a/intern/cycles/device/hip/util.h b/intern/cycles/device/hip/util.h index f3194ecaa77..e9420becb2d 100644 --- a/intern/cycles/device/hip/util.h +++ b/intern/cycles/device/hip/util.h @@ -64,7 +64,7 @@ static inline bool hipSupportsDevice(const int hipDevId) hipDeviceGetAttribute(&major, hipDeviceAttributeComputeCapabilityMajor, hipDevId); hipDeviceGetAttribute(&minor, hipDeviceAttributeComputeCapabilityMinor, hipDevId); - return (major > 10) || (major == 10 && minor >= 3); + return (major > 10) || (major == 10 && minor >= 1); } CCL_NAMESPACE_END |