radeonsi: rename r600_memory_object -> si_memory_object

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>

diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h
index deceb44b66cf7d2ff7caaa8abf54d39b32784e47..629310a685df66985b1892daf973030e555db959 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_pipe.h
+++ b/src/gallium/drivers/radeonsi/si_pipe.h
@@ -386,7 +386,7 @@ union si_mmio_counters {
        unsigned array[0];
 };
 
-struct r600_memory_object {
+struct si_memory_object {
        struct pipe_memory_object       b;
        struct pb_buffer                *buf;
        uint32_t                        stride;

diff --git a/src/gallium/drivers/radeonsi/si_texture.c b/src/gallium/drivers/radeonsi/si_texture.c
index 7b745f7477afcf26d5c24e2dda20130313e72bd0..cba758aec2ee967be8bb622950e81f54ca71324b 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_texture.c
+++ b/src/gallium/drivers/radeonsi/si_texture.c
@@ -2392,7 +2392,7 @@ si_memobj_from_handle(struct pipe_screen *screen,
                      bool dedicated)
 {
        struct si_screen *sscreen = (struct si_screen*)screen;
-       struct r600_memory_object *memobj = CALLOC_STRUCT(r600_memory_object);
+       struct si_memory_object *memobj = CALLOC_STRUCT(si_memory_object);
        struct pb_buffer *buf = NULL;
        uint32_t stride, offset;
 
@@ -2418,7 +2418,7 @@ static void
 si_memobj_destroy(struct pipe_screen *screen,
                  struct pipe_memory_object *_memobj)
 {
-       struct r600_memory_object *memobj = (struct r600_memory_object *)_memobj;
+       struct si_memory_object *memobj = (struct si_memory_object *)_memobj;
 
        pb_reference(&memobj->buf, NULL);
        free(memobj);
@@ -2431,7 +2431,7 @@ si_texture_from_memobj(struct pipe_screen *screen,
                       uint64_t offset)
 {
        struct si_screen *sscreen = (struct si_screen*)screen;
-       struct r600_memory_object *memobj = (struct r600_memory_object *)_memobj;
+       struct si_memory_object *memobj = (struct si_memory_object *)_memobj;
        struct pipe_resource *tex =
                si_texture_from_winsys_buffer(sscreen, templ, memobj->buf,
                                              memobj->stride, offset,