diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-11-04 11:18:29 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-11-04 11:18:29 +0400 |
commit | fae6c35ca7ae4e73cc32a0f5c235fd0ff8f00be1 (patch) | |
tree | 7caea3d796c18cddf661960a243de565847173c5 /source/blender/render | |
parent | 89a454653e9ff7704671aeb371b1b387af6152dc (diff) |
code cleanup: quiet -Wdouble-promotion, disabled this warnings for a few files since its done throughout the code in some places.
Diffstat (limited to 'source/blender/render')
-rw-r--r-- | source/blender/render/intern/source/convertblender.c | 3 | ||||
-rw-r--r-- | source/blender/render/intern/source/shadbuf.c | 24 | ||||
-rw-r--r-- | source/blender/render/intern/source/shadeoutput.c | 7 | ||||
-rw-r--r-- | source/blender/render/intern/source/zbuf.c | 5 |
4 files changed, 24 insertions, 15 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index bcb6df134e8..e305f434ebb 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -124,6 +124,9 @@ /* or for checking vertex normal flips */ #define FLT_EPSILON10 1.19209290e-06F +/* could enable at some point but for now there are far too many conversions */ +#pragma GCC diagnostic ignored "-Wdouble-promotion" + /* ------------------------------------------------------------------------- */ /* Stuff for stars. This sits here because it uses gl-things. Part of diff --git a/source/blender/render/intern/source/shadbuf.c b/source/blender/render/intern/source/shadbuf.c index 2253557955e..c37f48bc329 100644 --- a/source/blender/render/intern/source/shadbuf.c +++ b/source/blender/render/intern/source/shadbuf.c @@ -159,9 +159,9 @@ static void make_jitter_weight_tab(Render *re, ShadBuf *shb, short filtertype) for (jit= shb->jit, a=0; a<tot; a++, jit+=2) { if (filtertype==LA_SHADBUF_TENT) - shb->weight[a]= 0.71f - sqrt(jit[0]*jit[0] + jit[1]*jit[1]); + shb->weight[a] = 0.71f - sqrtf(jit[0] * jit[0] + jit[1] * jit[1]); else if (filtertype==LA_SHADBUF_GAUSS) - shb->weight[a]= RE_filter_value(R_FILTER_GAUSS, 1.8f*sqrt(jit[0]*jit[0] + jit[1]*jit[1])); + shb->weight[a] = RE_filter_value(R_FILTER_GAUSS, 1.8f * sqrtf(jit[0] * jit[0] + jit[1] * jit[1])); else shb->weight[a]= 1.0f; @@ -217,15 +217,15 @@ static int compress_deepsamples(DeepSample *dsample, int tot, float epsilon) if (ds->z == newds->z) { /* still in same z position, simply check * visibility difference against epsilon */ - if (!(fabs(newds->v - ds->v) <= epsilon)) { + if (!(fabsf(newds->v - ds->v) <= epsilon)) { break; } } else { /* compute slopes */ - div= (double)0x7FFFFFFF/((double)ds->z - (double)newds->z); - min= ((ds->v - epsilon) - newds->v)*div; - max= ((ds->v + epsilon) - newds->v)*div; + div= (double)0x7FFFFFFF / ((double)ds->z - (double)newds->z); + min= (double)((ds->v - epsilon) - newds->v) * div; + max= (double)((ds->v + epsilon) - newds->v) * div; /* adapt existing slopes */ if (first) { @@ -264,8 +264,8 @@ static int compress_deepsamples(DeepSample *dsample, int tot, float epsilon) } else { /* compute visibility at center between slopes at z */ - slope= (slopemin+slopemax)*0.5f; - v= newds->v + slope*((z - newds->z)/(double)0x7FFFFFFF); + slope = (slopemin + slopemax) * 0.5; + v = (double)newds->v + slope * ((double)(z - newds->z) / (double)0x7FFFFFFF); } newds++; @@ -778,7 +778,7 @@ void makeshadowbuf(Render *re, LampRen *lar) * transforming from observer view to lamp view, including lamp window matrix */ angle= saacos(lar->spotsi); - temp= 0.5f*shb->size*cos(angle)/sin(angle); + temp = 0.5f * shb->size * cosf(angle) / sinf(angle); shb->pixsize= (shb->d)/temp; wsize= shb->pixsize*(shb->size/2.0f); @@ -1663,9 +1663,9 @@ static void bspface_init_strand(BSPFace *face) face->len= face->rc[0]*face->rc[0]+ face->rc[1]*face->rc[1]; - if (face->len!=0.0f) { - face->radline_end= face->radline/sqrt(face->len); - face->len= 1.0f/face->len; + if (face->len != 0.0f) { + face->radline_end = face->radline / sqrtf(face->len); + face->len = 1.0f / face->len; } } diff --git a/source/blender/render/intern/source/shadeoutput.c b/source/blender/render/intern/source/shadeoutput.c index 93743dedd3c..77602edf955 100644 --- a/source/blender/render/intern/source/shadeoutput.c +++ b/source/blender/render/intern/source/shadeoutput.c @@ -57,6 +57,9 @@ #include "shading.h" /* own include */ +/* could enable at some point but for now there are far too many conversions */ +#pragma GCC diagnostic ignored "-Wdouble-promotion" + /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ /* defined in pipeline.c, is hardcopy of active dynamic allocated Render */ /* only to be used here in this file, it's for speed */ @@ -314,8 +317,8 @@ static void spothalo(struct LampRen *lar, ShadeInput *shi, float *intens) /* calculate t0: is the maximum visible z (when halo is intersected by face) */ if (do_clip) { - if (use_yco == FALSE) t0 = (maxz - npos[2]) / nray[2]; - else t0 = (maxy - npos[1]) / nray[1]; + if (use_yco == FALSE) t0 = ((double)maxz - npos[2]) / nray[2]; + else t0 = ((double)maxy - npos[1]) / nray[1]; if (t0 < t1) return; if (t0 < t2) t2= t0; diff --git a/source/blender/render/intern/source/zbuf.c b/source/blender/render/intern/source/zbuf.c index 8e53ce11e4d..62bf9ac2005 100644 --- a/source/blender/render/intern/source/zbuf.c +++ b/source/blender/render/intern/source/zbuf.c @@ -76,6 +76,9 @@ /* own includes */ #include "zbuf.h" +/* could enable at some point but for now there are far too many conversions */ +#pragma GCC diagnostic ignored "-Wdouble-promotion" + /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ /* defined in pipeline.c, is hardcopy of active dynamic allocated Render */ /* only to be used here in this file, it's for speed */ @@ -2732,7 +2735,7 @@ static void zbuf_fill_in_rgba(ZSpan *zspan, DrawBufPixel *col, float *v1, float x= sn2-sn1; while (x>=0) { - if ( zverg < *rz) { + if (zverg < (double)*rz) { *rz= zverg; *rp= *col; } |