nouveau: fix legacy dri driver build

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_bo_state.c b/src/mesa/drivers/dri/nouveau/nouveau_bo_state.c
index 664632f407dcd452c621e1af02f16dde7186a918..fc5f77b46a7657569bec658b4e09827e2df2dca8 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_bo_state.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_bo_state.c
@@ -32,7 +32,6 @@ nouveau_bo_marker_emit(GLcontext *ctx, struct nouveau_bo_marker *m,
                       uint32_t flags)
 {
        struct nouveau_channel *chan = context_chan(ctx);
-       struct nouveau_pushbuf *push = chan->pushbuf;
        uint32_t packet;
 
        if (m->gr->bound == NOUVEAU_GROBJ_UNBOUND)
@@ -41,11 +40,10 @@ nouveau_bo_marker_emit(GLcontext *ctx, struct nouveau_bo_marker *m,
        if (MARK_RING(chan, 2, 2))
                return GL_FALSE;
 
-       push->remaining -= 2;
        packet = (m->gr->subc << 13) | (1 << 18) | m->mthd;
 
        if (flags) {
-               if (nouveau_pushbuf_emit_reloc(chan, push->cur++, m->bo,
+               if (nouveau_pushbuf_emit_reloc(chan, chan->cur++, m->bo,
                                               packet, 0, flags |
                                               (m->flags & (NOUVEAU_BO_VRAM |
                                                            NOUVEAU_BO_GART |
@@ -53,10 +51,10 @@ nouveau_bo_marker_emit(GLcontext *ctx, struct nouveau_bo_marker *m,
                                               0, 0))
                        goto fail;
        } else {
-               *(push->cur++) = packet;
+               *(chan->cur++) = packet;
        }
 
-       if (nouveau_pushbuf_emit_reloc(chan, push->cur++, m->bo, m->data,
+       if (nouveau_pushbuf_emit_reloc(chan, chan->cur++, m->bo, m->data,
                                       m->data2, flags | m->flags,
                                       m->vor, m->tor))
                goto fail;

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_swtnl_t.c b/src/mesa/drivers/dri/nouveau/nouveau_swtnl_t.c
index 8fa922f422e1c550c3dae1a38de4caa29a675b89..a1609a0dd57570a93b29b8c8a557b8b71bc5abaf 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_swtnl_t.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_swtnl_t.c
@@ -210,7 +210,7 @@ swtnl_flush_vertices(GLcontext *ctx)
        swtnl_bind_vertices(ctx);
 
        while (count) {
-               push = get_max_vertices(ctx, NULL, chan->pushbuf->remaining);
+               push = get_max_vertices(ctx, NULL, AVAIL_RING(chan));
                push = MIN2(push / 12 * 12, count);
                count -= push;
 

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c b/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c
index ba1192a17044600c93bd3bc51f7f683dcf268acd..02c858076088225cbb7f4e3a822026210e68b910 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c
@@ -319,7 +319,7 @@ vbo_draw_vbo(GLcontext *ctx, const struct gl_client_array **arrays,
                                          min_index, max_index);
                }
 
-               if (count > get_max_vertices(ctx, ib, chan->pushbuf->remaining))
+               if (count > get_max_vertices(ctx, ib, AVAIL_RING(chan)))
                        WAIT_RING(chan, PUSHBUF_DWORDS);
 
                BATCH_BEGIN(nvgl_primitive(prims[i].mode));
@@ -355,7 +355,7 @@ vbo_draw_imm(GLcontext *ctx, const struct gl_client_array **arrays,
                        end = start + prims[i].count;
 
                if (prims[i].count > get_max_vertices(ctx, ib,
-                                                     chan->pushbuf->remaining))
+                                                     AVAIL_RING(chan)))
                        WAIT_RING(chan, PUSHBUF_DWORDS);
 
                BATCH_BEGIN(nvgl_primitive(prims[i].mode));