diff options
| author | Mark Lobodzinski <mark@lunarg.com> | 2015-05-29 09:32:35 -0500 |
|---|---|---|
| committer | Mark Lobodzinski <mark@lunarg.com> | 2015-06-02 09:03:26 -0500 |
| commit | 2dcdfd74f9efadad415fe0abbfecebc57a256ccc (patch) | |
| tree | 1a006f4f2b060fa23cf212e53c56956a579a06f1 /icd/nulldrv | |
| parent | 3ee11a2b2cb98bcc6af65eb87b867a27ad7c5715 (diff) | |
| download | usermoji-2dcdfd74f9efadad415fe0abbfecebc57a256ccc.tar.xz | |
vulkan.h: V97 -- Remove multiple allocations. Bug# 13948.
Remove multiple memory allocation requirements from API, and supporting
changes in driver, demos, layers, and tests.
Diffstat (limited to 'icd/nulldrv')
| -rw-r--r-- | icd/nulldrv/nulldrv.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/icd/nulldrv/nulldrv.c b/icd/nulldrv/nulldrv.c index 99596416..6da37fa2 100644 --- a/icd/nulldrv/nulldrv.c +++ b/icd/nulldrv/nulldrv.c @@ -53,7 +53,6 @@ static VkResult nulldrv_base_get_info(struct nulldrv_base *base, int type, { VkResult ret = VK_SUCCESS; size_t s; - uint32_t *count; switch (type) { case VK_OBJECT_INFO_TYPE_MEMORY_REQUIREMENTS: @@ -65,13 +64,6 @@ static VkResult nulldrv_base_get_info(struct nulldrv_base *base, int type, memset(data, 0, s); break; } - case VK_OBJECT_INFO_TYPE_MEMORY_ALLOCATION_COUNT: - *size = sizeof(uint32_t); - if (data == NULL) - return ret; - count = (uint32_t *) data; - *count = 1; - break; default: ret = VK_ERROR_INVALID_VALUE; break; @@ -1891,7 +1883,6 @@ ICD_EXPORT VkResult VKAPI vkBindObjectMemory( VkDevice device, VkObjectType objType, VkObject object, - uint32_t allocationIdx, VkDeviceMemory mem_, VkDeviceSize memOffset) { @@ -1902,7 +1893,6 @@ ICD_EXPORT VkResult VKAPI vkBindObjectMemory( ICD_EXPORT VkResult VKAPI vkQueueBindSparseBufferMemory( VkQueue queue, VkBuffer buffer, - uint32_t allocationIdx, VkDeviceSize rangeOffset, VkDeviceSize rangeSize, VkDeviceMemory mem, @@ -1915,7 +1905,6 @@ ICD_EXPORT VkResult VKAPI vkQueueBindSparseBufferMemory( ICD_EXPORT VkResult VKAPI vkQueueBindSparseImageMemory( VkQueue queue, VkImage image, - uint32_t allocationIdx, const VkImageMemoryBindInfo* pBindInfo, VkDeviceMemory mem, VkDeviceSize memOffset) |