From: Brian Paul <brianp@vmware.com>
Date: Wed, 18 Jan 2012 17:05:25 +0000 (-0700)
Subject: svga: add 0.5 in float->int conversion of sample min/max lod
X-Git-Tag: android-x86-4.4-r1~7564
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5abcd198b8e644c0d97c6766c6707e20fe22f0fb;p=android-x86%2Fexternal-mesa.git

svga: add 0.5 in float->int conversion of sample min/max lod

This makes lod clamping more consistent with other drivers.

NOTE: This is a candidate for the 8.0 branch.

Reviewed-by: José Fonseca <jfonseca@vmware.com>
---

diff --git a/src/gallium/drivers/svga/svga_pipe_sampler.c b/src/gallium/drivers/svga/svga_pipe_sampler.c
index 4885d200584..13c7b181b7c 100644
--- a/src/gallium/drivers/svga/svga_pipe_sampler.c
+++ b/src/gallium/drivers/svga/svga_pipe_sampler.c
@@ -125,8 +125,8 @@ svga_create_sampler_state(struct pipe_context *pipe,
     *    - min/max LOD clamping
     */
    cso->min_lod = 0;
-   cso->view_min_lod = MAX2(sampler->min_lod, 0);
-   cso->view_max_lod = MAX2(sampler->max_lod, 0);
+   cso->view_min_lod = MAX2((int) (sampler->min_lod + 0.5), 0);
+   cso->view_max_lod = MAX2((int) (sampler->max_lod + 0.5), 0);
 
    /* Use min_mipmap */
    if (svga->debug.use_min_mipmap) {