diff options
| author | Marek Olšák <[email protected]> | 2018-06-21 22:07:24 -0400 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2018-06-25 18:33:58 -0400 |
| commit | 218e133695301acdfddc48d7c1d0120e8a8c1dbd (patch) | |
| tree | 1792f2b814e25e37f0d149fe2c7060691fdc84f9 /src | |
| parent | e5df04f13d246df867e1e7f7754be7621eacda85 (diff) | |
radeonsi: rename r600_memory_object -> si_memory_object
Reviewed-by: Timothy Arceri <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_pipe.h | 2 | ||||
| -rw-r--r-- | 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 @@ -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 7b745f7477a..cba758aec2e 100644 --- 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, |