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/r600_buffer.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/r600_buffer.c')
| -rw-r--r-- | src/gallium/drivers/radeonsi/r600_buffer.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/drivers/radeonsi/r600_buffer.c b/src/gallium/drivers/radeonsi/r600_buffer.c index 76de9410e40..ec9d87e4866 100644 --- a/src/gallium/drivers/radeonsi/r600_buffer.c +++ b/src/gallium/drivers/radeonsi/r600_buffer.c @@ -114,7 +114,7 @@ static const struct u_resource_vtbl r600_buffer_vtbl = NULL /* transfer_inline_write */ }; -bool r600_init_resource(struct r600_screen *rscreen, +bool si_init_resource(struct r600_screen *rscreen, struct si_resource *res, unsigned size, unsigned alignment, unsigned bind, unsigned usage) @@ -156,8 +156,8 @@ bool r600_init_resource(struct r600_screen *rscreen, return true; } -struct pipe_resource *r600_buffer_create(struct pipe_screen *screen, - const struct pipe_resource *templ) +struct pipe_resource *si_buffer_create(struct pipe_screen *screen, + const struct pipe_resource *templ) { struct r600_screen *rscreen = (struct r600_screen*)screen; struct si_resource *rbuffer; @@ -171,7 +171,7 @@ struct pipe_resource *r600_buffer_create(struct pipe_screen *screen, rbuffer->b.b.screen = screen; rbuffer->b.vtbl = &r600_buffer_vtbl; - if (!r600_init_resource(rscreen, rbuffer, templ->width0, alignment, templ->bind, templ->usage)) { + if (!si_init_resource(rscreen, rbuffer, templ->width0, alignment, templ->bind, templ->usage)) { FREE(rbuffer); return NULL; } |