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/winsys | |
| 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/winsys')
| -rw-r--r-- | src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c b/src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c index 21517b4bb54..716d4bacd3b 100644 --- a/src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c +++ b/src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c @@ -86,11 +86,9 @@ nouveau_drm_create_screen(struct drm_api *api, int fd, switch (dev->chipset & 0xf0) { case 0x30: - init = nv30_screen_create; - break; case 0x40: case 0x60: - init = nv40_screen_create; + init = nvfx_screen_create; break; case 0x50: case 0x80: |