From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Thu, 27 Aug 2015 00:58:22 +0000 (-0700)
Subject: vk/private.h: Handle a NULL bo but valid offset in __gen_combine_address
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=375a65d5de218fc3686b6b2bc719acf1c82a410c;p=mesa.git

vk/private.h: Handle a NULL bo but valid offset in __gen_combine_address
---

diff --git a/src/vulkan/anv_private.h b/src/vulkan/anv_private.h
index cb8defd23b6..05799276718 100644
--- a/src/vulkan/anv_private.h
+++ b/src/vulkan/anv_private.h
@@ -505,7 +505,7 @@ __gen_combine_address(struct anv_batch *batch, void *location,
                       const struct anv_address address, uint32_t delta)
 {
    if (address.bo == NULL) {
-      return delta;
+      return address.offset + delta;
    } else {
       assert(batch->start <= location && location < batch->end);