From 039a03d8d2073d2f4234c02376e082e7f107d284 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Mon, 7 Nov 2016 08:07:43 -0800 Subject: anv/batch: Move last_ss_pool_bo_offset to the command buffer The original reason for putting it in the batch_bo was to allow primaries to share it across secondaries or something like that. However, the relocation lists in secondary command buffers are are always left alone and copied into the primary command buffer's relocation list. This means that the offset really applies at the command buffer level and putting it in the batch_bo doesn't make sense. This fixes a couple of potential bugs around re-submission of command buffers that are not likely to be hit but are bugs none the less. Signed-off-by: Jason Ekstrand Reviewed-by: Kristian H. Kristensen Cc: "13.0" (cherry picked from commit 595400d57745fba198b42d95f3c4f5d855023c33) --- src/intel/vulkan/anv_private.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/intel/vulkan/anv_private.h') diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h index d5f4896..2d5d673 100644 --- a/src/intel/vulkan/anv_private.h +++ b/src/intel/vulkan/anv_private.h @@ -638,9 +638,6 @@ struct anv_batch_bo { /* Bytes actually consumed in this batch BO */ size_t length; - /* Last seen surface state block pool bo offset */ - uint32_t last_ss_pool_bo_offset; - struct anv_reloc_list relocs; }; @@ -1185,7 +1182,10 @@ struct anv_cmd_buffer { */ struct u_vector bt_blocks; uint32_t bt_next; + struct anv_reloc_list surface_relocs; + /** Last seen surface state block pool center bo offset */ + uint32_t last_ss_pool_center; struct anv_execbuf execbuf2; -- cgit v1.1