From 63a3a3762c8e1a67666d36b35fdb0ada8e4b7d08 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Fri, 20 Feb 2009 09:32:47 +1000 Subject: nv50: rework for texture_transfer changes --- src/gallium/winsys/drm/nouveau/common/nouveau_winsys.c | 2 ++ src/gallium/winsys/drm/nouveau/common/nouveau_winsys_pipe.c | 3 +++ src/gallium/winsys/drm/nouveau/dri/Makefile | 12 ++++++------ 3 files changed, 11 insertions(+), 6 deletions(-) (limited to 'src/gallium/winsys/drm') diff --git a/src/gallium/winsys/drm/nouveau/common/nouveau_winsys.c b/src/gallium/winsys/drm/nouveau/common/nouveau_winsys.c index b6199f8e6d..89824b2254 100644 --- a/src/gallium/winsys/drm/nouveau/common/nouveau_winsys.c +++ b/src/gallium/winsys/drm/nouveau/common/nouveau_winsys.c @@ -77,6 +77,7 @@ 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; @@ -98,6 +99,7 @@ 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/common/nouveau_winsys_pipe.c b/src/gallium/winsys/drm/nouveau/common/nouveau_winsys_pipe.c index 881df98556..e3ee985afc 100644 --- a/src/gallium/winsys/drm/nouveau/common/nouveau_winsys_pipe.c +++ b/src/gallium/winsys/drm/nouveau/common/nouveau_winsys_pipe.c @@ -19,6 +19,9 @@ nouveau_flags_from_usage(struct nouveau_context *nv, unsigned usage) struct nouveau_device *dev = nv->nv_screen->device; uint32_t flags = NOUVEAU_BO_LOCAL; + if (usage & NOUVEAU_BUFFER_USAGE_TRANSFER) + flags |= NOUVEAU_BO_GART; + if (usage & PIPE_BUFFER_USAGE_PIXEL) { if (usage & NOUVEAU_BUFFER_USAGE_TEXTURE) flags |= NOUVEAU_BO_GART; diff --git a/src/gallium/winsys/drm/nouveau/dri/Makefile b/src/gallium/winsys/drm/nouveau/dri/Makefile index 3f3553b61d..2e7a3a79f8 100644 --- a/src/gallium/winsys/drm/nouveau/dri/Makefile +++ b/src/gallium/winsys/drm/nouveau/dri/Makefile @@ -7,13 +7,13 @@ 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 \ nouveau_screen_dri.c \ -- cgit v1.2.3