r300g: implement TRUNC correctly

[mesa.git] / src / gallium / drivers / radeonsi / r600_resource.c

diff --git a/src/gallium/drivers/radeonsi/r600_resource.c b/src/gallium/drivers/radeonsi/r600_resource.c
index 7bdf6d6bd5f5887713c54d35c656703ac94e4eb1..a4888a703b4cce60f2c97c8264ffabe092e477f8 100644 (file)
--- a/src/gallium/drivers/radeonsi/r600_resource.c
+++ b/src/gallium/drivers/radeonsi/r600_resource.c
@@ -27,9 +27,9 @@ static struct pipe_resource *r600_resource_create(struct pipe_screen *screen,
                                                const struct pipe_resource *templ)
 {
        if (templ->target == PIPE_BUFFER) {
-               return r600_buffer_create(screen, templ);
+               return si_buffer_create(screen, templ);
        } else {
-               return r600_texture_create(screen, templ);
+               return si_texture_create(screen, templ);
        }
 }
 
@@ -40,7 +40,7 @@ static struct pipe_resource *r600_resource_from_handle(struct pipe_screen * scre
        if (templ->target == PIPE_BUFFER) {
                return NULL;
        } else {
-               return r600_texture_from_handle(screen, templ, whandle);
+               return si_texture_from_handle(screen, templ, whandle);
        }
 }
 
@@ -50,7 +50,6 @@ void r600_init_screen_resource_functions(struct pipe_screen *screen)
        screen->resource_from_handle = r600_resource_from_handle;
        screen->resource_get_handle = u_resource_get_handle_vtbl;
        screen->resource_destroy = u_resource_destroy_vtbl;
-       screen->user_buffer_create = r600_user_buffer_create;
 }
 
 void r600_init_context_resource_functions(struct r600_context *r600)
@@ -60,5 +59,5 @@ void r600_init_context_resource_functions(struct r600_context *r600)
        r600->context.transfer_flush_region = u_transfer_flush_region_vtbl;
        r600->context.transfer_unmap = u_transfer_unmap_vtbl;
        r600->context.transfer_destroy = u_transfer_destroy_vtbl;
-       r600->context.transfer_inline_write = u_transfer_inline_write_vtbl;
+       r600->context.transfer_inline_write = u_default_transfer_inline_write;
 }