Merged revision(s) 59035-59107 from trunk/blender into soc-2013-dingto.
authorThomas Dinges <blender@dingto.org>
Tue, 13 Aug 2013 09:15:03 +0000 (09:15 +0000)
committerThomas Dinges <blender@dingto.org>
Tue, 13 Aug 2013 09:15:03 +0000 (09:15 +0000)
Skipping 59034 (Non-Progressive on GPU).

1  2 
intern/cycles/device/device_cuda.cpp

index 722d0380c2211d7b617dc6e6abe623b6d126ea53,ec7157aa0836b25fde06849ee794073bf22a0eaf..9cf0879742e5cf6b24a6f3a3ce78082bcedffeee
@@@ -572,8 -572,11 +572,11 @@@ public
                /* get kernel function */
                if(progressive)
                        cuda_assert(cuModuleGetFunction(&cuPathTrace, cuModule, "kernel_cuda_path_trace_progressive"))
-               else
+               else {
                        cuda_assert(cuModuleGetFunction(&cuPathTrace, cuModule, "kernel_cuda_path_trace_non_progressive"))
+                       if(have_error())
+                               return;
+               }
                
                /* pass in parameters */
                int offset = 0;
@@@ -1026,7 -1029,6 +1029,7 @@@ void device_cuda_info(vector<DeviceInfo
                int major, minor;
                cuDeviceComputeCapability(&major, &minor, num);
                info.advanced_shading = (major >= 2);
 +              info.extended_images = (major >= 3);
                info.pack_images = false;
  
                /* if device has a kernel timeout, assume it is used for display */