[Mesa-dev] [PATCH 12/19] radeonsi: rename r600_memory_object -> si_memory_object

[Marek Olšák]

From: Marek Olšák <marek.olsak at amd.com>

---
 src/gallium/drivers/radeonsi/si_pipe.h    | 2 +-
 src/gallium/drivers/radeonsi/si_texture.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h
index deceb44b66c..629310a685d 100644
--- a/src/gallium/drivers/radeonsi/si_pipe.h
+++ b/src/gallium/drivers/radeonsi/si_pipe.h
@@ -379,21 +379,21 @@ union si_mmio_counters {
 		struct si_mmio_counter pfp;
 		struct si_mmio_counter meq;
 		struct si_mmio_counter me;
 		struct si_mmio_counter surf_sync;
 		struct si_mmio_counter cp_dma;
 		struct si_mmio_counter scratch_ram;
 	} named;
 	unsigned array[0];
 };
 
-struct r600_memory_object {
+struct si_memory_object {
 	struct pipe_memory_object	b;
 	struct pb_buffer		*buf;
 	uint32_t			stride;
 };
 
 /* Saved CS data for debugging features. */
 struct radeon_saved_cs {
 	uint32_t			*ib;
 	unsigned			num_dw;
 
diff --git a/src/gallium/drivers/radeonsi/si_texture.c b/src/gallium/drivers/radeonsi/si_texture.c
index ab58f369817..e0e91b27b2a 100644
--- a/src/gallium/drivers/radeonsi/si_texture.c
+++ b/src/gallium/drivers/radeonsi/si_texture.c
@@ -2389,21 +2389,21 @@ void vi_separate_dcc_process_and_reset_stats(struct pipe_context *ctx,
 		 */
 	}
 }
 
 static struct pipe_memory_object *
 si_memobj_from_handle(struct pipe_screen *screen,
 		      struct winsys_handle *whandle,
 		      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;
 
 	if (!memobj)
 		return NULL;
 
 	buf = sscreen->ws->buffer_from_handle(sscreen->ws, whandle,
 					      &stride, &offset);
 	if (!buf) {
 		free(memobj);
@@ -2415,34 +2415,34 @@ si_memobj_from_handle(struct pipe_screen *screen,
 	memobj->stride = stride;
 
 	return (struct pipe_memory_object *)memobj;
 
 }
 
 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);
 }
 
 static struct pipe_resource *
 si_texture_from_memobj(struct pipe_screen *screen,
 		       const struct pipe_resource *templ,
 		       struct pipe_memory_object *_memobj,
 		       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,
 					      PIPE_HANDLE_USAGE_READ_WRITE,
 					      memobj->b.dedicated);
 	if (!tex)
 		return NULL;
 
 	/* si_texture_from_winsys_buffer doesn't increment refcount of
 	 * memobj->buf, so increment it here.
-- 
2.17.1