diff options
| author | Christian König <[email protected]> | 2011-01-12 00:48:10 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-01-12 00:48:10 +0100 |
| commit | a96fe679e2f57e8e4e26c38660d8b6e5b67d5b4b (patch) | |
| tree | d106cfea4baa1a9071b42d0e9bc922fad7502ed5 /src/gallium/drivers/nvc0/nvc0_screen.h | |
| parent | 7965e2fc16853ae0ed0a9cde77346c25feb19b6e (diff) | |
| parent | cc0f604241ee7b536f4c9867573024b8673b0998 (diff) | |
Merge remote branch 'origin/master' into pipe-video
Conflicts:
src/gallium/drivers/r600/r600_shader.c
Diffstat (limited to 'src/gallium/drivers/nvc0/nvc0_screen.h')
| -rw-r--r-- | src/gallium/drivers/nvc0/nvc0_screen.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/gallium/drivers/nvc0/nvc0_screen.h b/src/gallium/drivers/nvc0/nvc0_screen.h index 5c6482be96b..1fac142e2be 100644 --- a/src/gallium/drivers/nvc0/nvc0_screen.h +++ b/src/gallium/drivers/nvc0/nvc0_screen.h @@ -86,6 +86,13 @@ struct nvc0_mm_allocation { uint32_t offset; }; +static INLINE void +nvc0_fence_sched_release(struct nvc0_fence *nf, struct nvc0_mm_allocation *mm) +{ + mm->next = nf->buffers; + nf->buffers = mm; +} + extern struct nvc0_mman * nvc0_mm_create(struct nouveau_device *, uint32_t domain, uint32_t storage_type); |