Mesa (8.0): mesa: remove incorrect (float) cast in mipmap do_row()
Brian Paul
brianp at kemper.freedesktop.org
Fri Jan 13 17:27:12 UTC 2012
Module: Mesa
Branch: 8.0
Commit: 867fdbd36dd29032604a149367e69f109c2691e0
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=867fdbd36dd29032604a149367e69f109c2691e0
Author: Brian Paul <brianp at vmware.com>
Date: Thu Jan 12 09:55:40 2012 -0700
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 at vmware.com>
(cherry picked from commit 003dd8adf39c964d8c7beb86955a61ceb3706ebc)
---
src/mesa/main/mipmap.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c
index 867506c..03ce536 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;
}
}
More information about the mesa-commit
mailing list