anv: Declare the bo in the anv_block_pool_foreach_bo loop

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>

diff --git a/src/intel/vulkan/anv_allocator.c b/src/intel/vulkan/anv_allocator.c
index 75f47744497bb91cb80758223e31fb63793582cd..aedc5543a6bd2cd5dbeeb053b0b7cab046154515 100644 (file)
--- a/src/intel/vulkan/anv_allocator.c
+++ b/src/intel/vulkan/anv_allocator.c
@@ -639,7 +639,7 @@ anv_block_pool_expand_range(struct anv_block_pool *pool,
 static struct anv_bo *
 anv_block_pool_get_bo(struct anv_block_pool *pool, int32_t *offset)
 {
-   struct anv_bo *bo, *bo_found = NULL;
+   struct anv_bo *bo_found = NULL;
    int32_t cur_offset = 0;
 
    assert(offset);

diff --git a/src/intel/vulkan/anv_batch_chain.c b/src/intel/vulkan/anv_batch_chain.c
index 795dc839d84db559cb8c7536acc30039568398d9..5ff58e87b66125486ec2b896cacbfd4e744d2c1e 100644 (file)
--- a/src/intel/vulkan/anv_batch_chain.c
+++ b/src/intel/vulkan/anv_batch_chain.c
@@ -1394,7 +1394,6 @@ setup_execbuf_for_cmd_buffer(struct anv_execbuf *execbuf,
    adjust_relocations_from_state_pool(ss_pool, &cmd_buffer->surface_relocs,
                                       cmd_buffer->last_ss_pool_center);
    VkResult result;
-   struct anv_bo *bo;
    if (cmd_buffer->device->instance->physicalDevice.use_softpin) {
       anv_block_pool_foreach_bo(bo, &ss_pool->block_pool) {
          result = anv_execbuf_add_bo(execbuf, bo, NULL, 0,

diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h
index f3f718a4855fa035b54e4705fda675044876a44a..328b3a85d099f34ba807e34f9d79f3e1fe447e1e 100644 (file)
--- a/src/intel/vulkan/anv_private.h
+++ b/src/intel/vulkan/anv_private.h
@@ -670,7 +670,7 @@ struct anv_block_state {
 };
 
 #define anv_block_pool_foreach_bo(bo, pool)  \
-   for (bo = (pool)->bos; bo != &(pool)->bos[(pool)->nbos]; bo++)
+   for (struct anv_bo *bo = (pool)->bos; bo != &(pool)->bos[(pool)->nbos]; bo++)
 
 #define ANV_MAX_BLOCK_POOL_BOS 20