diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-05-03 01:22:14 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-05-03 01:31:46 +0400 |
| commit | 8d16869d833ea2a2bd548c8f7b767dae582c78f2 (patch) | |
| tree | 8b4dac3292c5cb5c1c37211150633e6968814bc9 /intern/cycles/device | |
| parent | 43d5e54a799b6823bca31bde17606c591b81d8be (diff) | |
Code cleanup: Add -Werror=float-conversion to Cycles
Diffstat (limited to 'intern/cycles/device')
| -rw-r--r-- | intern/cycles/device/device_cuda.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/device/device_opencl.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp index 72453e83864..48bde705979 100644 --- a/intern/cycles/device/device_cuda.cpp +++ b/intern/cycles/device/device_cuda.cpp @@ -1036,7 +1036,7 @@ public: float scaling_factor = (float)target_update_frequency / (float)msec; /* sync at earliest next sample and probably later */ - sync_sample = (sample + 1) + sync_sample * ceil(scaling_factor); + sync_sample = (sample + 1) + sync_sample * (int)ceil(scaling_factor); sync_sample = min(end_sample - 1, sync_sample); // make sure we sync the last sample always diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp index 9a5b2611660..30762721931 100644 --- a/intern/cycles/device/device_opencl.cpp +++ b/intern/cycles/device/device_opencl.cpp @@ -932,7 +932,7 @@ public: CL_DEVICE_MAX_WORK_ITEM_SIZES, sizeof(size_t)*3, max_work_items, NULL); /* try to divide evenly over 2 dimensions */ - size_t sqrt_workgroup_size = max(sqrt((double)workgroup_size), 1.0); + size_t sqrt_workgroup_size = max((size_t)sqrt((double)workgroup_size), 1); size_t local_size[2] = {sqrt_workgroup_size, sqrt_workgroup_size}; /* some implementations have max size 1 on 2nd dimension */ |