diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-08-09 17:03:09 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-08-09 17:03:09 +0300 |
commit | b70f85f2aae977dc361d40b73cf5a110495c6cab (patch) | |
tree | bb6a74051208f5a927ac3c88771af23a9d174935 /intern/cycles/device/opencl/opencl_util.cpp | |
parent | 2e10c658f42a842404f16a1b03ff4844e41d538c (diff) | |
parent | e20a0798dc6ca38eb4a06dda7948bd1c306d0693 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/device/opencl/opencl_util.cpp')
-rw-r--r-- | intern/cycles/device/opencl/opencl_util.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/intern/cycles/device/opencl/opencl_util.cpp b/intern/cycles/device/opencl/opencl_util.cpp index 9104f64bedd..d6304ba688a 100644 --- a/intern/cycles/device/opencl/opencl_util.cpp +++ b/intern/cycles/device/opencl/opencl_util.cpp @@ -1136,6 +1136,21 @@ string OpenCLInfo::get_readable_device_name(cl_device_id device_id) name = get_device_name(device_id); } + /* Special exception for AMD Vega, need to be able to tell + * Vega 56 from 64 apart. + */ + if (name == "Radeon RX Vega") { + cl_int max_compute_units = 0; + if (clGetDeviceInfo(device_id, + CL_DEVICE_MAX_COMPUTE_UNITS, + sizeof(max_compute_units), + &max_compute_units, + NULL) == CL_SUCCESS) + { + name += " " + to_string(max_compute_units); + } + } + /* Distinguish from our native CPU device. */ if(get_device_type(device_id) & CL_DEVICE_TYPE_CPU) { name += " (OpenCL)"; |