diff options
Diffstat (limited to 'src/mesa')
-rw-r--r-- | src/mesa/swrast/s_blend.c | 10 | ||||
-rw-r--r-- | src/mesa/x86/mmx.h | 6 | ||||
-rw-r--r-- | src/mesa/x86/mmx_blend.S | 94 | ||||
-rw-r--r-- | src/mesa/x86/mmx_blendtmp.h | 6 |
4 files changed, 67 insertions, 49 deletions
diff --git a/src/mesa/swrast/s_blend.c b/src/mesa/swrast/s_blend.c index 845709a1119..9a1f6472928 100644 --- a/src/mesa/swrast/s_blend.c +++ b/src/mesa/swrast/s_blend.c @@ -1,4 +1,4 @@ -/* $Id: s_blend.c,v 1.19 2002/04/10 16:32:32 brianp Exp $ */ +/* $Id: s_blend.c,v 1.20 2002/04/19 10:33:34 jrfonseca Exp $ */ /* * Mesa 3-D graphics library @@ -663,7 +663,13 @@ void _swrast_choose_blend_func( GLcontext *ctx ) || ((eq==GL_FUNC_ADD_EXT || eq==GL_FUNC_SUBTRACT_EXT) && (srcRGB==GL_DST_COLOR && dstRGB==GL_ZERO))) { - SWRAST_CONTEXT(ctx)->BlendFunc = blend_modulate; +#if defined(USE_MMX_ASM) + if ( cpu_has_mmx ) { + SWRAST_CONTEXT(ctx)->BlendFunc = _mesa_mmx_blend_modulate; + } + else +#endif + SWRAST_CONTEXT(ctx)->BlendFunc = blend_modulate; } else if (eq==GL_MIN_EXT) { SWRAST_CONTEXT(ctx)->BlendFunc = blend_min; diff --git a/src/mesa/x86/mmx.h b/src/mesa/x86/mmx.h index 4e35bf415c1..205677e19b5 100644 --- a/src/mesa/x86/mmx.h +++ b/src/mesa/x86/mmx.h @@ -1,4 +1,4 @@ -/* $Id: mmx.h,v 1.6 2001/03/28 20:44:44 gareth Exp $ */ +/* $Id: mmx.h,v 1.7 2002/04/19 10:33:34 jrfonseca Exp $ */ /* * Mesa 3-D graphics library @@ -32,4 +32,8 @@ extern void _ASMAPI _mesa_mmx_blend_transparency( GLcontext *ctx, GLuint n, const GLubyte mask[], GLubyte rgba[][4], const GLubyte dest[][4] ); +extern void _ASMAPI +_mesa_mmx_blend_modulate( GLcontext *ctx, GLuint n, const GLubyte mask[], + GLubyte rgba[][4], const GLubyte dest[][4] ); + #endif diff --git a/src/mesa/x86/mmx_blend.S b/src/mesa/x86/mmx_blend.S index f80cbf6c45e..ce946ec5ba0 100644 --- a/src/mesa/x86/mmx_blend.S +++ b/src/mesa/x86/mmx_blend.S @@ -203,47 +203,29 @@ TWO(PADDW ( MQ2, MA2 )) /* (t2/255 + q2) << 8 TWO(PSRLW ( CONST(8), MA2 )) /* sa2 | sb2 | sg2 | sr2 */ -/* common blending initialization code - */ -#if 0 /* rounding not used */ - SEG_DATA - -ALIGNDATA8 -const_80: - D_LONG 0x00800080, 0x00800080 - -#define GMB_INIT( M00, M80 ) \ - PXOR ( M00, M00 ) /* 0x0000 | 0x0000 | 0x0000 | 0x0000 */ - MOVQ ( CONTENT(const_80), M80 ) /* 0xffff | 0xffff | 0xffff | 0xffff */ - -#else - -#define GMB_INIT( M00 ) \ - PXOR ( M00, M00 ) /* 0x0000 | 0x0000 | 0x0000 | 0x0000 */ - -#endif - -/* common blending loading code +/* common blending setup code * * note that M00 is a register with 0x0000000000000000 constant which can be easily obtained making * * PXOR ( M00, M00 ) */ -#define GMB_LOAD(rgba, dest, MP1, MQ1, MA1, MP2, MQ2, MA2, M00) \ -ONE(MOVD ( REGIND(rgba), MP1 )) /* | | | | qa1 | qb1 | qg1 | qr1 */ ;\ -ONE(MOVD ( REGIND(dest), MQ1 )) /* | | | | pa1 | pb1 | pg1 | pr1 */ ;\ - ;\ -TWO(MOVQ ( REGIND(rgba), MP1 )) /* qa2 | qb2 | qg2 | qr2 | qa1 | qb1 | qg1 | qr1 */ ;\ -TWO(MOVQ ( REGIND(dest), MQ1 )) /* pa2 | pb2 | pg2 | pr2 | pa1 | pb1 | pg1 | pr1 */ ;\ +#define GMB_LOAD(rgba, dest, MPP, MQQ) \ +ONE(MOVD ( REGIND(rgba), MPP )) /* | | | | qa1 | qb1 | qg1 | qr1 */ ;\ +ONE(MOVD ( REGIND(dest), MQQ )) /* | | | | pa1 | pb1 | pg1 | pr1 */ ;\ ;\ +TWO(MOVQ ( REGIND(rgba), MPP )) /* qa2 | qb2 | qg2 | qr2 | qa1 | qb1 | qg1 | qr1 */ ;\ +TWO(MOVQ ( REGIND(dest), MQQ )) /* pa2 | pb2 | pg2 | pr2 | pa1 | pb1 | pg1 | pr1 */ + +#define GMB_UNPACK(MP1, MQ1, MP2, MQ2, M00) \ TWO(MOVQ ( MP1, MP2 )) ;\ TWO(MOVQ ( MQ1, MQ2 )) ;\ ;\ PUNPCKLBW ( M00, MQ1 ) /* qa1 | qb1 | qg1 | qr1 */ ;\ TWO(PUNPCKHBW ( M00, MQ2 )) /* qa2 | qb2 | qg2 | qr2 */ ;\ PUNPCKLBW ( M00, MP1 ) /* pa1 | pb1 | pg1 | pr1 */ ;\ -TWO(PUNPCKHBW ( M00, MP2 )) /* pa2 | pb2 | pg2 | pr2 */ ;\ - ;\ +TWO(PUNPCKHBW ( M00, MP2 )) /* pa2 | pb2 | pg2 | pr2 */ + +#define GMB_ALPHA(MP1, MA1, MP2, MA2) \ MOVQ ( MP1, MA1 ) ;\ TWO(MOVQ ( MP2, MA2 )) ;\ ;\ @@ -252,17 +234,21 @@ TWO(PUNPCKHWD ( MA2, MA2 )) /* pa2 | pa2 | | PUNPCKHDQ ( MA1, MA1 ) /* pa1 | pa1 | pa1 | pa1 */ ;\ TWO(PUNPCKHDQ ( MA2, MA2 )) /* pa2 | pa2 | pa2 | pa2 */ - -/* common blending storing code - */ -#define GMB_STORE(rgba, MA1, MA2) \ - PACKUSWB ( MA2, MA1 ) /* sa2 | sb2 | sg2 | sr2 | sa1 | sb1 | sg1 | sr1 */ ;\ - ;\ -ONE(MOVD ( MA1, REGIND(rgba) )) ;\ -TWO(MOVQ ( MA1, REGIND(rgba) )) +#define GMB_PACK( MS1, MS2 ) \ + PACKUSWB ( MS2, MS1 ) /* sa2 | sb2 | sg2 | sr2 | sa1 | sb1 | sg1 | sr1 */ ;\ +#define GMB_STORE(rgba, MSS ) \ +ONE(MOVD ( MSS, REGIND(rgba) )) ;\ +TWO(MOVQ ( MSS, REGIND(rgba) )) - SEG_TEXT + + SEG_DATA + +ALIGNDATA8 +const_80: + D_LONG 0x00800080, 0x00800080 + + SEG_TEXT /* common transparency blending mode @@ -271,12 +257,34 @@ TWO(MOVQ ( MA1, REGIND(rgba) )) #define TAG(x) x##_transparency #define INIT \ - GMB_INIT( MM0 ) + PXOR ( MM0, MM0 ) /* 0x0000 | 0x0000 | 0x0000 | 0x0000 */ + +#define MAIN( rgba, dest ) \ + GMB_LOAD( rgba, dest, MM1, MM2 ) ;\ + GMB_UNPACK( MM1, MM2, MM4, MM5, MM0 ) ;\ + GMB_ALPHA( MM1, MM3, MM4, MM6 ) ;\ + GMB_LERP_GSC( MM1, MM2, MM3, MM4, MM5, MM6 ) ;\ + GMB_PACK( MM3, MM6 ) ;\ + GMB_STORE( rgba, MM3 ) + +#include "mmx_blendtmp.h" + + +/* modulate + */ + +#define TAG(x) x##_modulate + +#define INIT \ + PXOR ( MM0, MM0 ) /* 0x0000 | 0x0000 | 0x0000 | 0x0000 */ ;\ + MOVQ ( CONTENT(const_80), MM7 ) /* 0xffff | 0xffff | 0xffff | 0xffff */ -#define MAIN \ - GMB_LOAD( EDI, ESI, MM1, MM2, MM3, MM4, MM5, MM6, MM0) ;\ - GMB_LERP_GSC( MM1, MM2, MM3, MM4, MM5, MM6 ) ;\ - GMB_STORE( EDI, MM3, MM6 ) +#define MAIN( rgba, dest ) \ + GMB_LOAD( rgba, dest, MM1, MM2 ) ;\ + GMB_UNPACK( MM1, MM2, MM4, MM5, MM0 ) ;\ + GMB_MULT_GSR( MM1, MM2, MM4, MM5, MM7 ) ;\ + GMB_PACK( MM2, MM5 ) ;\ + GMB_STORE( rgba, MM2 ) #include "mmx_blendtmp.h" diff --git a/src/mesa/x86/mmx_blendtmp.h b/src/mesa/x86/mmx_blendtmp.h index 395436ba015..1a8190355e4 100644 --- a/src/mesa/x86/mmx_blendtmp.h +++ b/src/mesa/x86/mmx_blendtmp.h @@ -41,7 +41,7 @@ GLNAME( TAG(_mesa_mmx_blend) ): /* runin */ #define ONE(x) x #define TWO(x) - MAIN + MAIN ( EDI, ESI ) #undef ONE #undef TWO @@ -66,7 +66,7 @@ LLBL ( TAG(GMB_loop_begin) ): /* main loop */ #define ONE(x) #define TWO(x) x - MAIN + MAIN ( EDI, ESI ) #undef ONE #undef TWO @@ -91,7 +91,7 @@ LLBL ( TAG(GMB_loop_end) ): /* runout */ #define ONE(x) x #define TWO(x) - MAIN + MAIN ( EDI, ESI ) #undef ONE #undef TWO |