diff options
| author | Mathieu Menuet <bliblubli> | 2017-10-08 19:20:55 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-10-08 19:36:02 +0300 |
| commit | 5aa08eb3cc7c9c5a6282d938fd2ffa6266a40ff7 (patch) | |
| tree | 642fadebe1488f157dd80cb873b3d386972153a5 /intern/cycles/device | |
| parent | 9ea2a7c02ddd8fc949b5917e53ee75af11012b6a (diff) | |
Fix T53017: Cycles not detecting AMD GPU when there is an NVidia GPU too.
Best guess is that cuInit() somehow interferes with the AMD graphics driver
on Windows, and switching the initialization order to do OpenCL first seems
to solve the issue.
Diffstat (limited to 'intern/cycles/device')
| -rw-r--r-- | intern/cycles/device/device.cpp | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/intern/cycles/device/device.cpp b/intern/cycles/device/device.cpp index 533294407ea..e5a1aa610b6 100644 --- a/intern/cycles/device/device.cpp +++ b/intern/cycles/device/device.cpp @@ -324,16 +324,17 @@ vector<DeviceInfo>& Device::available_devices() { if(need_devices_update) { devices.clear(); -#ifdef WITH_CUDA - if(device_cuda_init()) - device_cuda_info(devices); -#endif #ifdef WITH_OPENCL if(device_opencl_init()) device_opencl_info(devices); #endif +#ifdef WITH_CUDA + if(device_cuda_init()) + device_cuda_info(devices); +#endif + device_cpu_info(devices); #ifdef WITH_NETWORK @@ -350,12 +351,6 @@ string Device::device_capabilities() { string capabilities = "CPU device capabilities: "; capabilities += device_cpu_capabilities() + "\n"; -#ifdef WITH_CUDA - if(device_cuda_init()) { - capabilities += "\nCUDA device capabilities:\n"; - capabilities += device_cuda_capabilities(); - } -#endif #ifdef WITH_OPENCL if(device_opencl_init()) { @@ -364,6 +359,13 @@ string Device::device_capabilities() } #endif +#ifdef WITH_CUDA + if(device_cuda_init()) { + capabilities += "\nCUDA device capabilities:\n"; + capabilities += device_cuda_capabilities(); + } +#endif + return capabilities; } |