diff options
| author | Christoph Bumiller <e0425955@student.tuwien.ac.at> | 2012-05-16 21:08:37 +0200 |
|---|---|---|
| committer | Christoph Bumiller <e0425955@student.tuwien.ac.at> | 2012-05-17 15:24:58 +0200 |
| commit | e6caafd9d7fbfcb5906d22be9d6a3c1714e078ac (patch) | |
| tree | 3e933ed79288c21fa45d3ce697ea5ca8196ee9f5 /src/gallium/drivers/nouveau/nouveau_buffer.h | |
| parent | ef7bb281292c17b762b57779306e874704c87328 (diff) | |
| download | external_mesa3d-e6caafd9d7fbfcb5906d22be9d6a3c1714e078ac.zip external_mesa3d-e6caafd9d7fbfcb5906d22be9d6a3c1714e078ac.tar.gz external_mesa3d-e6caafd9d7fbfcb5906d22be9d6a3c1714e078ac.tar.bz2 | |
nv50,nvc0: handle user vertex buffers
And restructure VBO validation a little in the process.
Diffstat (limited to 'src/gallium/drivers/nouveau/nouveau_buffer.h')
| -rw-r--r-- | src/gallium/drivers/nouveau/nouveau_buffer.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/gallium/drivers/nouveau/nouveau_buffer.h b/src/gallium/drivers/nouveau/nouveau_buffer.h index 19255a3..3b8ee72 100644 --- a/src/gallium/drivers/nouveau/nouveau_buffer.h +++ b/src/gallium/drivers/nouveau/nouveau_buffer.h @@ -89,11 +89,12 @@ boolean nouveau_user_buffer_upload(struct nouveau_context *, struct nv04_resource *, unsigned base, unsigned size); -/* Copy data to a scratch buffer, update buffer address. - * Returns the bo the data resides in, or NULL on failure. +/* Copy data to a scratch buffer and return address & bo the data resides in. + * Returns 0 on failure. */ -struct nouveau_bo * +uint64_t nouveau_scratch_data(struct nouveau_context *, - struct nv04_resource *, unsigned base, unsigned size); + const void *data, unsigned base, unsigned size, + struct nouveau_bo **); #endif |