softpipe: comments, re-formatting, etc

[mesa.git] / src / gallium / drivers / nv30 / nv30_vbo.c

diff --git a/src/gallium/drivers/nv30/nv30_vbo.c b/src/gallium/drivers/nv30/nv30_vbo.c
index a83ddf11546dabf0554bfecb3ce50beae07116d6..e48823a91381657a21ba43708db7fb4eac30a51f 100644 (file)
--- a/src/gallium/drivers/nv30/nv30_vbo.c
+++ b/src/gallium/drivers/nv30/nv30_vbo.c
@@ -1,6 +1,7 @@
 #include "pipe/p_context.h"
 #include "pipe/p_state.h"
 #include "util/u_inlines.h"
+#include "util/u_format.h"
 
 #include "nv30_context.h"
 #include "nv30_state.h"
@@ -34,7 +35,7 @@ nv30_vbo_format_to_hw(enum pipe_format pipe, unsigned *fmt, unsigned *ncomp)
                *fmt = NV34TCL_VTXFMT_TYPE_USHORT;
                break;
        default:
-               NOUVEAU_ERR("Unknown format %s\n", pf_name(pipe));
+               NOUVEAU_ERR("Unknown format %s\n", util_format_name(pipe));
                return 1;
        }
 
@@ -60,7 +61,7 @@ nv30_vbo_format_to_hw(enum pipe_format pipe, unsigned *fmt, unsigned *ncomp)
                *ncomp = 4;
                break;
        default:
-               NOUVEAU_ERR("Unknown format %s\n", pf_name(pipe));
+               NOUVEAU_ERR("Unknown format %s\n", util_format_name(pipe));
                return 1;
        }
 
@@ -185,7 +186,7 @@ nv30_draw_arrays(struct pipe_context *pipe,
 
                nv30_state_emit(nv30);
 
-               vc = nouveau_vbuf_split(chan->pushbuf->remaining, 6, 256,
+               vc = nouveau_vbuf_split(AVAIL_RING(chan), 6, 256,
                                        mode, start, count, &restart);
                if (!vc) {
                        FIRE_RING(chan);
@@ -239,7 +240,7 @@ nv30_draw_elements_u08(struct nv30_context *nv30, void *ib,
 
                nv30_state_emit(nv30);
 
-               vc = nouveau_vbuf_split(chan->pushbuf->remaining, 6, 2,
+               vc = nouveau_vbuf_split(AVAIL_RING(chan), 6, 2,
                                        mode, start, count, &restart);
                if (vc == 0) {
                        FIRE_RING(chan);
@@ -290,7 +291,7 @@ nv30_draw_elements_u16(struct nv30_context *nv30, void *ib,
 
                nv30_state_emit(nv30);
 
-               vc = nouveau_vbuf_split(chan->pushbuf->remaining, 6, 2,
+               vc = nouveau_vbuf_split(AVAIL_RING(chan), 6, 2,
                                        mode, start, count, &restart);
                if (vc == 0) {
                        FIRE_RING(chan);
@@ -341,7 +342,7 @@ nv30_draw_elements_u32(struct nv30_context *nv30, void *ib,
 
                nv30_state_emit(nv30);
 
-               vc = nouveau_vbuf_split(chan->pushbuf->remaining, 5, 1,
+               vc = nouveau_vbuf_split(AVAIL_RING(chan), 5, 1,
                                        mode, start, count, &restart);
                if (vc == 0) {
                        FIRE_RING(chan);
@@ -417,7 +418,7 @@ nv30_draw_elements_vbo(struct pipe_context *pipe,
 
                nv30_state_emit(nv30);
 
-               vc = nouveau_vbuf_split(chan->pushbuf->remaining, 6, 256,
+               vc = nouveau_vbuf_split(AVAIL_RING(chan), 6, 256,
                                        mode, start, count, &restart);
                if (!vc) {
                        FIRE_RING(chan);