diff options
| author | Michel Dänzer <[email protected]> | 2012-08-16 10:37:44 +0200 |
|---|---|---|
| committer | Michel Dänzer <[email protected]> | 2012-08-16 12:01:16 +0200 |
| commit | 1b11395a36a44a902cfb3e1783758544662df73f (patch) | |
| tree | 403ab4d737404a91d88097dd64b88ce99891f5e7 /src/gallium/drivers/radeonsi/radeonsi_pipe.c | |
| parent | 51d9f37a72b3c7893204efbbeca034d1581d30f1 (diff) | |
radeonsi: Fix symbol conflicts with r600g.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=50389
Signed-off-by: Michel Dänzer <[email protected]>
Reviewed-by: Alex Deucher <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeonsi/radeonsi_pipe.c')
| -rw-r--r-- | src/gallium/drivers/radeonsi/radeonsi_pipe.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gallium/drivers/radeonsi/radeonsi_pipe.c b/src/gallium/drivers/radeonsi/radeonsi_pipe.c index 79a3d801b5e..abcdfbf3032 100644 --- a/src/gallium/drivers/radeonsi/radeonsi_pipe.c +++ b/src/gallium/drivers/radeonsi/radeonsi_pipe.c @@ -117,7 +117,7 @@ static struct r600_fence *r600_create_fence(struct r600_context *rctx) pipe_reference_init(&fence->reference, 1); rscreen->fences.data[fence->index] = 0; - r600_context_emit_fence(rctx, rscreen->fences.bo, fence->index, 1); + si_context_emit_fence(rctx, rscreen->fences.bo, fence->index, 1); /* Create a dummy BO so that fence_finish without a timeout can sleep waiting for completion */ fence->sleep_bo = si_resource_create_custom(&rctx->screen->screen, PIPE_USAGE_STAGING, 1); @@ -149,7 +149,7 @@ void radeonsi_flush(struct pipe_context *ctx, struct pipe_fence_handle **fence, ctx->render_condition(ctx, NULL, 0); } - r600_context_flush(rctx, flags); + si_context_flush(rctx, flags); /* Re-enable render condition. */ if (render_cond) { @@ -206,10 +206,10 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void rctx->family = rscreen->family; rctx->chip_class = rscreen->chip_class; - r600_init_blit_functions(rctx); + si_init_blit_functions(rctx); r600_init_query_functions(rctx); r600_init_context_resource_functions(rctx); - r600_init_surface_functions(rctx); + si_init_surface_functions(rctx); rctx->context.create_video_decoder = vl_create_decoder; rctx->context.create_video_buffer = vl_video_buffer_create; @@ -249,7 +249,7 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void return NULL; } - r600_get_backend_mask(rctx); /* this emits commands and must be last */ + si_get_backend_mask(rctx); /* this emits commands and must be last */ rctx->dummy_pixel_shader = util_make_fragment_cloneinput_shader(&rctx->context, 0, |