diff options
| author | Christian König <[email protected]> | 2011-03-04 17:15:43 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-03-04 17:15:43 +0100 |
| commit | 54f11a27a1ec28fcf9734f4454dee870bc0113f8 (patch) | |
| tree | 2dc71d95b1ad5d2ca966bbb6726fba45b4cfbac1 /src/gallium/drivers/nvc0/nvc0_winsys.h | |
| parent | 0eccb1038a620bc76ba45ac00c293b3e88427510 (diff) | |
| parent | 6838c9ce74f16c765474c0d2b4ae1469dd4a64d5 (diff) | |
Merge remote branch 'origin/master' into pipe-video
Diffstat (limited to 'src/gallium/drivers/nvc0/nvc0_winsys.h')
| -rw-r--r-- | src/gallium/drivers/nvc0/nvc0_winsys.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/nvc0/nvc0_winsys.h b/src/gallium/drivers/nvc0/nvc0_winsys.h index 45f71967eff..6519ce8e19f 100644 --- a/src/gallium/drivers/nvc0/nvc0_winsys.h +++ b/src/gallium/drivers/nvc0/nvc0_winsys.h @@ -84,18 +84,18 @@ IMMED_RING(struct nouveau_channel *chan, uint32_t mthd, unsigned data) } static INLINE int -OUT_RESRCh(struct nouveau_channel *chan, struct nvc0_resource *res, +OUT_RESRCh(struct nouveau_channel *chan, struct nv04_resource *res, unsigned delta, unsigned flags) { return OUT_RELOCh(chan, res->bo, res->offset + delta, res->domain | flags); } static INLINE int -OUT_RESRCl(struct nouveau_channel *chan, struct nvc0_resource *res, +OUT_RESRCl(struct nouveau_channel *chan, struct nv04_resource *res, unsigned delta, unsigned flags) { if (flags & NOUVEAU_BO_WR) - res->status |= NVC0_BUFFER_STATUS_GPU_WRITING; + res->status |= NOUVEAU_BUFFER_STATUS_GPU_WRITING; return OUT_RELOCl(chan, res->bo, res->offset + delta, res->domain | flags); } |