summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTapani Pälli <tapani.palli@intel.com>2017-08-31 08:52:27 +0300
committerTapani Pälli <tapani.palli@intel.com>2017-08-31 18:05:50 +0300
commit15b61dec94ceccd66bcbeb8c22c7f2019de7f173 (patch)
tree9b29448bc3a52fe46730184ec102ef115bb62827
parent214b565bc28bc4419f3eec29ab7bbe34080459fe (diff)
anv: fix build errors on android
error: incompatible pointer to integer conversion initializing 'VkFence' (aka 'unsigned long long') with an expression of type 'void *' [-Werror,-Wint-conversion] Signed-off-by: Tapani Pälli <tapani.palli@intel.com> Reviewed-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com> Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
-rw-r--r--src/intel/vulkan/anv_queue.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/intel/vulkan/anv_queue.c b/src/intel/vulkan/anv_queue.c
index 429bac9739e..21ca66757e6 100644
--- a/src/intel/vulkan/anv_queue.c
+++ b/src/intel/vulkan/anv_queue.c
@@ -169,7 +169,7 @@ VkResult anv_QueueSubmit(
for (uint32_t i = 0; i < submitCount; i++) {
/* Fence for this submit. NULL for all but the last one */
- VkFence submit_fence = (i == submitCount - 1) ? fence : NULL;
+ VkFence submit_fence = (i == submitCount - 1) ? fence : VK_NULL_HANDLE;
if (pSubmits[i].commandBufferCount == 0) {
/* If we don't have any command buffers, we need to submit a dummy
@@ -197,7 +197,8 @@ VkResult anv_QueueSubmit(
/* Fence for this execbuf. NULL for all but the last one */
VkFence execbuf_fence =
- (j == pSubmits[i].commandBufferCount - 1) ? submit_fence : NULL;
+ (j == pSubmits[i].commandBufferCount - 1) ?
+ submit_fence : VK_NULL_HANDLE;
const VkSemaphore *in_semaphores = NULL, *out_semaphores = NULL;
uint32_t num_in_semaphores = 0, num_out_semaphores = 0;