From a67d7c9dee1a74c8aa861b0b848c455686d9a09b Mon Sep 17 00:00:00 2001
From: Jason Ekstrand <jason@jlekstrand.net>
Date: Thu, 6 Aug 2020 22:59:35 -0500
Subject: [PATCH] anv: Allow _anv_combine_address with a NULL batch

This is required in order to be able to use GenXML pack functions for
structs with addresses when you're not packing into a batch.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8637>
---
 src/intel/vulkan/anv_private.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h
index ca9a0871abc..4b06da2fa25 100644
--- a/src/intel/vulkan/anv_private.h
+++ b/src/intel/vulkan/anv_private.h
@@ -1686,6 +1686,9 @@ _anv_combine_address(struct anv_batch *batch, void *location,
 {
    if (address.bo == NULL) {
       return address.offset + delta;
+   } else if (batch == NULL) {
+      assert(address.bo->flags & EXEC_OBJECT_PINNED);
+      return anv_address_physical(anv_address_add(address, delta));
    } else {
       assert(batch->start <= location && location < batch->end);