diff options
| author | Johannes Obermayr <[email protected]> | 2010-02-17 16:16:50 +1000 |
|---|---|---|
| committer | Ben Skeggs <[email protected]> | 2010-02-17 16:16:50 +1000 |
| commit | 41b19c279a0eae61f0f95c3b66376a25635241fd (patch) | |
| tree | 7de45941cce947c45e5e2e3efba883c49e571edc /src/mesa/drivers/dri/nouveau/nouveau_bo_state.c | |
| parent | de5928a61549a6ca66e6b9ff6e50b305f653888c (diff) | |
nouveau: fix legacy dri driver build
Diffstat (limited to 'src/mesa/drivers/dri/nouveau/nouveau_bo_state.c')
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nouveau_bo_state.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_bo_state.c b/src/mesa/drivers/dri/nouveau/nouveau_bo_state.c index 664632f407d..fc5f77b46a7 100644 --- 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; |