From 11cf2145782d7fe78a610fa71c2207bcb1847d32 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Mon, 6 Jul 2015 15:27:58 -0700 Subject: [PATCH] vk: Remove the stub support for explicit memory references --- include/vulkan/vulkan.h | 13 ------------- src/vulkan/device.c | 17 ----------------- 2 files changed, 30 deletions(-) diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h index 976d6e7a9d9..6bb9d674719 100644 --- a/include/vulkan/vulkan.h +++ b/include/vulkan/vulkan.h @@ -1260,7 +1260,6 @@ typedef struct { VkQueueFlags queueFlags; uint32_t queueCount; bool32_t supportsTimestamps; - uint32_t maxMemReferences; } VkPhysicalDeviceQueueProperties; typedef struct { @@ -2003,8 +2002,6 @@ typedef VkResult (VKAPI *PFN_vkGetPhysicalDeviceExtensionInfo)(VkPhysicalDevice typedef VkResult (VKAPI *PFN_vkEnumerateLayers)(VkPhysicalDevice physicalDevice, size_t maxStringSize, size_t* pLayerCount, char* const* pOutLayers, void* pReserved); typedef VkResult (VKAPI *PFN_vkGetDeviceQueue)(VkDevice device, uint32_t queueNodeIndex, uint32_t queueIndex, VkQueue* pQueue); typedef VkResult (VKAPI *PFN_vkQueueSubmit)(VkQueue queue, uint32_t cmdBufferCount, const VkCmdBuffer* pCmdBuffers, VkFence fence); -typedef VkResult (VKAPI *PFN_vkQueueAddMemReferences)(VkQueue queue, uint32_t count, const VkDeviceMemory* pMems); -typedef VkResult (VKAPI *PFN_vkQueueRemoveMemReferences)(VkQueue queue, uint32_t count, const VkDeviceMemory* pMems); typedef VkResult (VKAPI *PFN_vkQueueWaitIdle)(VkQueue queue); typedef VkResult (VKAPI *PFN_vkDeviceWaitIdle)(VkDevice device); typedef VkResult (VKAPI *PFN_vkAllocMemory)(VkDevice device, const VkMemoryAllocInfo* pAllocInfo, VkDeviceMemory* pMem); @@ -2171,16 +2168,6 @@ VkResult VKAPI vkQueueSubmit( const VkCmdBuffer* pCmdBuffers, VkFence fence); -VkResult VKAPI vkQueueAddMemReferences( - VkQueue queue, - uint32_t count, - const VkDeviceMemory* pMems); - -VkResult VKAPI vkQueueRemoveMemReferences( - VkQueue queue, - uint32_t count, - const VkDeviceMemory* pMems); - VkResult VKAPI vkQueueWaitIdle( VkQueue queue); diff --git a/src/vulkan/device.c b/src/vulkan/device.c index 437eb5cfa1a..bc91c907d25 100644 --- a/src/vulkan/device.c +++ b/src/vulkan/device.c @@ -238,7 +238,6 @@ VkResult anv_GetPhysicalDeviceInfo( queue_properties->queueFlags = 0; queue_properties->queueCount = 1; queue_properties->supportsTimestamps = true; - queue_properties->maxMemReferences = 256; return VK_SUCCESS; case VK_PHYSICAL_DEVICE_INFO_TYPE_MEMORY_PROPERTIES: @@ -796,22 +795,6 @@ VkResult anv_QueueSubmit( return VK_SUCCESS; } -VkResult anv_QueueAddMemReferences( - VkQueue queue, - uint32_t count, - const VkDeviceMemory* pMems) -{ - return VK_SUCCESS; -} - -VkResult anv_QueueRemoveMemReferences( - VkQueue queue, - uint32_t count, - const VkDeviceMemory* pMems) -{ - return VK_SUCCESS; -} - VkResult anv_QueueWaitIdle( VkQueue _queue) {