diff options
author | Christoph Bumiller <e0425955@student.tuwien.ac.at> | 2011-01-04 18:20:05 +0100 |
---|---|---|
committer | Christoph Bumiller <e0425955@student.tuwien.ac.at> | 2011-01-04 18:20:05 +0100 |
commit | cd1cf788280a1eb10d54e1a2b8b069ed7b89c724 (patch) | |
tree | 97a2241e1e51cab4b6bf004fc9c0c3f65468d6d2 /src/gallium/drivers/nouveau/nouveau_winsys.h | |
parent | c94996f0570c729b9cb2b55329ababb9877fbbea (diff) | |
parent | 4884ca5f67a0138659e48700e8b2f8821400c995 (diff) |
Merge remote branch 'origin/nvc0'
Diffstat (limited to 'src/gallium/drivers/nouveau/nouveau_winsys.h')
-rw-r--r-- | src/gallium/drivers/nouveau/nouveau_winsys.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gallium/drivers/nouveau/nouveau_winsys.h b/src/gallium/drivers/nouveau/nouveau_winsys.h index 747b084bc4..8dfb84a596 100644 --- a/src/gallium/drivers/nouveau/nouveau_winsys.h +++ b/src/gallium/drivers/nouveau/nouveau_winsys.h @@ -10,7 +10,9 @@ #include "nouveau/nouveau_grobj.h" #include "nouveau/nouveau_notifier.h" #include "nouveau/nouveau_resource.h" +#ifndef NOUVEAU_NVC0 #include "nouveau/nv04_pushbuf.h" +#endif #ifndef NV04_PFIFO_MAX_PACKET_LEN #define NV04_PFIFO_MAX_PACKET_LEN 2047 @@ -41,4 +43,7 @@ nvfx_screen_create(struct pipe_winsys *ws, struct nouveau_device *); extern struct pipe_screen * nv50_screen_create(struct pipe_winsys *ws, struct nouveau_device *); +extern struct pipe_screen * +nvc0_screen_create(struct pipe_winsys *ws, struct nouveau_device *); + #endif |