Mesa (gallium-resources): nouveau: don't use the staging usage

[Luca Barbieri]

Module: Mesa
Branch: gallium-resources
Commit: 5f2701fddaef9c18d85c049311c2819c49cc1ae0
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5f2701fddaef9c18d85c049311c2819c49cc1ae0

Author: Luca Barbieri <luca at luca-barbieri.com>
Date:   Sat Apr  3 03:52:38 2010 +0200

nouveau: don't use the staging usage

Maybe it could make sense, but for now dynamic is enough.

None of these avoid uncached reads from GART on AGP cards.

---

 src/gallium/drivers/nouveau/nouveau_screen.c |    4 ----
 src/gallium/drivers/nouveau/nouveau_screen.h |    2 --
 2 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/src/gallium/drivers/nouveau/nouveau_screen.c b/src/gallium/drivers/nouveau/nouveau_screen.c
index b11faa4..a0bbc3e 100644
--- a/src/gallium/drivers/nouveau/nouveau_screen.c
+++ b/src/gallium/drivers/nouveau/nouveau_screen.c
@@ -44,10 +44,6 @@ nouveau_screen_bo_new(struct pipe_screen *pscreen, unsigned alignment,
 	uint32_t flags = NOUVEAU_BO_MAP, tile_mode = 0, tile_flags = 0;
 	int ret;
 
-	/* TODO: this is somewhat wrong */
-	if (usage == PIPE_USAGE_STAGING)
-		flags |= NOUVEAU_BO_GART;
-	else
 	if (bind & PIPE_BIND_VERTEX_BUFFER) {
 		if (pscreen->get_param(pscreen, NOUVEAU_CAP_HW_VTXBUF))
 			flags |= NOUVEAU_BO_GART;
diff --git a/src/gallium/drivers/nouveau/nouveau_screen.h b/src/gallium/drivers/nouveau/nouveau_screen.h
index 37caf51..c0ec6e4 100644
--- a/src/gallium/drivers/nouveau/nouveau_screen.h
+++ b/src/gallium/drivers/nouveau/nouveau_screen.h
@@ -1,8 +1,6 @@
 #ifndef __NOUVEAU_SCREEN_H__
 #define __NOUVEAU_SCREEN_H__
 
-#define PIPE_USAGE_STAGING         5
-
 struct nouveau_screen {
 	struct pipe_screen base;
 	struct nouveau_device *device;