summaryrefslogtreecommitdiff
path: root/src/mesa/pipe/i915simple/i915_surface.c
diff options
context:
space:
mode:
authorBen Skeggs <skeggsb@gmail.com>2007-11-25 13:00:15 +1100
committerBen Skeggs <skeggsb@gmail.com>2007-11-25 13:00:15 +1100
commit2bd97ca9427bbb90c1ac81f8947d33dba4b86290 (patch)
treee45cc99e45af12c4d05951a0ca17fc26ec634f68 /src/mesa/pipe/i915simple/i915_surface.c
parent2a2756a019ecdd5406ef84019610a0016868a39b (diff)
parent7043db677f457ae9a46f2585a5ef52bf69a4e8ea (diff)
Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
Diffstat (limited to 'src/mesa/pipe/i915simple/i915_surface.c')
-rw-r--r--src/mesa/pipe/i915simple/i915_surface.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/pipe/i915simple/i915_surface.c b/src/mesa/pipe/i915simple/i915_surface.c
index afe15fb525..bec7ddb731 100644
--- a/src/mesa/pipe/i915simple/i915_surface.c
+++ b/src/mesa/pipe/i915simple/i915_surface.c
@@ -81,7 +81,7 @@ i915_get_tile_rgba(struct pipe_context *pipe,
break;
case PIPE_FORMAT_S8_Z24:
{
- const float scale = 1.0 / (float) 0xffffff;
+ const float scale = 1.0f / (float) 0xffffff;
for (i = 0; i < h; i++) {
float *pRow = p;
for (j = 0; j < w; j++) {