summaryrefslogtreecommitdiffstats
path: root/src/gallium/winsys/drm
diff options
context:
space:
mode:
authorBen Skeggs <[email protected]>2009-06-04 15:26:07 +1000
committerBen Skeggs <[email protected]>2009-06-05 14:37:00 +1000
commit04cef8a03799aa88ebfa1c391e29f8d2ea020d95 (patch)
tree11d91b5787563aa5cf87706924329dd0a0c85fa0 /src/gallium/winsys/drm
parent4795dd5950d4dcd7c8d421c8fb4851c193297ba1 (diff)
nouveau: call nouveau_pushbuf directly rather than going through nvws
Diffstat (limited to 'src/gallium/winsys/drm')
-rw-r--r--src/gallium/winsys/drm/nouveau/drm/nouveau_winsys.c24
1 files changed, 0 insertions, 24 deletions
diff --git a/src/gallium/winsys/drm/nouveau/drm/nouveau_winsys.c b/src/gallium/winsys/drm/nouveau/drm/nouveau_winsys.c
index e3175fd7753..2e0148543d0 100644
--- a/src/gallium/winsys/drm/nouveau/drm/nouveau_winsys.c
+++ b/src/gallium/winsys/drm/nouveau/drm/nouveau_winsys.c
@@ -30,27 +30,6 @@ nouveau_pipe_grobj_alloc(struct nouveau_winsys *nvws, int grclass,
return 0;
}
-static int
-nouveau_pipe_push_reloc(struct nouveau_winsys *nvws, void *ptr,
- struct pipe_buffer *buf, uint32_t data,
- uint32_t flags, uint32_t vor, uint32_t tor)
-{
- struct nouveau_bo *bo = nouveau_pipe_buffer(buf)->bo;
-
- return nouveau_pushbuf_emit_reloc(nvws->channel, ptr, bo,
- data, flags, vor, tor);
-}
-
-static int
-nouveau_pipe_push_flush(struct nouveau_winsys *nvws, unsigned size,
- struct pipe_fence_handle **fence)
-{
- if (fence)
- *fence = NULL;
-
- return nouveau_pushbuf_flush(nvws->channel, size);
-}
-
static struct nouveau_bo *
nouveau_pipe_get_bo(struct pipe_buffer *pb)
{
@@ -74,9 +53,6 @@ nouveau_winsys_new(struct pipe_winsys *ws)
nvws->res_alloc = nouveau_resource_alloc;
nvws->res_free = nouveau_resource_free;
- nvws->push_reloc = nouveau_pipe_push_reloc;
- nvws->push_flush = nouveau_pipe_push_flush;
-
nvws->grobj_alloc = nouveau_pipe_grobj_alloc;
nvws->grobj_free = nouveau_grobj_free;