diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-05-22 20:11:26 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-05-22 20:17:22 +0300 |
| commit | f7c28a66e282eb9eb66bd02ccfe985beb6cb6f90 (patch) | |
| tree | cea0ed8514901c819572c06066f81eac94d7c780 /intern/cycles/device/device_cuda.cpp | |
| parent | 2f978656ab7d076706ef458ddd7674a6f653cad8 (diff) | |
Fix Cycles compile errors with GCC due to double promotion as errors.
Diffstat (limited to 'intern/cycles/device/device_cuda.cpp')
| -rw-r--r-- | intern/cycles/device/device_cuda.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp index 7fc62136512..9a78d055580 100644 --- a/intern/cycles/device/device_cuda.cpp +++ b/intern/cycles/device/device_cuda.cpp @@ -812,8 +812,8 @@ public: printf("threads_per_block %d\n", threads_per_block); printf("num_registers %d\n", num_registers);*/ - int xthreads = (int)sqrt((float)threads_per_block); - int ythreads = (int)sqrt((float)threads_per_block); + int xthreads = (int)sqrt(threads_per_block); + int ythreads = (int)sqrt(threads_per_block); int xblocks = (rtile.w + xthreads - 1)/xthreads; int yblocks = (rtile.h + ythreads - 1)/ythreads; @@ -866,8 +866,8 @@ public: int threads_per_block; cuda_assert(cuFuncGetAttribute(&threads_per_block, CU_FUNC_ATTRIBUTE_MAX_THREADS_PER_BLOCK, cuFilmConvert)); - int xthreads = (int)sqrt((float)threads_per_block); - int ythreads = (int)sqrt((float)threads_per_block); + int xthreads = (int)sqrt(threads_per_block); + int ythreads = (int)sqrt(threads_per_block); int xblocks = (task.w + xthreads - 1)/xthreads; int yblocks = (task.h + ythreads - 1)/ythreads; |