Mesa (master): nv50: fix constant vtxattr methods

[Christoph Bumiller]

Module: Mesa
Branch: master
Commit: c6559b7e01bbbf7f8d23d6ca58b5fe3d8514ad97
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c6559b7e01bbbf7f8d23d6ca58b5fe3d8514ad97

Author: Christoph Bumiller <e0425955 at student.tuwien.ac.at>
Date:   Mon Jan 18 21:37:33 2010 +0100

nv50: fix constant vtxattr methods

This function was untested, sorry.

---

 src/gallium/drivers/nv50/nv50_vbo.c |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/gallium/drivers/nv50/nv50_vbo.c b/src/gallium/drivers/nv50/nv50_vbo.c
index b9cf075..bfb1b34 100644
--- a/src/gallium/drivers/nv50/nv50_vbo.c
+++ b/src/gallium/drivers/nv50/nv50_vbo.c
@@ -230,25 +230,25 @@ nv50_set_static_vtxattr(struct nv50_context *nv50, unsigned i, void *data)
 	switch (nv50->vtxelt[i].nr_components) {
 	case 4:
 		BEGIN_RING(chan, tesla, NV50TCL_VTX_ATTR_4F_X(i), 4);
-		OUT_RING  (chan, v[0]);
-		OUT_RING  (chan, v[1]);
-		OUT_RING  (chan, v[2]);
-		OUT_RING  (chan, v[3]);
+		OUT_RINGf (chan, v[0]);
+		OUT_RINGf (chan, v[1]);
+		OUT_RINGf (chan, v[2]);
+		OUT_RINGf (chan, v[3]);
 		break;
 	case 3:
-		BEGIN_RING(chan, tesla, NV50TCL_VTX_ATTR_3F_X(i), 4);
-		OUT_RING  (chan, v[0]);
-		OUT_RING  (chan, v[1]);
-		OUT_RING  (chan, v[2]);
+		BEGIN_RING(chan, tesla, NV50TCL_VTX_ATTR_3F_X(i), 3);
+		OUT_RINGf (chan, v[0]);
+		OUT_RINGf (chan, v[1]);
+		OUT_RINGf (chan, v[2]);
 		break;
 	case 2:
-		BEGIN_RING(chan, tesla, NV50TCL_VTX_ATTR_2F_X(i), 4);
-		OUT_RING  (chan, v[0]);
-		OUT_RING  (chan, v[1]);
+		BEGIN_RING(chan, tesla, NV50TCL_VTX_ATTR_2F_X(i), 2);
+		OUT_RINGf (chan, v[0]);
+		OUT_RINGf (chan, v[1]);
 		break;
 	case 1:
-		BEGIN_RING(chan, tesla, NV50TCL_VTX_ATTR_1F(i), 4);
-		OUT_RING  (chan, v[0]);
+		BEGIN_RING(chan, tesla, NV50TCL_VTX_ATTR_1F(i), 1);
+		OUT_RINGf (chan, v[0]);
 		break;
 	default:
 		assert(0);