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

Cell: don't use VEC_LITERAL macro, doesn't work w/ SDK 3.0

Browse source
This commit is contained in:
Brian 2008-02-04 18:02:21 -07:00
parent 93d061b217
commit 7cbe5cf212
2 changed files with 33 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/mesa/pipe/cell/spu/spu_colorpack.h
View file

@ -31,7 +31,6 @@
#define SPU_COLORPACK_H #define SPU_COLORPACK_H
#include <vec_literal.h>
#include <spu_intrinsics.h> #include <spu_intrinsics.h>
@ -39,9 +38,11 @@ static INLINE unsigned int
spu_pack_R8G8B8A8(vector float rgba) spu_pack_R8G8B8A8(vector float rgba)
{ {
vector unsigned int out = spu_convtu(rgba, 32); vector unsigned int out = spu_convtu(rgba, 32);
out = spu_shuffle(out, out, VEC_LITERAL(vector unsigned char,
0, 4, 8, 12, 0, 0, 0, 0, out = spu_shuffle(out, out, ((vector unsigned char) {
0, 0, 0, 0, 0, 0, 0, 0)); 0, 4, 8, 12, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0 }) );
return spu_extract(out, 0); return spu_extract(out, 0);
} }
@ -50,9 +51,9 @@ static INLINE unsigned int
spu_pack_A8R8G8B8(vector float rgba) spu_pack_A8R8G8B8(vector float rgba)
{ {
vector unsigned int out = spu_convtu(rgba, 32); vector unsigned int out = spu_convtu(rgba, 32);
out = spu_shuffle(out, out, VEC_LITERAL(vector unsigned char, out = spu_shuffle(out, out, ((vector unsigned char) {
12, 0, 4, 8, 0, 0, 0, 0, 12, 0, 4, 8, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0)); 0, 0, 0, 0, 0, 0, 0, 0}) );
return spu_extract(out, 0); return spu_extract(out, 0);
} }
@ -61,9 +62,9 @@ static INLINE unsigned int
spu_pack_B8G8R8A8(vector float rgba) spu_pack_B8G8R8A8(vector float rgba)
{ {
vector unsigned int out = spu_convtu(rgba, 32); vector unsigned int out = spu_convtu(rgba, 32);
out = spu_shuffle(out, out, VEC_LITERAL(vector unsigned char, out = spu_shuffle(out, out, ((vector unsigned char) {
8, 4, 0, 12, 0, 0, 0, 0, 8, 4, 0, 12, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0)); 0, 0, 0, 0, 0, 0, 0, 0}) );
return spu_extract(out, 0); return spu_extract(out, 0);
} }
@ -82,11 +83,11 @@ spu_unpack_color(uint color)
{ {
vector unsigned int color_u4 = spu_splats(color); vector unsigned int color_u4 = spu_splats(color);
color_u4 = spu_shuffle(color_u4, color_u4, color_u4 = spu_shuffle(color_u4, color_u4,
VEC_LITERAL(vector unsigned char, ((vector unsigned char) {
0, 0, 0, 0, 0, 0, 0, 0,
5, 5, 5, 5, 5, 5, 5, 5,
10, 10, 10, 10, 10, 10, 10, 10,
15, 15, 15, 15)); 15, 15, 15, 15}) );
return spu_convtf(color_u4, 32); return spu_convtf(color_u4, 32);
} }
@ -96,11 +97,11 @@ spu_unpack_A8R8G8B8(uint color)
{ {
vector unsigned int color_u4 = spu_splats(color); vector unsigned int color_u4 = spu_splats(color);
color_u4 = spu_shuffle(color_u4, color_u4, color_u4 = spu_shuffle(color_u4, color_u4,
VEC_LITERAL(vector unsigned char, ((vector unsigned char) {
5, 5, 5, 5, 5, 5, 5, 5,
10, 10, 10, 10, 10, 10, 10, 10,
15, 15, 15, 15, 15, 15, 15, 15,
0, 0, 0, 0)); 0, 0, 0, 0}) );
return spu_convtf(color_u4, 32); return spu_convtf(color_u4, 32);
} }

24
src/mesa/pipe/cell/spu/spu_ztest.h
View file

