diff options
| author | Marek Olšák <[email protected]> | 2012-05-11 16:38:13 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2012-05-11 16:38:13 +0200 |
| commit | bb4c5d72d7c7cb1d9e7016e2c07c36875f30011a (patch) | |
| tree | 153444ff535900f82ae63b5af8ccd09fb2f063af /src/gallium/drivers/softpipe/sp_texture.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/softpipe/sp_texture.c')
| -rw-r--r-- | src/gallium/drivers/softpipe/sp_texture.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gallium/drivers/softpipe/sp_texture.c b/src/gallium/drivers/softpipe/sp_texture.c index f5c6f565f21..ee8d4230dd9 100644 --- a/src/gallium/drivers/softpipe/sp_texture.c +++ b/src/gallium/drivers/softpipe/sp_texture.c @@ -454,7 +454,7 @@ softpipe_transfer_unmap(struct pipe_context *pipe, /** * Create buffer which wraps user-space data. */ -static struct pipe_resource * +struct pipe_resource * softpipe_user_buffer_create(struct pipe_screen *screen, void *ptr, unsigned bytes, @@ -476,7 +476,6 @@ softpipe_user_buffer_create(struct pipe_screen *screen, spr->base.height0 = 1; spr->base.depth0 = 1; spr->base.array_size = 1; - spr->base.user_ptr = ptr; spr->userBuffer = TRUE; spr->data = ptr; |