summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/nouveau
diff options
context:
space:
mode:
authorSamuel Pitoiset <[email protected]>2016-07-21 22:15:53 +0200
committerSamuel Pitoiset <[email protected]>2016-07-22 11:32:09 +0200
commitc2801f92726d9374b2ca2273347671f05ffa7d84 (patch)
tree5a9f2483d33bac7e02d8762791de285178714b44 /src/gallium/drivers/nouveau
parentdbcff7fdbba8cf1305e1670f47cadffe676df252 (diff)
nvc0/mme: fix offsets used for indirect draws
This fixes a regression introduced in 1da704a94c57aa0b0cf8faaa3236fe47dfb8f88c because the offset has moved from 0x180 to 0x1a0, and the macros have to be re-compiled. Fixes: 1da704a ("nvc0: increase the tex handles area size in the driver") Signed-off-by: Samuel Pitoiset <[email protected]> Reviewed-by: Ilia Mirkin <[email protected]>
Diffstat (limited to 'src/gallium/drivers/nouveau')
-rw-r--r--src/gallium/drivers/nouveau/nvc0/mme/com9097.mme8
-rw-r--r--src/gallium/drivers/nouveau/nvc0/mme/com9097.mme.h8
2 files changed, 8 insertions, 8 deletions
diff --git a/src/gallium/drivers/nouveau/nvc0/mme/com9097.mme b/src/gallium/drivers/nouveau/nvc0/mme/com9097.mme
index 7f76ec66edb..11c20564c36 100644
--- a/src/gallium/drivers/nouveau/nvc0/mme/com9097.mme
+++ b/src/gallium/drivers/nouveau/nvc0/mme/com9097.mme
@@ -255,7 +255,7 @@ dei_draw_again:
parm $r4 maddr 0x5f7 /* INDEX_BATCH_FIRST, start */
parm $r4 send $r4 /* index_bias, send start */
maddr 0x18e3 /* CB_POS */
- send 0x180 /* 256 + 128 */
+ send 0x1a0 /* 256 + 160 */
braz $r2 #dei_end
parm $r5 send $r4 /* start_instance, send index_bias */
send $r5 /* send start_instance */
@@ -311,7 +311,7 @@ dai_draw_again:
braz $r3 #dai_end
parm $r4 send $r4 /* start_instance */
maddr 0x18e3 /* CB_POS */
- send 0x180 /* 256 + 128 */
+ send 0x1a0 /* 256 + 160 */
send 0x0 /* send 0 as base_vertex */
send $r4 /* send start_instance */
send $r6 /* draw id */
@@ -374,7 +374,7 @@ deic_draw_again:
parm $r4 maddr 0x5f7 /* INDEX_BATCH_FIRST, start */
parm $r4 send $r4 /* index_bias, send start */
maddr 0x18e3 /* CB_POS */
- send 0x180 /* 256 + 128 */
+ send 0x1a0 /* 256 + 160 */
braz $r2 #deic_end
parm $r5 send $r4 /* start_instance, send index_bias */
send $r5 /* send start_instance */
@@ -455,7 +455,7 @@ daic_draw_again:
braz $r3 #daic_end
parm $r4 send $r4 /* start_instance */
maddr 0x18e3 /* CB_POS */
- send 0x180 /* 256 + 128 */
+ send 0x1a0 /* 256 + 160 */
send 0x0 /* send 0 as base_vertex */
send $r4 /* send start_instance */
send $r6 /* draw id */
diff --git a/src/gallium/drivers/nouveau/nvc0/mme/com9097.mme.h b/src/gallium/drivers/nouveau/nvc0/mme/com9097.mme.h
index ecadf7e4d29..1c8f4bbf273 100644
--- a/src/gallium/drivers/nouveau/nvc0/mme/com9097.mme.h
+++ b/src/gallium/drivers/nouveau/nvc0/mme/com9097.mme.h
@@ -140,7 +140,7 @@ uint32_t mme9097_draw_elts_indirect[] = {
0x017dc451,
0x00002431,
0x0638c021,
- 0x00600041,
+ 0x00680041,
0x0004d007,
0x00002531,
0x00002841,
@@ -185,7 +185,7 @@ uint32_t mme9097_draw_arrays_indirect[] = {
0x0004d807,
0x00002431,
0x0638c021,
- 0x00600041,
+ 0x00680041,
0x00000041,
0x00002041,
0x00003041,
@@ -233,7 +233,7 @@ uint32_t mme9097_draw_elts_indirect_count[] = {
0x017dc451,
0x00002431,
0x0638c021,
- 0x00600041,
+ 0x00680041,
0x0004d007,
0x00002531,
0x00002841,
@@ -300,7 +300,7 @@ uint32_t mme9097_draw_arrays_indirect_count[] = {
0x0004d807,
0x00002431,
0x0638c021,
- 0x00600041,
+ 0x00680041,
0x00000041,
0x00002041,
0x00003041,