From 4d74180b9fe1867c6d2deff704796e5318eb8e4a Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Sat, 27 Jun 2015 15:11:46 +0200 Subject: Cycles: Fix for wrong device enumeration in CUDA it is the same issue as described in the previous commit, original changes in this area were wrong and only worked on a bugger optimus driver which simply appeared to work by co-incident and in fact used wrong device.. --- intern/cycles/device/device_cuda.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp index 3607de598c0..4a9c27f5429 100644 --- a/intern/cycles/device/device_cuda.cpp +++ b/intern/cycles/device/device_cuda.cpp @@ -1123,7 +1123,6 @@ void device_cuda_info(vector& devices) vector display_devices; - int num_devices = 0; for(int num = 0; num < count; num++) { char name[256]; int attr; @@ -1142,7 +1141,7 @@ void device_cuda_info(vector& devices) info.type = DEVICE_CUDA; info.description = string(name); info.id = string_printf("CUDA_%d", num); - info.num = num_devices; + info.num = num; info.advanced_shading = (major >= 2); info.extended_images = (major >= 3); @@ -1155,8 +1154,6 @@ void device_cuda_info(vector& devices) } else devices.push_back(info); - - ++num_devices; } if(!display_devices.empty()) -- cgit v1.2.3