st/mesa: Treat vertex outputs absent in outputMapping as zero in mesa_to_tgsi

[mesa.git] / src / mesa / x86 / mmx_blend.S

diff --git a/src/mesa/x86/mmx_blend.S b/src/mesa/x86/mmx_blend.S
index eeaf43ea9370e9cd91558942877b746df4ff154d..500e54a57f401216ab453408586ecbb32d9dc10c 100644 (file)
--- a/src/mesa/x86/mmx_blend.S
+++ b/src/mesa/x86/mmx_blend.S
@@ -6,7 +6,8 @@
 
 #ifdef USE_MMX_ASM
 #include "assyntax.h"
-#include "matypes.h"
+#define MATH_ASM_PTR_SIZE 4
+#include "math/m_vector_asm.h"
 
 /* integer multiplication - alpha plus one
  *
@@ -235,7 +236,7 @@ TWO(PUNPCKHWD  ( MA2, MA2 ))                        /*    pa2    |    pa2    |           |
 TWO(PUNPCKHDQ  ( MA2, MA2 ))                    /*    pa2    |    pa2    |    pa2    |    pa2    */
 
 #define GMB_PACK( MS1, MS2 ) \
-    PACKUSWB   ( MS2, MS1 )                    /* sa2 | sb2 | sg2 | sr2 | sa1 | sb1 | sg1 | sr1 */     ;\
+    PACKUSWB   ( MS2, MS1 )                    /* sa2 | sb2 | sg2 | sr2 | sa1 | sb1 | sg1 | sr1 */     ;
 
 #define GMB_STORE(rgba, MSS ) \
 ONE(MOVD       ( MSS, REGIND(rgba) ))          /*     |     |     |     | sa1 | sb1 | sg1 | sr1 */     ;\