diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-07 20:06:17 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-07 20:06:17 +0400 |
commit | d835d2f4e65ae3bf8e22f8d3d60e7e6ea7a6b4ca (patch) | |
tree | 77475cb0eec4dda28415b6c9f6be51df28acf286 /intern/cycles/kernel/closure | |
parent | c24be7ec6e5269c54552d1fb03707b97befd48d1 (diff) |
Code cleanup: avoid some warnings due to implicit uint/int/float/double conversion.
Diffstat (limited to 'intern/cycles/kernel/closure')
-rw-r--r-- | intern/cycles/kernel/closure/bssrdf.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/kernel/closure/bssrdf.h b/intern/cycles/kernel/closure/bssrdf.h index 844e0433bae..486de4ca65f 100644 --- a/intern/cycles/kernel/closure/bssrdf.h +++ b/intern/cycles/kernel/closure/bssrdf.h @@ -68,13 +68,13 @@ __device float bssrdf_reduced_albedo_Rd(float alpha_, float A, float ro) { float sq; - sq = sqrt(3.0f*(1.0f - alpha_)); + sq = sqrtf(3.0f*(1.0f - alpha_)); return (alpha_/2.0f)*(1.0f + expf((-4.0f/3.0f)*A*sq))*expf(-sq) - ro; } __device float bssrdf_compute_reduced_albedo(float A, float ro) { - const float tolerance = 1e-8; + const float tolerance = 1e-8f; const int max_iteration_count = 20; float d, fsub, xn_1 = 0.0f, xn = 1.0f, fxn, fxn_1; int i; @@ -138,8 +138,8 @@ __device float bssrdf_original(const BSSRDFParams *ss, float r) float rr = r*r; float sr, sv, Rdr, Rdv; - sr = sqrt(rr + ss->zr*ss->zr); - sv = sqrt(rr + ss->zv*ss->zv); + sr = sqrtf(rr + ss->zr*ss->zr); + sv = sqrtf(rr + ss->zv*ss->zv); Rdr = ss->zr*(1.0f + ss->sigma_tr*sr)*expf(-ss->sigma_tr*sr)/(sr*sr*sr); Rdv = ss->zv*(1.0f + ss->sigma_tr*sv)*expf(-ss->sigma_tr*sv)/(sv*sv*sv); |