diff options
| author | José Fonseca <[email protected]> | 2009-06-11 16:34:56 +0100 |
|---|---|---|
| committer | José Fonseca <[email protected]> | 2009-06-11 16:34:56 +0100 |
| commit | bf89ecb6c92aaaeccd7b6f093cb8bae9fd56aaf6 (patch) | |
| tree | b7b38a1e1bd5e975f77ec23ea872a97dc6963b64 /src/gallium/auxiliary | |
| parent | 0d2ac7a10b2904eda70794534a9a73b3f4b654cf (diff) | |
| parent | cc09724a50a4cabb68b7c5f5b8d3812d38f65391 (diff) | |
Merge branch 'mesa_7_5_branch'
Conflicts:
src/mesa/state_tracker/st_cb_fbo.c
src/mesa/state_tracker/st_framebuffer.c
Diffstat (limited to 'src/gallium/auxiliary')
| -rw-r--r-- | src/gallium/auxiliary/util/u_gen_mipmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/util/u_gen_mipmap.c b/src/gallium/auxiliary/util/u_gen_mipmap.c index 6fa13a8ce11..ca797486a0e 100644 --- a/src/gallium/auxiliary/util/u_gen_mipmap.c +++ b/src/gallium/auxiliary/util/u_gen_mipmap.c @@ -1385,7 +1385,7 @@ set_vertex_data(struct gen_mipmap_state *ctx, * Not +/-1 to avoid cube face selection ambiguity near the edges, * though that can still sometimes happen with this scale factor... */ - const float scale = 0.9999; + const float scale = 0.9999f; const float sc = (2.0f * st[i][0] - 1.0f) * scale; const float tc = (2.0f * st[i][1] - 1.0f) * scale; |