diff options
| author | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-05-01 17:56:13 -0600 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-05-04 17:32:41 -0600 |
| commit | 5446669fdb7655f5cf7c97b1d5e0de3ae2a9e2de (patch) | |
| tree | 2628730bec26dc7c3dad0633d7ae84cd37eb4cb7 /include | |
| parent | 2bda8330c5bf332db9b0560ea358af6564116de7 (diff) | |
| download | usermoji-5446669fdb7655f5cf7c97b1d5e0de3ae2a9e2de.tar.xz | |
bug 13854: Remove memory references
header: 0.93.0
svn: 30980
Diffstat (limited to 'include')
| -rw-r--r-- | include/vkLayer.h | 2 | ||||
| -rw-r--r-- | include/vulkan.h | 36 |
2 files changed, 11 insertions, 27 deletions
diff --git a/include/vkLayer.h b/include/vkLayer.h index 0b629b80..e95811b8 100644 --- a/include/vkLayer.h +++ b/include/vkLayer.h @@ -37,8 +37,6 @@ typedef struct VkLayerDispatchTable_ PFN_vkEnumerateLayers EnumerateLayers; PFN_vkGetDeviceQueue GetDeviceQueue; PFN_vkQueueSubmit QueueSubmit; - PFN_vkQueueAddMemReferences QueueAddMemReferences; - PFN_vkQueueRemoveMemReferences QueueRemoveMemReferences; PFN_vkQueueWaitIdle QueueWaitIdle; PFN_vkDeviceWaitIdle DeviceWaitIdle; PFN_vkAllocMemory AllocMemory; diff --git a/include/vulkan.h b/include/vulkan.h index f4ac9357..00ebbf51 100644 --- a/include/vulkan.h +++ b/include/vulkan.h @@ -33,7 +33,7 @@ #include "vk_platform.h" // Vulkan API version supported by this file -#define VK_API_VERSION VK_MAKE_VERSION(0, 92, 0) +#define VK_API_VERSION VK_MAKE_VERSION(0, 93, 0) #ifdef __cplusplus extern "C" @@ -938,17 +938,16 @@ typedef enum VkResult_ VK_ERROR_UNSUPPORTED_SHADER_IL_VERSION = -(0x00000015), VK_ERROR_BAD_SHADER_CODE = -(0x00000016), VK_ERROR_BAD_PIPELINE_DATA = -(0x00000017), - VK_ERROR_TOO_MANY_MEMORY_REFERENCES = -(0x00000018), - VK_ERROR_NOT_MAPPABLE = -(0x00000019), - VK_ERROR_MEMORY_MAP_FAILED = -(0x0000001A), - VK_ERROR_MEMORY_UNMAP_FAILED = -(0x0000001B), - VK_ERROR_INCOMPATIBLE_DEVICE = -(0x0000001C), - VK_ERROR_INCOMPATIBLE_DRIVER = -(0x0000001D), - VK_ERROR_INCOMPLETE_COMMAND_BUFFER = -(0x0000001E), - VK_ERROR_BUILDING_COMMAND_BUFFER = -(0x0000001F), - VK_ERROR_MEMORY_NOT_BOUND = -(0x00000020), - VK_ERROR_INCOMPATIBLE_QUEUE = -(0x00000021), - VK_ERROR_NOT_SHAREABLE = -(0x00000022), + VK_ERROR_NOT_MAPPABLE = -(0x00000018), + VK_ERROR_MEMORY_MAP_FAILED = -(0x00000019), + VK_ERROR_MEMORY_UNMAP_FAILED = -(0x0000001A), + VK_ERROR_INCOMPATIBLE_DEVICE = -(0x0000001B), + VK_ERROR_INCOMPATIBLE_DRIVER = -(0x0000001C), + VK_ERROR_INCOMPLETE_COMMAND_BUFFER = -(0x0000001D), + VK_ERROR_BUILDING_COMMAND_BUFFER = -(0x0000001E), + VK_ERROR_MEMORY_NOT_BOUND = -(0x0000001F), + VK_ERROR_INCOMPATIBLE_QUEUE = -(0x00000020), + VK_ERROR_NOT_SHAREABLE = -(0x00000021), VK_MAX_ENUM(RESULT) } VkResult; @@ -1368,7 +1367,6 @@ typedef struct VkPhysicalDeviceQueueProperties_ uint32_t queueCount; uint32_t maxAtomicCounters; bool32_t supportsTimestamps; - uint32_t maxMemReferences; // Tells how many memory references can be active for the given queue } VkPhysicalDeviceQueueProperties; typedef struct VkPhysicalDeviceMemoryProperties_ @@ -2146,8 +2144,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); @@ -2327,16 +2323,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); |