summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2010-09-24 18:40:24 -0700
committerEric Anholt <[email protected]>2010-09-24 18:40:24 -0700
commit1acadebd6270d3604b026842b8a21360968618a0 (patch)
treeac1d603c79097bc99224e8aa3eda21dc87781cdd /src
parentb917691bc015ec4a148a67bf3a1cdca0248400a7 (diff)
mesa: Fix type typo in glGenerateMipmap handling of GL_UNSIGNED_INT data.
Fixes ARB_depth_texture/fbo-generatemipmap-formats.
Diffstat (limited to 'src')
-rw-r--r--src/mesa/main/mipmap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c
index 678d17a2a36..f15c3b665be 100644
--- a/src/mesa/main/mipmap.c
+++ b/src/mesa/main/mipmap.c
@@ -415,7 +415,7 @@ do_row(GLenum datatype, GLuint comps, GLint srcWidth,
GLuint i, j, k;
const GLuint *rowA = (const GLuint *) srcRowA;
const GLuint *rowB = (const GLuint *) srcRowB;
- GLfloat *dst = (GLfloat *) dstRow;
+ GLuint *dst = (GLfloat *) 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);