Merged revision(s) 57768-57827 from trunk/blender into soc-2013-dingto
[blender-staging.git] / intern / cycles / device / device_cuda.cpp
index b7ec9235d68cca2a81b0e038509a9f29b18dd2df..65dd001f70f6885b6492c18ae76cbfb678084d25 100644 (file)
@@ -607,13 +607,8 @@ public:
                cuda_assert(cuParamSetSize(cuPathTrace, offset))
 
                /* launch kernel: todo find optimal size, cache config for fermi */
-#ifndef __APPLE__
                int xthreads = 16;
                int ythreads = 16;
-#else
-               int xthreads = 8;
-               int ythreads = 8;
-#endif
                int xblocks = (rtile.w + xthreads - 1)/xthreads;
                int yblocks = (rtile.h + ythreads - 1)/ythreads;
 
@@ -676,13 +671,8 @@ public:
                cuda_assert(cuParamSetSize(cuFilmConvert, offset))
 
                /* launch kernel: todo find optimal size, cache config for fermi */
-#ifndef __APPLE__
                int xthreads = 16;
                int ythreads = 16;
-#else
-               int xthreads = 8;
-               int ythreads = 8;
-#endif
                int xblocks = (task.w + xthreads - 1)/xthreads;
                int yblocks = (task.h + ythreads - 1)/ythreads;
 
@@ -730,11 +720,7 @@ public:
                cuda_assert(cuParamSetSize(cuDisplace, offset))
 
                /* launch kernel: todo find optimal size, cache config for fermi */
-#ifndef __APPLE__
                int xthreads = 16;
-#else
-               int xthreads = 8;
-#endif
                int xblocks = (task.shader_w + xthreads - 1)/xthreads;
 
                cuda_assert(cuFuncSetCacheConfig(cuDisplace, CU_FUNC_CACHE_PREFER_L1))