niansa-misc/wine
1
0
Fork 0
mirror of synced 2025-03-07 03:53:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

winevulkan: Rename wine_device_memory mapping to vm_map.

Browse source 
To avoid conflict with handle mapping macros.
This commit is contained in:
Jacek Caban 2024-02-21 14:28:49 +01:00 • committed by Alexandre Julliard
parent 7995f3813c
commit 84e4620706
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
dlls/winevulkan/vulkan.c
View file

@ -1703,7 +1703,7 @@ VkResult wine_vkAllocateMemory(VkDevice handle, const VkMemoryAllocateInfo *allo
return result;
}
memory->mapping = mapping;
memory->vm_map = mapping;
*ret = (VkDeviceMemory)(uintptr_t)memory;
return VK_SUCCESS;
}
@ -1719,10 +1719,10 @@ void wine_vkFreeMemory(VkDevice handle, VkDeviceMemory memory_handle, const VkAl
device->funcs.p_vkFreeMemory(device->host_device, memory->host_memory, NULL);
if (memory->mapping)
if (memory->vm_map)
{
SIZE_T alloc_size = 0;
NtFreeVirtualMemory(GetCurrentProcess(), &memory->mapping, &alloc_size, MEM_RELEASE);
NtFreeVirtualMemory(GetCurrentProcess(), &memory->vm_map, &alloc_size, MEM_RELEASE);
}
free(memory);
@ -1751,9 +1751,9 @@ VkResult wine_vkMapMemory2KHR(VkDevice handle, const VkMemoryMapInfoKHR *map_inf
VkResult result;
info.memory = memory->host_memory;
if (memory->mapping)
if (memory->vm_map)
{
*data = (char *)memory->mapping + info.offset;
*data = (char *)memory->vm_map + info.offset;
TRACE("returning %p\n", *data);
return VK_SUCCESS;
}
@ -1799,7 +1799,7 @@ VkResult wine_vkUnmapMemory2KHR(VkDevice handle, const VkMemoryUnmapInfoKHR *unm
struct wine_device_memory *memory = wine_device_memory_from_handle(unmap_info->memory);
VkMemoryUnmapInfoKHR info;
if (memory->mapping)
if (memory->vm_map)
return VK_SUCCESS;
if (!device->funcs.p_vkUnmapMemory2KHR)

2
dlls/winevulkan/vulkan_private.h
View file

@ -175,7 +175,7 @@ static inline struct wine_cmd_pool *wine_cmd_pool_from_handle(VkCommandPool hand
struct wine_device_memory
{
VkDeviceMemory host_memory;
void *mapping;
void *vm_map;
};
static inline struct wine_device_memory *wine_device_memory_from_handle(VkDeviceMemory handle)