diff options
| author | José Fonseca <jfonseca@vmware.com> | 2009-03-03 13:18:15 +0000 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2009-03-03 13:18:15 +0000 |
| commit | c7e46c1857b744a35c086dddb651f38df948a5fa (patch) | |
| tree | 6d984aea871340574cd7286c11a53a7b9b094f81 /src/gallium/winsys/drm/nouveau/common/nouveau_winsys_pipe.c | |
| parent | 97a1fd158c9acfaa3a8deda7eb5bf0b253e85c15 (diff) | |
| parent | dceb09909ea9d6eaef0334897ebed6da45db6faa (diff) | |
Merge commit 'origin/master' into gallium-map-range
Diffstat (limited to 'src/gallium/winsys/drm/nouveau/common/nouveau_winsys_pipe.c')
| -rw-r--r-- | src/gallium/winsys/drm/nouveau/common/nouveau_winsys_pipe.c | 6 |
1 files changed, 6 insertions, 0 deletions
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 e3ee985afc..54c7dd46b1 100644 --- a/src/gallium/winsys/drm/nouveau/common/nouveau_winsys_pipe.c +++ b/src/gallium/winsys/drm/nouveau/common/nouveau_winsys_pipe.c @@ -119,6 +119,12 @@ nouveau_pipe_bo_map(struct pipe_winsys *pws, struct pipe_buffer *buf, struct nouveau_pipe_buffer *nvbuf = nouveau_pipe_buffer(buf); uint32_t map_flags = 0; + if (flags & PIPE_BUFFER_USAGE_DONTBLOCK) { + /* Remove this when this code is modified to support DONTBLOCK + */ + return NULL; + } + if (flags & PIPE_BUFFER_USAGE_CPU_READ) map_flags |= NOUVEAU_BO_RD; if (flags & PIPE_BUFFER_USAGE_CPU_WRITE) |