fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 03:08:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

vk/0.130: Update vkAllocMemory to use VkMemoryType

Browse source
This commit is contained in:
Chad Versace 2015-07-09 19:59:44 -07:00
parent df2a013881
commit f43a304dc6
3 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/vulkan/vulkan.h
View file

@ -1319,7 +1319,7 @@ typedef struct {
VkStructureType sType;
const void* pNext;
VkDeviceSize allocationSize;
VkMemoryPropertyFlags memProps;
uint32_t memoryTypeIndex;
} VkMemoryAllocInfo;
typedef struct {
@ -1334,8 +1334,7 @@ typedef struct {
VkDeviceSize size;
VkDeviceSize alignment;
VkDeviceSize granularity;
VkMemoryPropertyFlags memPropsAllowed;
VkMemoryPropertyFlags memPropsRequired;
uint32_t memoryTypeBits;
} VkMemoryRequirements;
typedef struct {

23
src/vulkan/device.c
View file

@ -1077,6 +1077,13 @@ VkResult anv_AllocMemory(
assert(pAllocInfo->sType == VK_STRUCTURE_TYPE_MEMORY_ALLOC_INFO);
if (pAllocInfo->memoryTypeIndex != 0) {
/* We support exactly one memory heap. */
return vk_error(VK_ERROR_INVALID_VALUE);
}
/* FINISHME: Fail if allocation request exceeds heap size. */
mem = anv_device_alloc(device, sizeof(*mem), 8,
VK_SYSTEM_ALLOC_TYPE_API_OBJECT);
if (mem == NULL)
@ -1254,13 +1261,17 @@ VkResult anv_GetObjectMemoryRequirements(
VkObject object,
VkMemoryRequirements* pMemoryRequirements)
{
pMemoryRequirements->memPropsAllowed =
VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT |
/* VK_MEMORY_PROPERTY_HOST_NON_COHERENT_BIT | */
/* VK_MEMORY_PROPERTY_HOST_UNCACHED_BIT | */
VK_MEMORY_PROPERTY_HOST_WRITE_COMBINED_BIT;
pMemoryRequirements->memPropsRequired = 0;
/* The Vulkan spec (git aaed022) says:
*
* memoryTypeBits is a bitfield and contains one bit set for every
* supported memory type for the resource. The bit `1<<i` is set if and
* only if the memory type `i` in the VkPhysicalDeviceMemoryProperties
* structure for the physical device is supported.
*
* We support exactly one memory type.
*/
pMemoryRequirements->memoryTypeBits = 1;
switch (objType) {
case VK_OBJECT_TYPE_BUFFER: {

1
src/vulkan/x11.c
View file

@ -144,6 +144,7 @@ VkResult anv_CreateSwapChainWSI(
&(VkMemoryAllocInfo) {
.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOC_INFO,
.allocationSize = image->size,
.memoryTypeIndex = 0,
},
(VkDeviceMemory *) &memory);