Mesa (master): mesa: fix texture3D mipmap generation for UNSIGNED_BYTE_3_3_2 and 4_4

Marek Olšák mareko at kemper.freedesktop.org
Wed Feb 16 11:46:26 PST 2011


Module: Mesa
Branch: master
Commit: 8513d3405bd5cd633579b16af1ab04253a8b37d9
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8513d3405bd5cd633579b16af1ab04253a8b37d9

Author: Marek Olšák <maraeo at gmail.com>
Date:   Wed Feb 16 20:37:28 2011 +0100

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.

---

 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 88763f8..d8a5610 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) {



More information about the mesa-commit mailing list