From 1d51818d8fff3fdc04a00afdb35a245a959e4481 Mon Sep 17 00:00:00 2001 From: Hans-Kristian Arntzen Date: Thu, 16 Sep 2021 16:28:09 +0200 Subject: [PATCH] vkd3d: Fix compile error introduced by bad rebase. Somehow the rebase got really screwed up :\ Signed-off-by: Hans-Kristian Arntzen --- libs/vkd3d/vkd3d_private.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index f4f5752c..ca0583cc 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -2226,11 +2226,6 @@ struct vkd3d_memory_info_domain uint32_t buffer_type_mask; uint32_t sampled_type_mask; uint32_t rt_ds_type_mask; - - uint32_t budget_sensitive_mask; - VkDeviceSize type_budget[VK_MAX_MEMORY_TYPES]; - VkDeviceSize type_current[VK_MAX_MEMORY_TYPES]; - pthread_mutex_t budget_lock; }; struct vkd3d_memory_info @@ -2246,6 +2241,11 @@ struct vkd3d_memory_info * Used when we want to allocate DEFAULT heaps or non-visible CUSTOM heaps. * For images, we only include memory types which are OPTIMAL tiled. */ struct vkd3d_memory_info_domain non_cpu_accessible_domain; + + uint32_t budget_sensitive_mask; + VkDeviceSize type_budget[VK_MAX_MEMORY_TYPES]; + VkDeviceSize type_current[VK_MAX_MEMORY_TYPES]; + pthread_mutex_t budget_lock; }; HRESULT vkd3d_memory_info_init(struct vkd3d_memory_info *info,