nv50: quick hack so progs/fp/fp-tri works for the moment

diff --git a/src/gallium/drivers/nv50/nv50_context.h b/src/gallium/drivers/nv50/nv50_context.h
index c4a8a4c064ea40e14d4d9cbdd4ccceed08b74331..69c9dba675b056760788e93235abba3cf9e73747 100644 (file)
--- 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 21341619de45516411abd1f6d48467dadb0f1248..843e03625140d18ac8df966d072e3da5b01b7c88 100644 (file)
--- 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]));
        }
 }