diff options
| author | Marek Olšák <maraeo@gmail.com> | 2011-02-16 20:37:28 +0100 |
|---|---|---|
| committer | Marek Olšák <maraeo@gmail.com> | 2011-02-16 20:44:46 +0100 |
| commit | 8513d3405bd5cd633579b16af1ab04253a8b37d9 (patch) | |
| tree | 350b70e8bb86a9a38e7e414dee8a45b9a586d471 /src/mesa/main/mipmap.c | |
| parent | 4d6994e40ebccf9428fc757d845e25c0e0c12cef (diff) | |
mesa: fix texture3D mipmap generation for UNSIGNED_BYTE_3_3_2 and 4_4
Oops, I copy-pasted a typo from 3_3_2.
The 3_3_2 part is a candidate for 7.9 and 7.10.
The 4_4 part isn't, because AL44 is in neither branches.
Diffstat (limited to 'src/mesa/main/mipmap.c')
| -rw-r--r-- | src/mesa/main/mipmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c index 88763f8427..d8a5610380 100644 --- a/src/mesa/main/mipmap.c +++ b/src/mesa/main/mipmap.c @@ -1100,7 +1100,7 @@ do_row_3D(GLenum datatype, GLuint comps, GLint srcWidth, } } else if ((datatype == GL_UNSIGNED_BYTE_3_3_2) && (comps == 3)) { - DECLARE_ROW_POINTERS0(GLushort); + DECLARE_ROW_POINTERS0(GLubyte); for (i = j = 0, k = k0; i < (GLuint) dstWidth; i++, j += colStride, k += colStride) { @@ -1138,7 +1138,7 @@ do_row_3D(GLenum datatype, GLuint comps, GLint srcWidth, } } else if (datatype == MESA_UNSIGNED_BYTE_4_4 && comps == 2) { - DECLARE_ROW_POINTERS0(GLushort); + DECLARE_ROW_POINTERS0(GLubyte); for (i = j = 0, k = k0; i < (GLuint) dstWidth; i++, j += colStride, k += colStride) { |