diff options
| author | Luca Barbieri <[email protected]> | 2010-02-21 14:31:27 +0100 |
|---|---|---|
| committer | Younes Manton <[email protected]> | 2010-03-15 00:03:03 -0400 |
| commit | 10f464fc1073e8f3b53dbcf2209a2204f4924094 (patch) | |
| tree | 7e970bb03fdce3187fba5059dbc99959eeca3aa7 /src/gallium/drivers/nouveau | |
| parent | 840c36f5e6d940343a3154af7e76fec341ca46e6 (diff) | |
nv30, nv40: non-trivially unify nv[34]0_screen.c
The files have the same structure but are substantially different.
They are unified with appropriate conditionals.
Diffstat (limited to 'src/gallium/drivers/nouveau')
| -rw-r--r-- | src/gallium/drivers/nouveau/nouveau_winsys.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/gallium/drivers/nouveau/nouveau_winsys.h b/src/gallium/drivers/nouveau/nouveau_winsys.h index af9ddd558c8..bed014b9ce0 100644 --- a/src/gallium/drivers/nouveau/nouveau_winsys.h +++ b/src/gallium/drivers/nouveau/nouveau_winsys.h @@ -27,10 +27,7 @@ #define NOUVEAU_BUFFER_USAGE_NO_RENDER (1 << 19) extern struct pipe_screen * -nv30_screen_create(struct pipe_winsys *ws, struct nouveau_device *); - -extern struct pipe_screen * -nv40_screen_create(struct pipe_winsys *ws, struct nouveau_device *); +nvfx_screen_create(struct pipe_winsys *ws, struct nouveau_device *); extern struct pipe_screen * nv50_screen_create(struct pipe_winsys *ws, struct nouveau_device *); |