From: Brian Paul <brianp@vmware.com>
Date: Thu, 12 Jan 2012 16:55:40 +0000 (-0700)
Subject: mesa: remove incorrect (float) cast in mipmap do_row()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=003dd8adf39c964d8c7beb86955a61ceb3706ebc;p=mesa.git

mesa: remove incorrect (float) cast in mipmap do_row()

The array holds GLuint values so remove the float cast.
Note, however, that to compute the average of four GLuints we really
want to do (a+b+c+d)/4 but that could overflow.  This change doesn't
address that for now.

NOTE: This is a candidate for the 8.0 branch.

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

diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c
index 867506c9fc7..03ce5361e6b 100644
--- a/src/mesa/main/mipmap.c
+++ b/src/mesa/main/mipmap.c
@@ -476,7 +476,7 @@ do_row(GLenum datatype, GLuint comps, GLint srcWidth,
       GLuint *dst = (GLuint *) dstRow;
       for (i = j = 0, k = k0; i < (GLuint) dstWidth;
            i++, j += colStride, k += colStride) {
-         dst[i] = (GLfloat)(rowA[j] / 4 + rowA[k] / 4 + rowB[j] / 4 + rowB[k] / 4);
+         dst[i] = rowA[j] / 4 + rowA[k] / 4 + rowB[j] / 4 + rowB[k] / 4;
       }
    }