diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2009-02-20 09:47:56 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2009-02-20 09:47:56 +1000 |
| commit | 8cf997b7c8a2c8eb347ce06d0e8bfaf2e9d4bd9d (patch) | |
| tree | 1171057377c0009d15cd1e4494d5c6f927aa79a8 /src/gallium | |
| parent | b85c81760c1278f2d56aba1195fd72b644be674a (diff) | |
nouveau: reenable all the non-nv50 pipe drivers
They still won't build yet, but anyway..
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/winsys/drm/nouveau/common/nouveau_winsys.c | 2 | ||||
| -rw-r--r-- | src/gallium/winsys/drm/nouveau/dri/Makefile | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/gallium/winsys/drm/nouveau/common/nouveau_winsys.c b/src/gallium/winsys/drm/nouveau/common/nouveau_winsys.c index 89824b2254..b6199f8e6d 100644 --- a/src/gallium/winsys/drm/nouveau/common/nouveau_winsys.c +++ b/src/gallium/winsys/drm/nouveau/common/nouveau_winsys.c @@ -77,7 +77,6 @@ nouveau_pipe_create(struct nouveau_context *nv) return NULL; switch (chipset & 0xf0) { -#if 0 case 0x00: hws_create = nv04_screen_create; hw_create = nv04_create; @@ -99,7 +98,6 @@ nouveau_pipe_create(struct nouveau_context *nv) hws_create = nv40_screen_create; hw_create = nv40_create; break; -#endif case 0x50: case 0x80: case 0x90: diff --git a/src/gallium/winsys/drm/nouveau/dri/Makefile b/src/gallium/winsys/drm/nouveau/dri/Makefile index 2e7a3a79f8..a73e8d5cb4 100644 --- a/src/gallium/winsys/drm/nouveau/dri/Makefile +++ b/src/gallium/winsys/drm/nouveau/dri/Makefile @@ -7,12 +7,12 @@ MINIGLX_SOURCES = PIPE_DRIVERS = \ $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \ + $(TOP)/src/gallium/drivers/nv04/libnv04.a \ + $(TOP)/src/gallium/drivers/nv10/libnv10.a \ + $(TOP)/src/gallium/drivers/nv20/libnv20.a \ + $(TOP)/src/gallium/drivers/nv30/libnv30.a \ + $(TOP)/src/gallium/drivers/nv40/libnv40.a \ $(TOP)/src/gallium/drivers/nv50/libnv50.a -# $(TOP)/src/gallium/drivers/nv04/libnv04.a \ -# $(TOP)/src/gallium/drivers/nv10/libnv10.a \ -# $(TOP)/src/gallium/drivers/nv20/libnv20.a \ -# $(TOP)/src/gallium/drivers/nv30/libnv30.a \ -# $(TOP)/src/gallium/drivers/nv40/libnv40.a \ DRIVER_SOURCES = \ nouveau_context_dri.c \ |