vk: Remove the stub support for memory priorities
authorJason Ekstrand <jason.ekstrand@intel.com>
Mon, 6 Jul 2015 22:28:10 +0000 (15:28 -0700)
committerJason Ekstrand <jason.ekstrand@intel.com>
Mon, 6 Jul 2015 22:28:10 +0000 (15:28 -0700)
include/vulkan/vulkan.h
src/vulkan/device.c

index 6bb9d6747190bb451db018dc0811647371e357ef..1ac6b2a8e087f3cd3c2af2026719387ca656342b 100644 (file)
@@ -118,18 +118,6 @@ VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkRenderPass, VkNonDispatchable)
 // ------------------------------------------------------------------------------------------------
 // Enumerations
 
-typedef enum VkMemoryPriority_
-{
-    VK_MEMORY_PRIORITY_UNUSED                               = 0x00000000,
-    VK_MEMORY_PRIORITY_VERY_LOW                             = 0x00000001,
-    VK_MEMORY_PRIORITY_LOW                                  = 0x00000002,
-    VK_MEMORY_PRIORITY_NORMAL                               = 0x00000003,
-    VK_MEMORY_PRIORITY_HIGH                                 = 0x00000004,
-    VK_MEMORY_PRIORITY_VERY_HIGH                            = 0x00000005,
-
-    VK_ENUM_RANGE(MEMORY_PRIORITY, UNUSED, VERY_HIGH)
-} VkMemoryPriority;
-
 typedef enum VkImageLayout_
 {
     VK_IMAGE_LAYOUT_UNDEFINED                               = 0x00000000,   // Implicit layout an image is when its contents are undefined due to various reasons (e.g. right after creation)
@@ -1292,7 +1280,6 @@ typedef struct {
     const void*                                 pNext;
     VkDeviceSize                                allocationSize;
     VkMemoryPropertyFlags                       memProps;
-    VkMemoryPriority                            memPriority;
 } VkMemoryAllocInfo;
 
 typedef struct {
@@ -2006,7 +1993,6 @@ 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);
 typedef VkResult (VKAPI *PFN_vkFreeMemory)(VkDevice device, VkDeviceMemory mem);
-typedef VkResult (VKAPI *PFN_vkSetMemoryPriority)(VkDevice device, VkDeviceMemory mem, VkMemoryPriority priority);
 typedef VkResult (VKAPI *PFN_vkMapMemory)(VkDevice device, VkDeviceMemory mem, VkDeviceSize offset, VkDeviceSize size, VkMemoryMapFlags flags, void** ppData);
 typedef VkResult (VKAPI *PFN_vkUnmapMemory)(VkDevice device, VkDeviceMemory mem);
 typedef VkResult (VKAPI *PFN_vkFlushMappedMemory)(VkDevice device, VkDeviceMemory mem, VkDeviceSize offset, VkDeviceSize size);
@@ -2183,11 +2169,6 @@ VkResult VKAPI vkFreeMemory(
     VkDevice                                    device,
     VkDeviceMemory                              mem);
 
-VkResult VKAPI vkSetMemoryPriority(
-    VkDevice                                    device,
-    VkDeviceMemory                              mem,
-    VkMemoryPriority                            priority);
-
 VkResult VKAPI vkMapMemory(
     VkDevice                                    device,
     VkDeviceMemory                              mem,
index bc91c907d2573bf7987701d5d937fee8ec0166b4..7c0f759460f0227475723c9b6276fdb945362767 100644 (file)
@@ -954,14 +954,6 @@ VkResult anv_FreeMemory(
    return VK_SUCCESS;
 }
 
-VkResult anv_SetMemoryPriority(
-    VkDevice                                    device,
-    VkDeviceMemory                              mem,
-    VkMemoryPriority                            priority)
-{
-   return VK_SUCCESS;
-}
-
 VkResult anv_MapMemory(
     VkDevice                                    _device,
     VkDeviceMemory                              _mem,