summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/nv50/nv50_context.c
diff options
context:
space:
mode:
authorBen Skeggs <[email protected]>2011-03-01 10:17:28 +1000
committerBen Skeggs <[email protected]>2011-03-01 14:44:42 +1000
commit7a8ee058a83f1eda2c783d83fc5967fd9ef75660 (patch)
tree4011f22f85eec2d000827438bf3dd2bd7fb6f6ff /src/gallium/drivers/nv50/nv50_context.c
parent5a0915870c7e994d20334042b7647db749e79224 (diff)
nv50: move onto shared fence code
Signed-off-by: Ben Skeggs <[email protected]>
Diffstat (limited to 'src/gallium/drivers/nv50/nv50_context.c')
-rw-r--r--src/gallium/drivers/nv50/nv50_context.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/gallium/drivers/nv50/nv50_context.c b/src/gallium/drivers/nv50/nv50_context.c
index 8eb59e20d8d..4380945a1ee 100644
--- a/src/gallium/drivers/nv50/nv50_context.c
+++ b/src/gallium/drivers/nv50/nv50_context.c
@@ -44,8 +44,8 @@ nv50_flush(struct pipe_context *pipe, unsigned flags,
}
if (fence)
- nv50_fence_reference((struct nv50_fence **)fence,
- nv50->screen->fence.current);
+ nouveau_fence_ref(nv50->screen->base.fence.current,
+ (struct nouveau_fence **)fence);
if (flags & (PIPE_FLUSH_SWAPBUFFERS | PIPE_FLUSH_FRAME))
FIRE_RING(chan);
@@ -59,9 +59,8 @@ nv50_default_flush_notify(struct nouveau_channel *chan)
if (!nv50)
return;
- nv50_screen_fence_update(nv50->screen, TRUE);
-
- nv50_screen_fence_next(nv50->screen);
+ nouveau_fence_update(&nv50->screen->base, TRUE);
+ nouveau_fence_next(&nv50->screen->base);
}
static void