diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-09-04 00:06:12 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-09-04 00:06:12 +0300 |
| commit | e76e8fcdcc53455a52a6a73495881eddd346472c (patch) | |
| tree | b5bddb86ec1bd53de743b558210c651aa1ff19f9 /intern/cycles/kernel/svm | |
| parent | 95cb71451141c01fb1819a2689c1429b58a2a8d4 (diff) | |
Fix a few OpenCL compiler warnings.
Diffstat (limited to 'intern/cycles/kernel/svm')
| -rw-r--r-- | intern/cycles/kernel/svm/svm_image.h | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/svm/svm_voxel.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/svm/svm_image.h b/intern/cycles/kernel/svm/svm_image.h index 5d02be1fa2f..378ce650129 100644 --- a/intern/cycles/kernel/svm/svm_image.h +++ b/intern/cycles/kernel/svm/svm_image.h @@ -296,7 +296,7 @@ ccl_device float4 svm_image_texture(KernelGlobals *kg, int id, float x, float y, /* float, byte and half */ else { float f = kernel_tex_image_interp_float(tex, x, y); - r = make_float4(f, f, f, 1.0); + r = make_float4(f, f, f, 1.0f); } # endif #endif diff --git a/intern/cycles/kernel/svm/svm_voxel.h b/intern/cycles/kernel/svm/svm_voxel.h index d2cc2c3730e..f54f4e8e888 100644 --- a/intern/cycles/kernel/svm/svm_voxel.h +++ b/intern/cycles/kernel/svm/svm_voxel.h @@ -50,7 +50,7 @@ ccl_device void svm_node_tex_voxel(KernelGlobals *kg, r = kernel_tex_image_interp_3d_float4(tex, co.x, co.y, co.z); else { float f = kernel_tex_image_interp_3d_float(tex, co.x, co.y, co.z); - r = make_float4(f, f, f, 1.0); + r = make_float4(f, f, f, 1.0f); } # else /* __CUDA_ARCH__ >= 300 */ r = volume_image_texture_3d(id, co.x, co.y, co.z); |