diff options
| author | Jason Ekstrand <[email protected]> | 2015-11-03 15:45:04 -0800 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2015-11-03 15:45:04 -0800 |
| commit | b00e3f221b3f6dd0e87697c53331fd033b6e8676 (patch) | |
| tree | a59dfeca8fd404c65da59a663e0abda301e893a2 /src/gallium/drivers/nouveau/nouveau_winsys.h | |
| parent | a1e7b8701a4687f29b013364a852aa773c80f960 (diff) | |
| parent | 5d4b019d2a6d4deb4db11780618515cf1fa8a4fc (diff) | |
Merge remote-tracking branch 'mesa-public/master' into vulkan
Diffstat (limited to 'src/gallium/drivers/nouveau/nouveau_winsys.h')
| -rw-r--r-- | src/gallium/drivers/nouveau/nouveau_winsys.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/gallium/drivers/nouveau/nouveau_winsys.h b/src/gallium/drivers/nouveau/nouveau_winsys.h index a44fd3efcf7..1319c3290cf 100644 --- a/src/gallium/drivers/nouveau/nouveau_winsys.h +++ b/src/gallium/drivers/nouveau/nouveau_winsys.h @@ -65,18 +65,18 @@ PUSH_KICK(struct nouveau_pushbuf *push) static inline uint32_t nouveau_screen_transfer_flags(unsigned pipe) { - uint32_t flags = 0; - - if (!(pipe & PIPE_TRANSFER_UNSYNCHRONIZED)) { - if (pipe & PIPE_TRANSFER_READ) - flags |= NOUVEAU_BO_RD; - if (pipe & PIPE_TRANSFER_WRITE) - flags |= NOUVEAU_BO_WR; - if (pipe & PIPE_TRANSFER_DONTBLOCK) - flags |= NOUVEAU_BO_NOBLOCK; - } - - return flags; + uint32_t flags = 0; + + if (!(pipe & PIPE_TRANSFER_UNSYNCHRONIZED)) { + if (pipe & PIPE_TRANSFER_READ) + flags |= NOUVEAU_BO_RD; + if (pipe & PIPE_TRANSFER_WRITE) + flags |= NOUVEAU_BO_WR; + if (pipe & PIPE_TRANSFER_DONTBLOCK) + flags |= NOUVEAU_BO_NOBLOCK; + } + + return flags; } extern struct pipe_screen * |