diff options
| author | Dave Airlie <airlied@itt42.(none)> | 2009-11-20 11:48:10 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@itt42.(none)> | 2009-11-20 11:48:10 +1000 |
| commit | 3f2c77659ca552c43f544228f3a5a5fe6365513a (patch) | |
| tree | f98f22ac8a1dbcaa9c457d8f64731c6d4a374cdb /src/mesa/main/texstore.c | |
| parent | b09e74901a4f92299fe3f52f57d27fd5ca5bdd2d (diff) | |
| parent | f8ea5318200c1ed839fc387b16a57c8d9969974b (diff) | |
Merge remote branch 'origin/mesa_7_7_branch'
Diffstat (limited to 'src/mesa/main/texstore.c')
| -rw-r--r-- | src/mesa/main/texstore.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c index abb4ed2663..5387eb1283 100644 --- a/src/mesa/main/texstore.c +++ b/src/mesa/main/texstore.c @@ -2198,8 +2198,8 @@ _mesa_texstore_al1616(TEXSTORE_PARAMS) if (dstFormat == MESA_FORMAT_AL1616) { for (col = 0; col < srcWidth; col++) { /* src[0] is luminance, src[1] is alpha */ - dstUI[col] = PACK_COLOR_88( FLOAT_TO_USHORT(src[1]), - FLOAT_TO_USHORT(src[0]) ); + dstUI[col] = PACK_COLOR_1616( FLOAT_TO_USHORT(src[1]), + FLOAT_TO_USHORT(src[0]) ); src += 2; } } |