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_context.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_context.c')
| -rw-r--r-- | src/gallium/drivers/nv40/nv40_context.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/gallium/drivers/nv40/nv40_context.c b/src/gallium/drivers/nv40/nv40_context.c index d56c7a6b49c..f79ae4db84e 100644 --- a/src/gallium/drivers/nv40/nv40_context.c +++ b/src/gallium/drivers/nv40/nv40_context.c @@ -10,15 +10,20 @@ nv40_flush(struct pipe_context *pipe, unsigned flags, struct pipe_fence_handle **fence) { struct nv40_context *nv40 = nv40_context(pipe); + struct nv40_screen *screen = nv40->screen; + struct nouveau_channel *chan = screen->base.channel; + struct nouveau_grobj *curie = screen->curie; if (flags & PIPE_FLUSH_TEXTURE_CACHE) { - BEGIN_RING(curie, 0x1fd8, 1); - OUT_RING (2); - BEGIN_RING(curie, 0x1fd8, 1); - OUT_RING (1); + BEGIN_RING(chan, curie, 0x1fd8, 1); + OUT_RING (chan, 2); + BEGIN_RING(chan, curie, 0x1fd8, 1); + OUT_RING (chan, 1); } - FIRE_RING(fence); + FIRE_RING(chan); + if (fence) + *fence = NULL; } static void |