diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-27 03:29:33 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-27 03:29:33 +0400 |
| commit | 7902fa57b6553c8c6e5ae19d1a25ce2200ea4a95 (patch) | |
| tree | 7e07f248cd7aaff6630bedcceff55f35bae2e49b /intern/cycles/device | |
| parent | 372c4f80f4e8bdec79c9ae6aa0a29c97c9d8797c (diff) | |
Code cleanup: cycles
* Reshuffle SSE #ifdefs to try to avoid compilation errors enabling SSE on 32 bit.
* Remove CUDA kernel launch size exception on Mac, is not needed.
* Make OSL file compilation quiet like c/cpp files.
Diffstat (limited to 'intern/cycles/device')
| -rw-r--r-- | intern/cycles/device/device_cuda.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp index 6b0c9120bd9..4441ff1c69f 100644 --- a/intern/cycles/device/device_cuda.cpp +++ b/intern/cycles/device/device_cuda.cpp @@ -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)) |