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/radeonsi/evergreen_state.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/radeonsi/evergreen_state.c')
| -rw-r--r-- | src/gallium/drivers/radeonsi/evergreen_state.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/gallium/drivers/radeonsi/evergreen_state.c b/src/gallium/drivers/radeonsi/evergreen_state.c index 6d345b0679f..b094248fee1 100644 --- a/src/gallium/drivers/radeonsi/evergreen_state.c +++ b/src/gallium/drivers/radeonsi/evergreen_state.c @@ -1807,7 +1807,6 @@ void cayman_init_state_functions(struct r600_context *rctx) rctx->context.set_vertex_sampler_views = evergreen_set_vs_sampler_view; rctx->context.set_viewport_state = evergreen_set_viewport_state; rctx->context.sampler_view_destroy = r600_sampler_view_destroy; - rctx->context.redefine_user_buffer = u_default_redefine_user_buffer; rctx->context.texture_barrier = r600_texture_barrier; rctx->context.create_stream_output_target = r600_create_so_target; rctx->context.stream_output_target_destroy = r600_so_target_destroy; |