diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-03-30 20:32:22 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-03-30 20:40:27 +1000 |
| commit | bbefb541ad94382debb0f7a8daa636729799a31a (patch) | |
| tree | 3f24aa5ffef5111705c05b395134a433d276658b /src/gallium/drivers/nv50/nv50_context.c | |
| parent | 03c60e0fb691d39a168a8825ace7150ef3a20e02 (diff) | |
| download | external_mesa3d-bbefb541ad94382debb0f7a8daa636729799a31a.zip external_mesa3d-bbefb541ad94382debb0f7a8daa636729799a31a.tar.gz external_mesa3d-bbefb541ad94382debb0f7a8daa636729799a31a.tar.bz2 | |
nouveau: adapt to recent gallium changes
Diffstat (limited to 'src/gallium/drivers/nv50/nv50_context.c')
| -rw-r--r-- | src/gallium/drivers/nv50/nv50_context.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/src/gallium/drivers/nv50/nv50_context.c b/src/gallium/drivers/nv50/nv50_context.c index 980d066..e822d86 100644 --- a/src/gallium/drivers/nv50/nv50_context.c +++ b/src/gallium/drivers/nv50/nv50_context.c @@ -7,24 +7,12 @@ #include "nv50_screen.h" static void -nv50_flush(struct pipe_context *pipe, unsigned flags) +nv50_flush(struct pipe_context *pipe, unsigned flags, + struct pipe_fence_handle **fence) { struct nv50_context *nv50 = (struct nv50_context *)pipe; - struct nv50_screen *screen = nv50->screen; - struct nouveau_winsys *nvws = screen->nvws; - if (flags & PIPE_FLUSH_WAIT) { - nvws->notifier_reset(screen->sync, 0); - BEGIN_RING(tesla, 0x104, 1); - OUT_RING (0); - BEGIN_RING(tesla, 0x100, 1); - OUT_RING (0); - } - - FIRE_RING(); - - if (flags & PIPE_FLUSH_WAIT) - nvws->notifier_wait(screen->sync, 0, 0, 2000); + FIRE_RING(fence); } static void |