[Nouveau] [PATCH 1/2] nv110/exa: Remove depbars
Aaryaman Vasishta
jem456.vasishta at gmail.com
Sat Jul 1 15:37:04 UTC 2017
Removed explicit depar instructions as they're not used by the blob anymore.
Signed-off-by: Aaryaman Vasishta <jem456.vasishta at gmail.com>
---
src/shader/exac8nv110.fp | 5 ++---
src/shader/exac8nv110.fpc | 10 ++++------
src/shader/exacanv110.fp | 5 ++---
src/shader/exacanv110.fpc | 10 ++++------
src/shader/exacmnv110.fp | 5 ++---
src/shader/exacmnv110.fpc | 10 ++++------
src/shader/exas8nv110.fp | 4 +---
src/shader/exas8nv110.fpc | 8 ++------
src/shader/exasanv110.fp | 5 ++---
src/shader/exasanv110.fpc | 10 ++++------
src/shader/exascnv110.fp | 2 --
src/shader/exascnv110.fpc | 4 ----
src/shader/videonv110.fp | 9 +++------
src/shader/videonv110.fpc | 18 ++++++------------
14 files changed, 36 insertions(+), 69 deletions(-)
diff --git a/src/shader/exac8nv110.fp b/src/shader/exac8nv110.fp
index ce78036..220d7e5 100644
--- a/src/shader/exac8nv110.fp
+++ b/src/shader/exac8nv110.fp
@@ -36,12 +36,11 @@ ipa $r3 a[0x84] $r0 0x0 0x1
sched (st 0x0) (st 0x0) (st 0x0)
ipa $r2 a[0x80] $r0 0x0 0x1
tex nodep $r0 $r2 0x0 0x0 t2d 0x8
-depbar le 0x5 0x0 0x0
-sched (st 0x0) (st 0x0) (st 0x0)
fmul ftz $r3 $r0 $r1
+sched (st 0x0) (st 0x0) (st 0x0)
mov $r2 $r3 0xf
mov $r1 $r3 0xf
-sched (st 0x0) (st 0x0) (st 0x0)
mov $r0 $r3 0xf
+sched (st 0x0) (st 0x0) (st 0x0)
exit
#endif
diff --git a/src/shader/exac8nv110.fpc b/src/shader/exac8nv110.fpc
index 4aa1368..d8d5517 100644
--- a/src/shader/exac8nv110.fpc
+++ b/src/shader/exac8nv110.fpc
@@ -20,19 +20,17 @@
0xe043ff88,
0x2ff70200,
0xc03a0004,
-0x34070000,
-0xf0f00000,
-0xfc0007e0,
-0x001f8000,
0x00170003,
0x5c681000,
+0xfc0007e0,
+0x001f8000,
0x00370002,
0x5c980780,
0x00370001,
0x5c980780,
-0xfc0007e0,
-0x001f8000,
0x00370000,
0x5c980780,
+0xfc0007e0,
+0x001f8000,
0x0007000f,
0xe3000000,
diff --git a/src/shader/exacanv110.fp b/src/shader/exacanv110.fp
index a70d5c5..bad34c9 100644
--- a/src/shader/exacanv110.fp
+++ b/src/shader/exacanv110.fp
@@ -36,12 +36,11 @@ ipa $r1 a[0x84] $r0 0x0 0x1
sched (st 0x0) (st 0x0) (st 0x0)
ipa $r0 a[0x80] $r0 0x0 0x1
tex nodep $r0 $r0 0x0 0x0 t2d 0xf
-depbar le 0x5 0x0 0x0
-sched (st 0x0) (st 0x0) (st 0x0)
fmul ftz $r3 $r3 $r7
+sched (st 0x0) (st 0x0) (st 0x0)
fmul ftz $r2 $r2 $r6
fmul ftz $r1 $r1 $r5
-sched (st 0x0) (st 0x0) (st 0x0)
fmul ftz $r0 $r0 $r4
+sched (st 0x0) (st 0x0) (st 0x0)
exit
#endif
diff --git a/src/shader/exacanv110.fpc b/src/shader/exacanv110.fpc
index 7c0ca5e..1a151a2 100644
--- a/src/shader/exacanv110.fpc
+++ b/src/shader/exacanv110.fpc
@@ -20,19 +20,17 @@
0xe043ff88,
0xaff70000,
0xc03a0007,
-0x34070000,
-0xf0f00000,
-0xfc0007e0,
-0x001f8000,
0x00770303,
0x5c681000,
+0xfc0007e0,
+0x001f8000,
0x00670202,
0x5c681000,
0x00570101,
0x5c681000,
-0xfc0007e0,
-0x001f8000,
0x00470000,
0x5c681000,
+0xfc0007e0,
+0x001f8000,
0x0007000f,
0xe3000000,
diff --git a/src/shader/exacmnv110.fp b/src/shader/exacmnv110.fp
index fe5c294..c1eb38e 100644
--- a/src/shader/exacmnv110.fp
+++ b/src/shader/exacmnv110.fp
@@ -36,12 +36,11 @@ ipa $r1 a[0x84] $r0 0x0 0x1
sched (st 0x0) (st 0x0) (st 0x0)
ipa $r0 a[0x80] $r0 0x0 0x1
tex nodep $r0 $r0 0x0 0x0 t2d 0xf
-depbar le 0x5 0x0 0x0
-sched (st 0x0) (st 0x0) (st 0x0)
fmul ftz $r3 $r3 $r4
+sched (st 0x0) (st 0x0) (st 0x0)
fmul ftz $r2 $r2 $r4
fmul ftz $r1 $r1 $r4
-sched (st 0x0) (st 0x0) (st 0x0)
fmul ftz $r0 $r0 $r4
+sched (st 0x0) (st 0x0) (st 0x0)
exit
#endif
diff --git a/src/shader/exacmnv110.fpc b/src/shader/exacmnv110.fpc
index 9d62c1a..0b21a0a 100644
--- a/src/shader/exacmnv110.fpc
+++ b/src/shader/exacmnv110.fpc
@@ -20,19 +20,17 @@
0xe043ff88,
0xaff70000,
0xc03a0007,
-0x34070000,
-0xf0f00000,
-0xfc0007e0,
-0x001f8000,
0x00470303,
0x5c681000,
+0xfc0007e0,
+0x001f8000,
0x00470202,
0x5c681000,
0x00470101,
0x5c681000,
-0xfc0007e0,
-0x001f8000,
0x00470000,
0x5c681000,
+0xfc0007e0,
+0x001f8000,
0x0007000f,
0xe3000000,
diff --git a/src/shader/exas8nv110.fp b/src/shader/exas8nv110.fp
index 4fe2e19..c5349d9 100644
--- a/src/shader/exas8nv110.fp
+++ b/src/shader/exas8nv110.fp
@@ -32,11 +32,9 @@ ipa $r1 a[0x84] $r0 0x0 0x1
sched (st 0x0) (st 0x0) (st 0x0)
ipa $r0 a[0x80] $r0 0x0 0x1
tex nodep $r0 $r0 0x0 0x0 t2d 0x8
-depbar le 0x5 0x0 0x0
-sched (st 0x0) (st 0x0) (st 0x0)
mov $r3 $r0 0xf
+sched (st 0x0) (st 0x0) (st 0x0)
mov $r2 $r0 0xf
mov $r1 $r0 0xf
-sched (st 0x0) (st 0x0) (st 0x0)
exit
#endif
diff --git a/src/shader/exas8nv110.fpc b/src/shader/exas8nv110.fpc
index 1181c41..fabf980 100644
--- a/src/shader/exas8nv110.fpc
+++ b/src/shader/exas8nv110.fpc
@@ -12,17 +12,13 @@
0xe043ff88,
0x2ff70000,
0xc03a0004,
-0x34070000,
-0xf0f00000,
-0xfc0007e0,
-0x001f8000,
0x00070003,
0x5c980780,
+0xfc0007e0,
+0x001f8000,
0x00070002,
0x5c980780,
0x00070001,
0x5c980780,
-0xfc0007e0,
-0x001f8000,
0x0007000f,
0xe3000000,
diff --git a/src/shader/exasanv110.fp b/src/shader/exasanv110.fp
index 61374a6..4392c1f 100644
--- a/src/shader/exasanv110.fp
+++ b/src/shader/exasanv110.fp
@@ -36,12 +36,11 @@ ipa $r1 a[0x94] $r0 0x0 0x1
sched (st 0x0) (st 0x0) (st 0x0)
ipa $r0 a[0x90] $r0 0x0 0x1
tex nodep $r0 $r0 0x0 0x1 t2d 0xf
-depbar le 0x5 0x0 0x0
-sched (st 0x0) (st 0x0) (st 0x0)
fmul ftz $r3 $r3 $r4
+sched (st 0x0) (st 0x0) (st 0x0)
fmul ftz $r2 $r2 $r4
fmul ftz $r1 $r1 $r4
-sched (st 0x0) (st 0x0) (st 0x0)
fmul ftz $r0 $r0 $r4
+sched (st 0x0) (st 0x0) (st 0x0)
exit
#endif
diff --git a/src/shader/exasanv110.fpc b/src/shader/exasanv110.fpc
index 5516a03..80a2731 100644
--- a/src/shader/exasanv110.fpc
+++ b/src/shader/exasanv110.fpc
@@ -20,19 +20,17 @@
0xe043ff89,
0xaff70000,
0xc03a0017,
-0x34070000,
-0xf0f00000,
-0xfc0007e0,
-0x001f8000,
0x00470303,
0x5c681000,
+0xfc0007e0,
+0x001f8000,
0x00470202,
0x5c681000,
0x00470101,
0x5c681000,
-0xfc0007e0,
-0x001f8000,
0x00470000,
0x5c681000,
+0xfc0007e0,
+0x001f8000,
0x0007000f,
0xe3000000,
diff --git a/src/shader/exascnv110.fp b/src/shader/exascnv110.fp
index 90bbb55..83a089a 100644
--- a/src/shader/exascnv110.fp
+++ b/src/shader/exascnv110.fp
@@ -32,7 +32,5 @@ ipa $r1 a[0x84] $r0 0x0 0x1
sched (st 0x0) (st 0x0) (st 0x0)
ipa $r0 a[0x80] $r0 0x0 0x1
tex nodep $r0 $r0 0x0 0x0 t2d 0xf
-depbar le 0x5 0x0 0x0
-sched (st 0x0) (st 0x0) (st 0x0)
exit
#endif
diff --git a/src/shader/exascnv110.fpc b/src/shader/exascnv110.fpc
index 2dba15d..3dd3f89 100644
--- a/src/shader/exascnv110.fpc
+++ b/src/shader/exascnv110.fpc
@@ -12,9 +12,5 @@
0xe043ff88,
0xaff70000,
0xc03a0007,
-0x34070000,
-0xf0f00000,
-0xfc0007e0,
-0x001f8000,
0x0007000f,
0xe3000000,
diff --git a/src/shader/videonv110.fp b/src/shader/videonv110.fp
index 2728311..b171e51 100644
--- a/src/shader/videonv110.fp
+++ b/src/shader/videonv110.fp
@@ -34,21 +34,18 @@ ipa $r1 a[0x84] $r2 0x0 0x1
tex nodep $r4 $r0 0x0 0x0 t2d 0x8
tex nodep $r0 $r0 0x0 0x1 t2d 0xc
sched (st 0x0) (st 0x0) (st 0x0)
-depbar le 0x5 0x1 0x1
fmul ftz $r5 $r4 c0[0x0]
fadd ftz $r3 $r5 c0[0x4]
-sched (st 0x0) (st 0x0) (st 0x0)
fadd ftz $r4 $r5 c0[0x8]
-fadd ftz $r5 $r5 c0[0xc]
-depbar le 0x5 0x0 0x0
sched (st 0x0) (st 0x0) (st 0x0)
+fadd ftz $r5 $r5 c0[0xc]
ffma ftz $r3 $r0 c0[0x10] $r3
ffma ftz $r4 $r0 c0[0x14] $r4
-ffma ftz $r5 $r0 c0[0x18] $r5
sched (st 0x0) (st 0x0) (st 0x0)
+ffma ftz $r5 $r0 c0[0x18] $r5
ffma ftz $r0 $r1 c0[0x1c] $r3
ffma ftz $r2 $r1 c0[0x24] $r5
-ffma ftz $r1 $r1 c0[0x20] $r4
sched (st 0x0) (st 0x0) (st 0x0)
+ffma ftz $r1 $r1 c0[0x20] $r4
exit
#endif
diff --git a/src/shader/videonv110.fpc b/src/shader/videonv110.fpc
index 31d745a..850163a 100644
--- a/src/shader/videonv110.fpc
+++ b/src/shader/videonv110.fpc
@@ -16,37 +16,31 @@
0xc03a0016,
0xfc0007e0,
0x001f8000,
-0x34170001,
-0xf0f00000,
0x00070405,
0x4c681000,
0x00170503,
0x4c581000,
-0xfc0007e0,
-0x001f8000,
0x00270504,
0x4c581000,
-0x00370505,
-0x4c581000,
-0x34070000,
-0xf0f00000,
0xfc0007e0,
0x001f8000,
+0x00370505,
+0x4c581000,
0x00470003,
0x49a00180,
0x00570004,
0x49a00200,
-0x00670005,
-0x49a00280,
0xfc0007e0,
0x001f8000,
+0x00670005,
+0x49a00280,
0x00770100,
0x49a00180,
0x00970102,
0x49a00280,
-0x00870101,
-0x49a00200,
0xfc0007e0,
0x001f8000,
+0x00870101,
+0x49a00200,
0x0007000f,
0xe3000000,
--
2.11.0
More information about the Nouveau
mailing list