KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

anv/device: Handle zero-sized memory allocations

This commit is contained in:
Jason Ekstrand 2015-12-17 11:00:38 -08:00
parent c643e9cea8
commit b1325404c5
1 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/vulkan/anv_device.c
View File

@ -1002,6 +1002,12 @@ VkResult anv_AllocateMemory(
assert(pAllocateInfo->sType == VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO);
if (pAllocateInfo->allocationSize == 0) {
/* Apparently, this is allowed */
*pMem = VK_NULL_HANDLE;
return VK_SUCCESS;
}
/* We support exactly one memory heap. */
assert(pAllocateInfo->memoryTypeIndex == 0 ||
(!device->info.has_llc && pAllocateInfo->memoryTypeIndex < 2));
@ -1037,6 +1043,9 @@ void anv_FreeMemory(
ANV_FROM_HANDLE(anv_device, device, _device);
ANV_FROM_HANDLE(anv_device_memory, mem, _mem);
if (mem == NULL)
return;
if (mem->bo.map)
anv_gem_munmap(mem->bo.map, mem->bo.size);
@ -1057,6 +1066,11 @@ VkResult anv_MapMemory(
ANV_FROM_HANDLE(anv_device, device, _device);
ANV_FROM_HANDLE(anv_device_memory, mem, _memory);
if (mem == NULL) {
*ppData = NULL;
return VK_SUCCESS;
}
/* FIXME: Is this supposed to be thread safe? Since vkUnmapMemory() only
* takes a VkDeviceMemory pointer, it seems like only one map of the memory
* at a time is valid. We could just mmap up front and return an offset
@ -1081,6 +1095,9 @@ void anv_UnmapMemory(
{
ANV_FROM_HANDLE(anv_device_memory, mem, _memory);
if (mem == NULL)
return;
anv_gem_munmap(mem->map, mem->map_size);
}
@ -1207,8 +1224,13 @@ VkResult anv_BindBufferMemory(
ANV_FROM_HANDLE(anv_device_memory, mem, _memory);
ANV_FROM_HANDLE(anv_buffer, buffer, _buffer);
buffer->bo = &mem->bo;
buffer->offset = memoryOffset;
if (mem) {
buffer->bo = &mem->bo;
buffer->offset = memoryOffset;
} else {
buffer->bo = NULL;
buffer->offset = 0;
}
return VK_SUCCESS;
}
@ -1222,8 +1244,13 @@ VkResult anv_BindImageMemory(
ANV_FROM_HANDLE(anv_device_memory, mem, _memory);
ANV_FROM_HANDLE(anv_image, image, _image);
image->bo = &mem->bo;
image->offset = memoryOffset;
if (mem) {
image->bo = &mem->bo;
image->offset = memoryOffset;
} else {
image->bo = NULL;
image->offset = 0;
}
return VK_SUCCESS;
}