fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 13:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

packing of GLushort packed types was broken

Browse source
This commit is contained in:
Brian Paul 2000-09-12 21:10:25 +00:00
parent 8d4bd87c1a
commit 881ec9ee67
1 changed files with 77 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
src/mesa/main/image.c
View file

@ -1,4 +1,4 @@
/* $Id: image.c,v 1.39 2000/08/31 15:24:07 brianp Exp $ */ /* $Id: image.c,v 1.40 2000/09/12 21:10:25 brianp Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
@ -1305,7 +1305,7 @@ _mesa_pack_float_rgba_span( GLcontext *ctx,
} }
break; break;
case GL_UNSIGNED_SHORT_4_4_4_4: case GL_UNSIGNED_SHORT_4_4_4_4:
if (dstFormat == GL_RGB) { if (dstFormat == GL_RGBA) {
GLushort *dst = (GLushort *) dstAddr; GLushort *dst = (GLushort *) dstAddr;
for (i=0;i<n;i++) { for (i=0;i<n;i++) {
dst[i] = (((GLint) (rgba[i][RCOMP] * 15.0F)) << 12) dst[i] = (((GLint) (rgba[i][RCOMP] * 15.0F)) << 12)
@ -1314,9 +1314,27 @@ _mesa_pack_float_rgba_span( GLcontext *ctx,
| (((GLint) (rgba[i][ACOMP] * 15.0F)) ); | (((GLint) (rgba[i][ACOMP] * 15.0F)) );
} }
} }
else if (dstFormat == GL_BGRA) {
GLushort *dst = (GLushort *) dstAddr;
for (i=0;i<n;i++) {
dst[i] = (((GLint) (rgba[i][BCOMP] * 15.0F)) << 12)
| (((GLint) (rgba[i][GCOMP] * 15.0F)) << 8)
| (((GLint) (rgba[i][RCOMP] * 15.0F)) << 4)
| (((GLint) (rgba[i][ACOMP] * 15.0F)) );
}
}
else if (dstFormat == GL_ABGR_EXT) {
GLushort *dst = (GLushort *) dstAddr;
for (i=0;i<n;i++) {
dst[i] = (((GLint) (rgba[i][ACOMP] * 15.0F)) << 4)
| (((GLint) (rgba[i][BCOMP] * 15.0F)) << 8)
| (((GLint) (rgba[i][GCOMP] * 15.0F)) << 12)
| (((GLint) (rgba[i][RCOMP] * 15.0F)) );
}
}
break; break;
case GL_UNSIGNED_SHORT_4_4_4_4_REV: case GL_UNSIGNED_SHORT_4_4_4_4_REV:
if (dstFormat == GL_RGB) { if (dstFormat == GL_RGBA) {
GLushort *dst = (GLushort *) dstAddr; GLushort *dst = (GLushort *) dstAddr;
for (i=0;i<n;i++) { for (i=0;i<n;i++) {
dst[i] = (((GLint) (rgba[i][RCOMP] * 15.0F)) ) dst[i] = (((GLint) (rgba[i][RCOMP] * 15.0F)) )
@ -1325,9 +1343,27 @@ _mesa_pack_float_rgba_span( GLcontext *ctx,
| (((GLint) (rgba[i][ACOMP] * 15.0F)) << 12); | (((GLint) (rgba[i][ACOMP] * 15.0F)) << 12);
} }
} }
else if (dstFormat == GL_BGRA) {
GLushort *dst = (GLushort *) dstAddr;
for (i=0;i<n;i++) {
dst[i] = (((GLint) (rgba[i][BCOMP] * 15.0F)) )
| (((GLint) (rgba[i][GCOMP] * 15.0F)) << 4)
| (((GLint) (rgba[i][RCOMP] * 15.0F)) << 8)
| (((GLint) (rgba[i][ACOMP] * 15.0F)) << 12);
}
}
else if (dstFormat == GL_ABGR_EXT) {
GLushort *dst = (GLushort *) dstAddr;
for (i=0;i<n;i++) {
dst[i] = (((GLint) (rgba[i][ACOMP] * 15.0F)) )
| (((GLint) (rgba[i][BCOMP] * 15.0F)) << 4)
| (((GLint) (rgba[i][GCOMP] * 15.0F)) << 8)
| (((GLint) (rgba[i][RCOMP] * 15.0F)) << 12);
}
}
break; break;
case GL_UNSIGNED_SHORT_5_5_5_1: case GL_UNSIGNED_SHORT_5_5_5_1:
if (dstFormat == GL_RGB) { if (dstFormat == GL_RGBA) {
GLushort *dst = (GLushort *) dstAddr; GLushort *dst = (GLushort *) dstAddr;
for (i=0;i<n;i++) { for (i=0;i<n;i++) {
dst[i] = (((GLint) (rgba[i][RCOMP] * 31.0F)) << 11) dst[i] = (((GLint) (rgba[i][RCOMP] * 31.0F)) << 11)
@ -1336,9 +1372,27 @@ _mesa_pack_float_rgba_span( GLcontext *ctx,
| (((GLint) (rgba[i][ACOMP] * 1.0F)) ); | (((GLint) (rgba[i][ACOMP] * 1.0F)) );
} }
} }
else if (dstFormat == GL_BGRA) {
GLushort *dst = (GLushort *) dstAddr;
for (i=0;i<n;i++) {
dst[i] = (((GLint) (rgba[i][BCOMP] * 31.0F)) << 11)
| (((GLint) (rgba[i][GCOMP] * 31.0F)) << 6)
| (((GLint) (rgba[i][RCOMP] * 31.0F)) << 1)
| (((GLint) (rgba[i][ACOMP] * 1.0F)) );
}
}
else if (dstFormat == GL_ABGR_EXT) {
GLushort *dst = (GLushort *) dstAddr;
for (i=0;i<n;i++) {
dst[i] = (((GLint) (rgba[i][ACOMP] * 31.0F)) << 11)
| (((GLint) (rgba[i][BCOMP] * 31.0F)) << 6)
| (((GLint) (rgba[i][GCOMP] * 31.0F)) << 1)
| (((GLint) (rgba[i][RCOMP] * 1.0F)) );
}
}
break; break;
case GL_UNSIGNED_SHORT_1_5_5_5_REV: case GL_UNSIGNED_SHORT_1_5_5_5_REV:
if (dstFormat == GL_RGB) { if (dstFormat == GL_RGBA) {
GLushort *dst = (GLushort *) dstAddr; GLushort *dst = (GLushort *) dstAddr;
for (i=0;i<n;i++) { for (i=0;i<n;i++) {
dst[i] = (((GLint) (rgba[i][RCOMP] * 31.0F)) ) dst[i] = (((GLint) (rgba[i][RCOMP] * 31.0F)) )
@ -1347,6 +1401,24 @@ _mesa_pack_float_rgba_span( GLcontext *ctx,
| (((GLint) (rgba[i][ACOMP] * 1.0F)) << 15); | (((GLint) (rgba[i][ACOMP] * 1.0F)) << 15);
} }
} }
else if (dstFormat == GL_BGRA) {
GLushort *dst = (GLushort *) dstAddr;
for (i=0;i<n;i++) {
dst[i] = (((GLint) (rgba[i][BCOMP] * 31.0F)) )
| (((GLint) (rgba[i][GCOMP] * 31.0F)) << 5)
| (((GLint) (rgba[i][RCOMP] * 31.0F)) << 10)
| (((GLint) (rgba[i][ACOMP] * 1.0F)) << 15);
}
}
else if (dstFormat == GL_ABGR_EXT) {
GLushort *dst = (GLushort *) dstAddr;
for (i=0;i<n;i++) {
dst[i] = (((GLint) (rgba[i][ACOMP] * 31.0F)) )
| (((GLint) (rgba[i][BCOMP] * 31.0F)) << 5)
| (((GLint) (rgba[i][GCOMP] * 31.0F)) << 10)
| (((GLint) (rgba[i][RCOMP] * 1.0F)) << 15);
}
}
break; break;
case GL_UNSIGNED_INT_8_8_8_8: case GL_UNSIGNED_INT_8_8_8_8:
if (dstFormat == GL_RGBA) { if (dstFormat == GL_RGBA) {