@ -68,9 +68,9 @@ spu_z16_test_less(vector float zvals, vector unsigned short *zbuf,
/* gather lower four ushorts */ /* gather lower four ushorts */
zbuf_ui4 = spu_shuffle((vector unsigned int) *zbuf, zbuf_ui4 = spu_shuffle((vector unsigned int) *zbuf,
(vector unsigned int) *zbuf, (vector unsigned int) *zbuf,
VEC_LITERAL(vector unsigned char, ((vector unsigned char) {
ZERO, ZERO, 8, 9, ZERO, ZERO, 10, 11, ZERO, ZERO, 8, 9, ZERO, ZERO, 10, 11,
ZERO, ZERO, 12, 13, ZERO, ZERO, 14, 15)); ZERO, ZERO, 12, 13, ZERO, ZERO, 14, 15}));
/* mask = (zbuf_ui4 < zvals_ui4) ? ~0 : 0 */ /* mask = (zbuf_ui4 < zvals_ui4) ? ~0 : 0 */
mask = spu_cmpgt(zbuf_ui4, zvals_ui4); mask = spu_cmpgt(zbuf_ui4, zvals_ui4);
/* mask &= inMask */ /* mask &= inMask */
@ -80,18 +80,18 @@ spu_z16_test_less(vector float zvals, vector unsigned short *zbuf,
/* convert zbuffer values from uints back to ushorts, preserve lower 4 */ /* convert zbuffer values from uints back to ushorts, preserve lower 4 */
*zbuf = (vector unsigned short) *zbuf = (vector unsigned short)
spu_shuffle(zbuf_ui4, (vector unsigned int) *zbuf, spu_shuffle(zbuf_ui4, (vector unsigned int) *zbuf,
VEC_LITERAL(vector unsigned char, ((vector unsigned char) {
16, 17, 18, 19, 20, 21, 22, 23, 16, 17, 18, 19, 20, 21, 22, 23,
2, 3, 6, 7, 10, 11, 14, 15)); 2, 3, 6, 7, 10, 11, 14, 15}));
} }
else { else {
/* convert zbuffer values from ushorts to uints */ /* convert zbuffer values from ushorts to uints */
/* gather upper four ushorts */ /* gather upper four ushorts */
zbuf_ui4 = spu_shuffle((vector unsigned int) *zbuf, zbuf_ui4 = spu_shuffle((vector unsigned int) *zbuf,
(vector unsigned int) *zbuf, (vector unsigned int) *zbuf,
VEC_LITERAL(vector unsigned char, ((vector unsigned char) {
ZERO, ZERO, 0, 1, ZERO, ZERO, 2, 3, ZERO, ZERO, 0, 1, ZERO, ZERO, 2, 3,
ZERO, ZERO, 4, 5, ZERO, ZERO, 6, 7)); ZERO, ZERO, 4, 5, ZERO, ZERO, 6, 7}));
/* mask = (zbuf_ui4 < zvals_ui4) ? ~0 : 0 */ /* mask = (zbuf_ui4 < zvals_ui4) ? ~0 : 0 */
mask = spu_cmpgt(zbuf_ui4, zvals_ui4); mask = spu_cmpgt(zbuf_ui4, zvals_ui4);
/* mask &= inMask */ /* mask &= inMask */
@ -101,9 +101,9 @@ spu_z16_test_less(vector float zvals, vector unsigned short *zbuf,
/* convert zbuffer values from uints back to ushorts, preserve upper 4 */ /* convert zbuffer values from uints back to ushorts, preserve upper 4 */
*zbuf = (vector unsigned short) *zbuf = (vector unsigned short)
spu_shuffle(zbuf_ui4, (vector unsigned int) *zbuf, spu_shuffle(zbuf_ui4, (vector unsigned int) *zbuf,
VEC_LITERAL(vector unsigned char, ((vector unsigned char) {
2, 3, 6, 7, 10, 11, 14, 15, 2, 3, 6, 7, 10, 11, 14, 15,
24, 25, 26, 27, 28, 29, 30, 31)); 24, 25, 26, 27, 28, 29, 30, 31}));
} }
return mask; return mask;
#undef ZERO #undef ZERO