From 45d17fcf9bd41dfcd34f01bf62b031d8ca071edd Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Mon, 18 Jan 2016 14:04:13 -0800 Subject: [PATCH] anv: Misc allocation scope fixes --- src/vulkan/anv_device.c | 4 ++-- src/vulkan/anv_wsi_wayland.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/vulkan/anv_device.c b/src/vulkan/anv_device.c index 7493ff7b7fc..abc9ed66dd0 100644 --- a/src/vulkan/anv_device.c +++ b/src/vulkan/anv_device.c @@ -227,7 +227,7 @@ VkResult anv_CreateInstance( } instance = anv_alloc2(&default_alloc, pAllocator, sizeof(*instance), 8, - VK_SYSTEM_ALLOCATION_SCOPE_OBJECT); + VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE); if (!instance) return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY); @@ -698,7 +698,7 @@ VkResult anv_CreateDevice( device = anv_alloc2(&physical_device->instance->alloc, pAllocator, sizeof(*device), 8, - VK_SYSTEM_ALLOCATION_SCOPE_OBJECT); + VK_SYSTEM_ALLOCATION_SCOPE_DEVICE); if (!device) return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY); diff --git a/src/vulkan/anv_wsi_wayland.c b/src/vulkan/anv_wsi_wayland.c index d708341c98f..5e8a3a56f68 100644 --- a/src/vulkan/anv_wsi_wayland.c +++ b/src/vulkan/anv_wsi_wayland.c @@ -239,7 +239,7 @@ wsi_wl_display_create(struct wsi_wayland *wsi, struct wl_display *wl_display) { struct wsi_wl_display *display = anv_alloc(&wsi->instance->alloc, sizeof(*display), 8, - VK_SYSTEM_ALLOCATION_SCOPE_CACHE); + VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE); if (!display) return NULL; @@ -820,7 +820,7 @@ anv_wl_init_wsi(struct anv_instance *instance) VkResult result; wsi = anv_alloc(&instance->alloc, sizeof(*wsi), 8, - VK_SYSTEM_ALLOCATION_SCOPE_OBJECT); + VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE); if (!wsi) { result = vk_error(VK_ERROR_OUT_OF_HOST_MEMORY); goto fail; -- 2.30.2