Replace SF kernel with the one from broadwater-video HEAD.

1 files changed, 8 insertions, 90 deletions

diff --git a/src/i830_video.c b/src/i830_video.c
index 33e716f2..01a028d3 100644
--- a/src/i830_video.c
+++ b/src/i830_video.c
@@ -2673,50 +2673,24 @@ static const CARD32 vs_kernel_static[][4] = {
 #define SF_MAX_THREADS	   1
 
 static const CARD32 sf_kernel_static[][4] = {
-#if 1
-/*    send   0 (4) g6<1>F g1.12<4,4,1>F math mlen 1 rlen 1 { align1 +  } */
-   { 0x00400031, 0x20c01fbd, 0x0069002c, 0x01110081 },
+/*    send   0 (1) g6<1>F g1.12<0,1,0>F math mlen 1 rlen 1 { align1 +  } */
+   { 0x00000031, 0x20c01fbd, 0x0000002c, 0x01110081 },
+/*    send   0 (1) g6.4<1>F g1.20<0,1,0>F math mlen 1 rlen 1 { align1 +  } */
+   { 0x00000031, 0x20c41fbd, 0x00000034, 0x01110081 },
 /*    add (8) g7<1>F g4<8,8,1>F g3<8,8,1>F { align1 +  } */
    { 0x00600040, 0x20e077bd, 0x008d0080, 0x008d4060 },
 /*    mul (1) g7<1>F g7<0,1,0>F g6<0,1,0>F { align1 +  } */
    { 0x00000041, 0x20e077bd, 0x000000e0, 0x000000c0 },
-/*    mov (1) g7.4<1>F g6.12<0,1,0>F { align1 +  } */
-   { 0x00000001, 0x20e403bd, 0x000000cc, 0x00000000 },
+/*    mul (1) g7.4<1>F g7.4<0,1,0>F g6.4<0,1,0>F { align1 +  } */
+   { 0x00000041, 0x20e477bd, 0x000000e4, 0x000000c4 },
 /*    mov (8) m1<1>F g7<0,1,0>F { align1 +  } */
    { 0x00600001, 0x202003be, 0x000000e0, 0x00000000 },
 /*    mov (8) m2<1>F g7.4<0,1,0>F { align1 +  } */
    { 0x00600001, 0x204003be, 0x000000e4, 0x00000000 },
 /*    mov (8) m3<1>F g3<8,8,1>F { align1 +  } */
    { 0x00600001, 0x206003be, 0x008d0060, 0x00000000 },
-/*    send   0 (8) a0<1>F g0<8,8,1>F urb mlen 4 rlen 0 write +0 noswizzle used complete EOT{ align1 +  } */
-   { 0x00600031, 0x20001fbc, 0x008d0000, 0x8640c000 },
-/*    nop (4) g0<1>UD { align1 +  } */
-   { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
-/*    nop (4) g0<1>UD { align1 +  } */
-   { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
-/*    nop (4) g0<1>UD { align1 +  } */
-   { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
-/*    nop (4) g0<1>UD { align1 +  } */
-   { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
-/*    nop (4) g0<1>UD { align1 +  } */
-   { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
-/*    nop (4) g0<1>UD { align1 +  } */
-   { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
-/*    nop (4) g0<1>UD { align1 +  } */
-   { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
-/*    nop (4) g0<1>UD { align1 +  } */
-   { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
-
-#endif
-#if 0
-/*    mov (8) m1<1>F 0.00138889{ align1 +  } */
-   { 0x00600001, 0x202073fe, 0x00000000, 0x3ab60b61 },
-/*    mov (8) m2<1>F 0.00208333{ align1 +  } */
-   { 0x00600001, 0x204073fe, 0x00000000, 0x3b088889 },
-/*    mov (8) m3<1>F g3<8,8,1>F { align1 +  } */
-   { 0x00600001, 0x206003be, 0x008d0060, 0x00000000 },
-/*    send   0 (8) a0<1>F g0<8,8,1>F urb mlen 4 rlen 0 write +0 noswizzle used complete EOT{ align1 +  } */
-   { 0x00600031, 0x20001fbc, 0x008d0000, 0x8640c000 },
+/*    send   0 (8) a0<1>F g0<8,8,1>F urb mlen 4 rlen 0 write +0 transpose used complete EOT{ align1 +  } */
+   { 0x00600031, 0x20001fbc, 0x008d0000, 0x8640c800 },
 /*    nop (4) g0<1>UD { align1 +  } */
    { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
 /*    nop (4) g0<1>UD { align1 +  } */
@@ -2733,62 +2707,6 @@ static const CARD32 sf_kernel_static[][4] = {
    { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
 /*    nop (4) g0<1>UD { align1 +  } */
    { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
-#endif
-
-#if 0
-/*    send   0 (1) g6<1>F g1.8<0,1,0>F math mlen 1 rlen 1 { align1 +  } */
-    { 0x00000031, 0x20c01fbd, 0x00000028, 0x01110081 },
-/*    mov (2) g3.8<1>F g2<2,2,1>F { align1 +  } */
-    { 0x00200001, 0x206803bd, 0x00450040, 0x00000000 },
-/*    mov (2) g4.8<1>F g2.8<2,2,1>F { align1 +  } */
-    { 0x00200001, 0x208803bd, 0x00450048, 0x00000000 },
-/*    mov (2) g5.8<1>F g2.16<2,2,1>F { align1 +  } */
-    { 0x00200001, 0x20a803bd, 0x00450050, 0x00000000 },
-/*    mov (1) a48<1>UW 240 { align1 +  } */
-    { 0x00000001, 0x26002168, 0x00000000, 0x000000f0 },
-/*    mul (8) g3<1>F g3<8,8,1>F g2.4<0,1,0>F { align1 predreg+  } */
-    { 0x00610041, 0x206077bd, 0x008d0060, 0x00000044 },
-/*    mul (8) g4<1>F g4<8,8,1>F g2.12<0,1,0>F { align1 predreg+  } */
-    { 0x00610041, 0x208077bd, 0x008d0080, 0x0000004c },
-/*    mul (8) g5<1>F g5<8,8,1>F g2.20<0,1,0>F { align1 predreg+  } */
-    { 0x00610041, 0x20a077bd, 0x008d00a0, 0x00000054 },
-/*    add (8) g7<1>F g4<8,8,1>F g3<8,8,1>F { align1 +  } */
-    { 0x00600040, 0x20e077bd, 0x008d0080, 0x008d4060 },
-/*    add (8) g8<1>F g5<8,8,1>F g3<8,8,1>F { align1 +  } */
-    { 0x00600040, 0x210077bd, 0x008d00a0, 0x008d4060 },
-/*    mul (8) a0<1>F g7<8,8,1>F g1.24<0,1,0>F { align1 +  } */
-    { 0x00600041, 0x200077bc, 0x008d00e0, 0x00000038 },
-/*    mac (8) g9<1>F g8<8,8,1>F g1.20<0,1,0>F { align1 +  } */
-    { 0x00600048, 0x212077bd, 0x008d0100, 0x00004034 },
-/*    mul (8) m1<1>F g9<8,8,1>F g6<0,1,0>F { align1 +  } */
-    { 0x00600041, 0x202077be, 0x008d0120, 0x000000c0 },
-/*    mul (8) a0<1>F g8<8,8,1>F g1.12<0,1,0>F { align1 +  } */
-    { 0x00600041, 0x200077bc, 0x008d0100, 0x0000002c },
-/*    mac (8) g9<1>F g7<8,8,1>F g1.16<0,1,0>F { align1 +  } */
-    { 0x00600048, 0x212077bd, 0x008d00e0, 0x00004030 },
-/*    mul (8) m2<1>F g9<8,8,1>F g6<0,1,0>F { align1 +  } */
-    { 0x00600041, 0x204077be, 0x008d0120, 0x000000c0 },
-/*    mov (8) m3<1>F g3<8,8,1>F { align1 +  } */
-    { 0x00600001, 0x206003be, 0x008d0060, 0x00000000 },
-/*    send   0 (8) a0<1>F g0<8,8,1>F urb mlen 4 rlen 0 write +0 transpose used complete EOT{ align1 +  } */
-    { 0x00600031, 0x20001fbc, 0x008d0000, 0x8640c800 },
-/*    nop (4) g0<1>UD { align1 +  } */
-    { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
-/*    nop (4) g0<1>UD { align1 +  } */
-    { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
-/*    nop (4) g0<1>UD { align1 +  } */
-    { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
-/*    nop (4) g0<1>UD { align1 +  } */
-    { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
-/*    nop (4) g0<1>UD { align1 +  } */
-    { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
-/*    nop (4) g0<1>UD { align1 +  } */
-    { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
-/*    nop (4) g0<1>UD { align1 +  } */
-    { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
-/*    nop (4) g0<1>UD { align1 +  } */
-    { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
-#endif
 };
 
 /*