[Mesa-dev] [PATCH 11/19] radeonsi: remove unused r600_memory_object::offset
Marek Olšák
maraeo at gmail.com
Fri Jun 22 22:32:02 UTC 2018
From: Marek Olšák <marek.olsak at amd.com>
The real offset is passed through resource_from_memobj.
---
src/gallium/drivers/radeonsi/si_pipe.h | 1 -
src/gallium/drivers/radeonsi/si_texture.c | 1 -
2 files changed, 2 deletions(-)
diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h
index a4da98c6369..deceb44b66c 100644
--- a/src/gallium/drivers/radeonsi/si_pipe.h
+++ b/src/gallium/drivers/radeonsi/si_pipe.h
@@ -383,21 +383,20 @@ union si_mmio_counters {
struct si_mmio_counter cp_dma;
struct si_mmio_counter scratch_ram;
} named;
unsigned array[0];
};
struct r600_memory_object {
struct pipe_memory_object b;
struct pb_buffer *buf;
uint32_t stride;
- uint32_t offset;
};
/* Saved CS data for debugging features. */
struct radeon_saved_cs {
uint32_t *ib;
unsigned num_dw;
struct radeon_bo_list_item *bo_list;
unsigned bo_count;
};
diff --git a/src/gallium/drivers/radeonsi/si_texture.c b/src/gallium/drivers/radeonsi/si_texture.c
index 0cc5ad3f94a..ab58f369817 100644
--- a/src/gallium/drivers/radeonsi/si_texture.c
+++ b/src/gallium/drivers/radeonsi/si_texture.c
@@ -2406,21 +2406,20 @@ si_memobj_from_handle(struct pipe_screen *screen,
buf = sscreen->ws->buffer_from_handle(sscreen->ws, whandle,
&stride, &offset);
if (!buf) {
free(memobj);
return NULL;
}
memobj->b.dedicated = dedicated;
memobj->buf = buf;
memobj->stride = stride;
- memobj->offset = offset;
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;
--
2.17.1
More information about the mesa-dev
mailing list