Module: Mesa
Branch: gallium-resources
Commit: 30dc8afcd243d6a160571bac5f06d773e54a4196
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=30dc8afcd243d6a160571bac5f06d773e54a4196
Author: Roland Scheidegger <srol...@vmware.com>
Date: Tue Mar 30 16:56:28 2010 +0200
fix some merge issues
---
src/gallium/drivers/nouveau/nouveau_screen.c | 23 +----------------------
1 files changed, 1 insertions(+), 22 deletions(-)
diff --git a/src/gallium/drivers/nouveau/nouveau_screen.c
b/src/gallium/drivers/nouveau/nouveau_screen.c
index 070c805..746ddca 100644
--- a/src/gallium/drivers/nouveau/nouveau_screen.c
+++ b/src/gallium/drivers/nouveau/nouveau_screen.c
@@ -92,30 +92,9 @@ nouveau_screen_bo_user(struct pipe_screen *pscreen, void
*ptr, unsigned bytes)
return bo;
}
-static inline uint32_t
-nouveau_screen_map_flags(unsigned usage)
-{
- uint32_t flags = 0;
-
- if (usage & PIPE_TRANSFER_READ)
- flags |= NOUVEAU_BO_RD;
- if (usage & PIPE_TRANSFER_WRITE)
- flags |= NOUVEAU_BO_WR;
- if (usage & PIPE_TRANSFER_DISCARD)
- flags |= NOUVEAU_BO_INVAL;
- if (usage & PIPE_TRANSFER_DONTBLOCK)
- flags |= NOUVEAU_BO_NOWAIT;
- else
- if (usage & PIPE_TRANSFER_UNSYNCHRONIZED)
- flags |= NOUVEAU_BO_NOSYNC;
-
- return flags;
-}
-
-
void *
nouveau_screen_bo_map(struct pipe_screen *pscreen,
- struct nouveau_bo *pb,
+ struct nouveau_bo *bo,
unsigned map_flags)
{
int ret;
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
