diff options
| author | Marek Olšák <maraeo@gmail.com> | 2012-05-11 16:38:13 +0200 |
|---|---|---|
| committer | Marek Olšák <maraeo@gmail.com> | 2012-05-11 16:38:13 +0200 |
| commit | bb4c5d72d7c7cb1d9e7016e2c07c36875f30011a (patch) | |
| tree | 153444ff535900f82ae63b5af8ccd09fb2f063af /src/gallium/drivers/nouveau/nouveau_buffer.c | |
| parent | 96956dc5076fc03b9290368ca90e3f3b870ee613 (diff) | |
| parent | 8dd3e341b337ca2d22bcc0e7548a78a6c36ca77d (diff) | |
Merge branch 'gallium-userbuf'
Conflicts:
src/gallium/docs/source/screen.rst
src/gallium/drivers/nv50/nv50_state.c
src/gallium/include/pipe/p_defines.h
src/mesa/state_tracker/st_draw.c
Diffstat (limited to 'src/gallium/drivers/nouveau/nouveau_buffer.c')
| -rw-r--r-- | src/gallium/drivers/nouveau/nouveau_buffer.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/gallium/drivers/nouveau/nouveau_buffer.c b/src/gallium/drivers/nouveau/nouveau_buffer.c index f6629901c15..936e2bf246a 100644 --- a/src/gallium/drivers/nouveau/nouveau_buffer.c +++ b/src/gallium/drivers/nouveau/nouveau_buffer.c @@ -398,7 +398,6 @@ nouveau_user_buffer_create(struct pipe_screen *pscreen, void *ptr, buffer->base.width0 = bytes; buffer->base.height0 = 1; buffer->base.depth0 = 1; - buffer->base.user_ptr = ptr; buffer->data = ptr; buffer->status = NOUVEAU_BUFFER_STATUS_USER_MEMORY; |