summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Skeggs <skeggsb@gmail.com>2008-06-09 17:36:22 +1000
committerBen Skeggs <skeggsb@gmail.com>2008-06-29 15:46:16 +1000
commit454394e749feca5ac00e7a270e6ca5529581d228 (patch)
tree51d4430e1a25c46f6738c136fcf510fb052cc714
parent51ea3aae03154046316b814053f7493bdb10c853 (diff)
nv50: quick hack so progs/fp/fp-tri works for the moment
-rw-r--r--src/gallium/drivers/nv50/nv50_context.h4
-rw-r--r--src/gallium/drivers/nv50/nv50_program.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/nv50/nv50_context.h b/src/gallium/drivers/nv50/nv50_context.h
index c4a8a4c064..69c9dba675 100644
--- a/src/gallium/drivers/nv50/nv50_context.h
+++ b/src/gallium/drivers/nv50/nv50_context.h
@@ -24,8 +24,8 @@
fprintf(stderr, "nouveau: "fmt, ##args);
/* Constant buffer assignment */
-#define NV50_CB_PMISC 0
-#define NV50_CB_PVP 1
+#define NV50_CB_PMISC 1
+#define NV50_CB_PVP 0
#define NV50_CB_PFP 2
#define NV50_CB_PGP 3
#define NV50_CB_TIC 4
diff --git a/src/gallium/drivers/nv50/nv50_program.c b/src/gallium/drivers/nv50/nv50_program.c
index 21341619de..843e036251 100644
--- a/src/gallium/drivers/nv50/nv50_program.c
+++ b/src/gallium/drivers/nv50/nv50_program.c
@@ -1369,7 +1369,7 @@ nv50_program_validate_data(struct nv50_context *nv50, struct nv50_program *p)
for (i = 0; i < p->immd_nr; i++) {
BEGIN_RING(tesla, 0x0f00, 2);
- OUT_RING ((NV50_CB_PMISC << 16) | (i << 8));
+ OUT_RING ((NV50_CB_PMISC << 0) | (i << 8));
OUT_RING (fui(p->immd[i]));
}
}