diff options
author | marha <marha@users.sourceforge.net> | 2012-01-17 09:07:57 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-01-17 09:07:57 +0100 |
commit | 05accdf525b82a20be8e92789185d8537bc4ab81 (patch) | |
tree | 05bc88963d29df95f0a7c63cad7ce773e093b632 /mesalib/src/mesa/main/format_pack.c | |
parent | 3e85e2f1e33380d6c9efe0972ed475cbf9dbe825 (diff) | |
parent | 34c1e86406451a3604de4982339058088434ab40 (diff) | |
download | vcxsrv-05accdf525b82a20be8e92789185d8537bc4ab81.tar.gz vcxsrv-05accdf525b82a20be8e92789185d8537bc4ab81.tar.bz2 vcxsrv-05accdf525b82a20be8e92789185d8537bc4ab81.zip |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/main/format_pack.c')
-rw-r--r-- | mesalib/src/mesa/main/format_pack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/mesa/main/format_pack.c b/mesalib/src/mesa/main/format_pack.c index 0982c9af4..85b2c691c 100644 --- a/mesalib/src/mesa/main/format_pack.c +++ b/mesalib/src/mesa/main/format_pack.c @@ -636,7 +636,7 @@ pack_float_ARGB1555_REV(const GLfloat src[4], void *dst) static void pack_ubyte_AL44(const GLubyte src[4], void *dst) { - GLushort *d = ((GLushort *) dst); + GLubyte *d = ((GLubyte *) dst); *d = PACK_COLOR_44(src[ACOMP], src[RCOMP]); } |