diff options
| author | Marcin Slusarz <[email protected]> | 2009-12-29 00:36:17 +0100 |
|---|---|---|
| committer | Maarten Maathuis <[email protected]> | 2010-01-05 19:13:34 +0100 |
| commit | 29d2ab37e65c9242d01f63cc5376cb6929f9285f (patch) | |
| tree | d355837756d719e56aeb5ce32145a6eeefbe6828 /src/gallium/drivers/nv40/nv40_state_emit.c | |
| parent | c306ef5e81da5456d39a6e98cfc1f5f00b9c77a7 (diff) | |
nouveau: kill nouveau_push.h and use libdrm versions of BEGIN_RINGs, etc
Diffstat (limited to 'src/gallium/drivers/nv40/nv40_state_emit.c')
| -rw-r--r-- | src/gallium/drivers/nv40/nv40_state_emit.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/gallium/drivers/nv40/nv40_state_emit.c b/src/gallium/drivers/nv40/nv40_state_emit.c index 789ed16126a..13fe854915b 100644 --- a/src/gallium/drivers/nv40/nv40_state_emit.c +++ b/src/gallium/drivers/nv40/nv40_state_emit.c @@ -54,9 +54,10 @@ nv40_state_do_validate(struct nv40_context *nv40, void nv40_state_emit(struct nv40_context *nv40) { - struct nouveau_channel *chan = nv40->screen->base.channel; struct nv40_state *state = &nv40->state; struct nv40_screen *screen = nv40->screen; + struct nouveau_channel *chan = screen->base.channel; + struct nouveau_grobj *curie = screen->curie; unsigned i; uint64_t states; @@ -80,10 +81,10 @@ nv40_state_emit(struct nv40_context *nv40) if (state->dirty & ((1ULL << NV40_STATE_FRAGPROG) | (1ULL << NV40_STATE_FRAGTEX0))) { - BEGIN_RING(curie, NV40TCL_TEX_CACHE_CTL, 1); - OUT_RING (2); - BEGIN_RING(curie, NV40TCL_TEX_CACHE_CTL, 1); - OUT_RING (1); + BEGIN_RING(chan, curie, NV40TCL_TEX_CACHE_CTL, 1); + OUT_RING (chan, 2); + BEGIN_RING(chan, curie, NV40TCL_TEX_CACHE_CTL, 1); + OUT_RING (chan, 1); } state->dirty = 0; |