summaryrefslogtreecommitdiff
path: root/src/gallium
diff options
context:
space:
mode:
authorMichal Krol <michal@tungstengraphics.com>2008-03-18 15:59:55 +0100
committerMichal Krol <michal@tungstengraphics.com>2008-03-18 15:59:55 +0100
commitb2b905b04c09dd5e701a43b0fecb73921b8f2866 (patch)
tree197d35c0d6dd7cb3cd9fddf3316c9fc87d6ebf7d /src/gallium
parentde779c8d319b6269705cd7e6f2009243a771a2b9 (diff)
gallium: Silencium warnings on Windows.
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/auxiliary/util/u_gen_mipmap.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/auxiliary/util/u_gen_mipmap.c b/src/gallium/auxiliary/util/u_gen_mipmap.c
index 8ca06281ab..d6d8c766ce 100644
--- a/src/gallium/auxiliary/util/u_gen_mipmap.c
+++ b/src/gallium/auxiliary/util/u_gen_mipmap.c
@@ -325,7 +325,7 @@ do_row(enum dtype datatype, uint comps, int srcWidth,
float *dst = (float *) dstRow;
for (i = j = 0, k = k0; i < (uint) dstWidth;
i++, j += colStride, k += colStride) {
- dst[i] = rowA[j] / 4 + rowA[k] / 4 + rowB[j] / 4 + rowB[k] / 4;
+ dst[i] = (float) rowA[j] / 4 + (float) rowA[k] / 4 + (float) rowB[j] / 4 + (float) rowB[k] / 4;
}
}
@@ -1070,8 +1070,8 @@ util_gen_mipmap(struct gen_mipmap_state *ctx,
* has trouble with min clamping so we also set the lod_bias to
* try to work around that.
*/
- sampler.min_lod = sampler.max_lod = srcLevel;
- sampler.lod_bias = srcLevel;
+ sampler.min_lod = sampler.max_lod = (float) srcLevel;
+ sampler.lod_bias = (float) srcLevel;
sampler_cso = pipe->create_sampler_state(pipe, &sampler);
pipe->bind_sampler_states(pipe, 1, &sampler_cso);