diff --git a/src/intel/vulkan/anv_buffer_view.c b/src/intel/vulkan/anv_buffer_view.c
index 6ea021ddbaf..76839a9048e 100644
--- a/src/intel/vulkan/anv_buffer_view.c
+++ b/src/intel/vulkan/anv_buffer_view.c
@@ -95,12 +95,12 @@ anv_DestroyBufferView(VkDevice _device, VkBufferView bufferView,
       return;
 
    if (view->general.state.alloc_size > 0) {
-      anv_state_pool_free(&device->bindless_surface_state_pool,
+      anv_state_pool_free(anv_device_get_bindless_surface_state_pool(device),
                           view->general.state);
    }
 
    if (view->storage.state.alloc_size > 0) {
-      anv_state_pool_free(&device->bindless_surface_state_pool,
+      anv_state_pool_free(anv_device_get_bindless_surface_state_pool(device),
                           view->storage.state);
    }
 
diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c
index 763164aee83..791c4e5cbba 100644
--- a/src/intel/vulkan/anv_device.c
+++ b/src/intel/vulkan/anv_device.c
@@ -157,7 +157,7 @@ decode_get_bo(void *v_batch, bool ppgtt, uint64_t address)
    if (get_bo_from_pool(&ret_bo, &anv_device_get_scratch_surface_state_pool(device)->block_pool, address))
       return ret_bo;
    if (device->physical->indirect_descriptors &&
-       get_bo_from_pool(&ret_bo, &device->bindless_surface_state_pool.block_pool, address))
+       get_bo_from_pool(&ret_bo, &anv_device_get_bindless_surface_state_pool(device)->block_pool, address))
       return ret_bo;
    if (get_bo_from_pool(&ret_bo, &anv_device_get_internal_surface_state_pool(device)->block_pool, address))
       return ret_bo;
@@ -1049,7 +1049,7 @@ VkResult anv_CreateDevice(
        * structures to zero and they have a valid descriptor.
        */
       device->null_surface_state =
-         anv_state_pool_alloc(&device->bindless_surface_state_pool,
+         anv_state_pool_alloc(anv_device_get_bindless_surface_state_pool(device),
                               device->isl_dev.ss.size,
                               device->isl_dev.ss.align);
       isl_null_fill_state(&device->isl_dev, device->null_surface_state.map,
diff --git a/src/intel/vulkan/anv_image_view.c b/src/intel/vulkan/anv_image_view.c
index b284a7f9f89..86927af553f 100644
--- a/src/intel/vulkan/anv_image_view.c
+++ b/src/intel/vulkan/anv_image_view.c
@@ -295,17 +295,17 @@ anv_image_view_finish(struct anv_image_view *iview)
    if (!iview->use_surface_state_stream) {
       for (uint32_t plane = 0; plane < iview->n_planes; plane++) {
          if (iview->planes[plane].optimal_sampler.state.alloc_size) {
-            anv_state_pool_free(&device->bindless_surface_state_pool,
+            anv_state_pool_free(anv_device_get_bindless_surface_state_pool(device),
                   iview->planes[plane].optimal_sampler.state);
          }
 
          if (iview->planes[plane].general_sampler.state.alloc_size) {
-            anv_state_pool_free(&device->bindless_surface_state_pool,
+            anv_state_pool_free(anv_device_get_bindless_surface_state_pool(device),
                   iview->planes[plane].general_sampler.state);
          }
 
          if (iview->planes[plane].storage.state.alloc_size) {
-            anv_state_pool_free(&device->bindless_surface_state_pool,
+            anv_state_pool_free(anv_device_get_bindless_surface_state_pool(device),
                   iview->planes[plane].storage.state);
          }
       }
diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h
index a8cc0f89918..a4fd55ed732 100644
--- a/src/intel/vulkan/anv_private.h
+++ b/src/intel/vulkan/anv_private.h
@@ -2904,7 +2904,7 @@ anv_device_maybe_alloc_surface_state(struct anv_device *device,
    if (device->physical->indirect_descriptors) {
       if (surface_state_stream)
          return anv_state_stream_alloc(surface_state_stream, 64, 64);
-      return anv_state_pool_alloc(&device->bindless_surface_state_pool, 64, 64);
+      return anv_state_pool_alloc(anv_device_get_bindless_surface_state_pool(device), 64, 64);
    } else {
       return ANV_STATE_NULL;
    }
diff --git a/src/intel/vulkan/i915/anv_batch_chain.c b/src/intel/vulkan/i915/anv_batch_chain.c
index 5fb69c473d5..cc6e5c89f8c 100644
--- a/src/intel/vulkan/i915/anv_batch_chain.c
+++ b/src/intel/vulkan/i915/anv_batch_chain.c
@@ -412,7 +412,7 @@ setup_execbuf_for_cmd_buffers(struct anv_execbuf *execbuf,
       return result;
 
    if (device->physical->va.bindless_surface_state_pool.size > 0) {
-      result = pin_state_pool(device, execbuf, &device->bindless_surface_state_pool);
+      result = pin_state_pool(device, execbuf, anv_device_get_bindless_surface_state_pool(device));
       if (result != VK_SUCCESS)
          return result;
    }