diff options
| -rw-r--r-- | src/gallium/drivers/r600/r600.h | 15 | ||||
| -rw-r--r-- | src/gallium/winsys/r600/drm/r600_hw_context.c | 2 |
2 files changed, 3 insertions, 14 deletions
diff --git a/src/gallium/drivers/r600/r600.h b/src/gallium/drivers/r600/r600.h index 3ac60bce611..0562b6da31e 100644 --- a/src/gallium/drivers/r600/r600.h +++ b/src/gallium/drivers/r600/r600.h @@ -191,18 +191,6 @@ struct r600_range { }; /* - * relocation - */ -#pragma pack(1) -struct r600_reloc { - uint32_t handle; - uint32_t read_domain; - uint32_t write_domain; - uint32_t flags; -}; -#pragma pack() - -/* * query */ struct r600_query { @@ -240,6 +228,7 @@ struct r600_query { struct r600_context { struct radeon *radeon; struct radeon_winsys_cs *cs; + struct r600_range *range; unsigned nblocks; struct r600_block **blocks; @@ -253,7 +242,7 @@ struct r600_context { unsigned init_dwords; unsigned creloc; - struct r600_reloc *reloc; + unsigned *reloc; struct radeon_bo **bo; u32 *pm4; diff --git a/src/gallium/winsys/r600/drm/r600_hw_context.c b/src/gallium/winsys/r600/drm/r600_hw_context.c index 5dd079f62ac..1950e583121 100644 --- a/src/gallium/winsys/r600/drm/r600_hw_context.c +++ b/src/gallium/winsys/r600/drm/r600_hw_context.c @@ -1521,7 +1521,7 @@ void r600_context_flush(struct r600_context *ctx) chunks[0].length_dw = ctx->pm4_cdwords; chunks[0].chunk_data = (uint64_t)(uintptr_t)ctx->pm4; chunks[1].chunk_id = RADEON_CHUNK_ID_RELOCS; - chunks[1].length_dw = ctx->creloc * sizeof(struct r600_reloc) / 4; + chunks[1].length_dw = ctx->creloc * 4; chunks[1].chunk_data = (uint64_t)(uintptr_t)ctx->reloc; chunk_array[0] = (uint64_t)(uintptr_t)&chunks[0]; chunk_array[1] = (uint64_t)(uintptr_t)&chunks[1]; |