summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/nouveau
diff options
context:
space:
mode:
authorBen Skeggs <[email protected]>2009-06-05 08:47:42 +1000
committerBen Skeggs <[email protected]>2009-06-05 14:37:03 +1000
commit1b207d9bb81ae3385e5658a81c71fbf2fe15c18f (patch)
tree12ffe51167ca2d0e5ee41ac09230f14a3610f82b /src/gallium/drivers/nouveau
parentd4d584b16e21b24a473d3a31d361432b8fa0b945 (diff)
nouveau: call notifier/grobj etc funcs directly
libdrm_nouveau is linked with the winsys, there's no good reason to do all this through yet another layer.
Diffstat (limited to 'src/gallium/drivers/nouveau')
-rw-r--r--src/gallium/drivers/nouveau/nouveau_screen.h1
-rw-r--r--src/gallium/drivers/nouveau/nouveau_winsys.h27
2 files changed, 1 insertions, 27 deletions
diff --git a/src/gallium/drivers/nouveau/nouveau_screen.h b/src/gallium/drivers/nouveau/nouveau_screen.h
index cffba11762d..9968b078966 100644
--- a/src/gallium/drivers/nouveau/nouveau_screen.h
+++ b/src/gallium/drivers/nouveau/nouveau_screen.h
@@ -4,6 +4,7 @@
struct nouveau_screen {
struct pipe_screen base;
struct nouveau_device *device;
+ struct nouveau_channel *channel;
};
static inline struct nouveau_screen *
diff --git a/src/gallium/drivers/nouveau/nouveau_winsys.h b/src/gallium/drivers/nouveau/nouveau_winsys.h
index 762c3a2a218..79984972404 100644
--- a/src/gallium/drivers/nouveau/nouveau_winsys.h
+++ b/src/gallium/drivers/nouveau/nouveau_winsys.h
@@ -27,33 +27,6 @@ struct nouveau_winsys {
struct pipe_winsys *ws;
struct nouveau_channel *channel;
-
- int (*res_init)(struct nouveau_resource **heap, unsigned start,
- unsigned size);
- int (*res_alloc)(struct nouveau_resource *heap, int size, void *priv,
- struct nouveau_resource **);
- void (*res_free)(struct nouveau_resource **);
-
- int (*grobj_alloc)(struct nouveau_winsys *, int grclass,
- struct nouveau_grobj **);
- void (*grobj_free)(struct nouveau_grobj **);
-
- int (*notifier_alloc)(struct nouveau_winsys *, int count,
- struct nouveau_notifier **);
- void (*notifier_free)(struct nouveau_notifier **);
- void (*notifier_reset)(struct nouveau_notifier *, int id);
- uint32_t (*notifier_status)(struct nouveau_notifier *, int id);
- uint32_t (*notifier_retval)(struct nouveau_notifier *, int id);
- int (*notifier_wait)(struct nouveau_notifier *, int id,
- int status, double timeout);
-
- int (*surface_copy)(struct nouveau_winsys *, struct pipe_surface *,
- unsigned, unsigned, struct pipe_surface *,
- unsigned, unsigned, unsigned, unsigned);
- int (*surface_fill)(struct nouveau_winsys *, struct pipe_surface *,
- unsigned, unsigned, unsigned, unsigned, unsigned);
-
- struct nouveau_bo *(*get_bo)(struct pipe_buffer *);
};
extern struct pipe_screen *