summaryrefslogtreecommitdiff
path: root/src/gallium
diff options
context:
space:
mode:
authorYounes Manton <younes.m@gmail.com>2008-12-06 15:45:00 -0500
committerYounes Manton <younes.m@gmail.com>2009-01-10 13:52:05 -0500
commit7289c388f442fe532de52058f9167bc331920b1a (patch)
tree6a3a26cd688109725705ebe38abad50e59d59243 /src/gallium
parent0e1301ec8f7bc865b8a81214928e5267393cb8e7 (diff)
nouveau: Use PIPE_BUFFER_USAGE_CPU_* instead of custom.
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/drivers/nouveau/nouveau_winsys.h3
-rw-r--r--src/gallium/drivers/nv40/nv40_miptree.c2
-rw-r--r--src/gallium/winsys/drm/nouveau/nouveau_winsys_pipe.c2
-rw-r--r--src/gallium/winsys/g3dvl/nouveau/nouveau_winsys_pipe.c2
4 files changed, 4 insertions, 5 deletions
diff --git a/src/gallium/drivers/nouveau/nouveau_winsys.h b/src/gallium/drivers/nouveau/nouveau_winsys.h
index 09726fd892..5535ebb6a9 100644
--- a/src/gallium/drivers/nouveau/nouveau_winsys.h
+++ b/src/gallium/drivers/nouveau/nouveau_winsys.h
@@ -20,8 +20,7 @@
#define NOUVEAU_TEXTURE_USAGE_LINEAR (1 << 16)
#define NOUVEAU_BUFFER_USAGE_TEXTURE (1 << 16)
-#define NOUVEAU_BUFFER_USAGE_CPU (1 << 17)
-#define NOUVEAU_BUFFER_USAGE_ZETA (1 << 18)
+#define NOUVEAU_BUFFER_USAGE_ZETA (1 << 17)
struct nouveau_winsys {
struct nouveau_context *nv;
diff --git a/src/gallium/drivers/nv40/nv40_miptree.c b/src/gallium/drivers/nv40/nv40_miptree.c
index 5121434b54..00ce6be985 100644
--- a/src/gallium/drivers/nv40/nv40_miptree.c
+++ b/src/gallium/drivers/nv40/nv40_miptree.c
@@ -93,7 +93,7 @@ nv40_miptree_create(struct pipe_screen *pscreen, const struct pipe_texture *pt)
}
if (pt->tex_usage & PIPE_TEXTURE_USAGE_DYNAMIC)
- buf_usage |= NOUVEAU_BUFFER_USAGE_CPU;
+ buf_usage |= PIPE_BUFFER_USAGE_CPU_READ_WRITE;
nv40_miptree_layout(mt);
diff --git a/src/gallium/winsys/drm/nouveau/nouveau_winsys_pipe.c b/src/gallium/winsys/drm/nouveau/nouveau_winsys_pipe.c
index 086f368319..fe10479db7 100644
--- a/src/gallium/winsys/drm/nouveau/nouveau_winsys_pipe.c
+++ b/src/gallium/winsys/drm/nouveau/nouveau_winsys_pipe.c
@@ -49,7 +49,7 @@ nouveau_pipe_bo_create(struct pipe_winsys *pws, unsigned alignment,
if (usage & PIPE_BUFFER_USAGE_PIXEL) {
if (usage & NOUVEAU_BUFFER_USAGE_TEXTURE)
flags |= NOUVEAU_BO_GART;
- if (!(usage & NOUVEAU_BUFFER_USAGE_CPU))
+ if (!(usage & PIPE_BUFFER_USAGE_CPU_READ_WRITE))
flags |= NOUVEAU_BO_VRAM;
switch (dev->chipset & 0xf0) {
diff --git a/src/gallium/winsys/g3dvl/nouveau/nouveau_winsys_pipe.c b/src/gallium/winsys/g3dvl/nouveau/nouveau_winsys_pipe.c
index 17c677d83e..d841eb4a04 100644
--- a/src/gallium/winsys/g3dvl/nouveau/nouveau_winsys_pipe.c
+++ b/src/gallium/winsys/g3dvl/nouveau/nouveau_winsys_pipe.c
@@ -112,7 +112,7 @@ nouveau_pipe_bo_create(struct pipe_winsys *pws, unsigned alignment,
if (usage & PIPE_BUFFER_USAGE_PIXEL) {
if (usage & NOUVEAU_BUFFER_USAGE_TEXTURE)
flags |= NOUVEAU_BO_GART;
- if (!(usage & NOUVEAU_BUFFER_USAGE_CPU))
+ if (!(usage & PIPE_BUFFER_USAGE_CPU_READ_WRITE))
flags |= NOUVEAU_BO_VRAM;
}