Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

code cleanup: quiet all warnings about double promotion (either by changing the type or explicitly casting).

Browse Source
This commit is contained in:
Campbell Barton
2012-06-09 17:45:22 +00:00
parent 0fbb6bff27
commit 43361487ba
11 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/kernel/svm/svm_texture.h
View File

@@ -191,7 +191,7 @@ __device float noise_basis_hard(float3 p, NodeNoiseBasis basis, int hard)
__device float noise_wave(NodeWaveBasis wave, float a)
{
if(wave == NODE_WAVE_SINE) {
return 0.5f + 0.5f*sin(a);
return 0.5f + 0.5f * sinf(a);
}
else if(wave == NODE_WAVE_SAW) {
float b = 2.0f*M_PI_F;
@@ -234,7 +234,7 @@ __device_noinline float noise_turbulence(float3 p, NodeNoiseBasis basis, float o
fscale *= 2.0f;
}
float rmd = octaves - floor(octaves);
float rmd = octaves - floorf(octaves);
if(rmd != 0.0f) {
float t = noise_basis(fscale*p, basis);