fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-20 10:00:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

vk/vulkan.h: Switch BindObjectMemory to a device function and remove the index

Browse source
This commit is contained in:
Jason Ekstrand 2015-07-08 09:04:16 -07:00
parent e7acdda184
commit bb6567f5d1
3 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/vulkan/vulkan.h
View file

@ -1917,7 +1917,7 @@ typedef VkResult (VKAPI *PFN_vkUnmapMemory)(VkDevice device, VkDeviceMemory mem)
typedef VkResult (VKAPI *PFN_vkFlushMappedMemoryRanges)(VkDevice device, uint32_t memRangeCount, const VkMappedMemoryRange* pMemRanges);
typedef VkResult (VKAPI *PFN_vkInvalidateMappedMemoryRanges)(VkDevice device, uint32_t memRangeCount, const VkMappedMemoryRange* pMemRanges);
typedef VkResult (VKAPI *PFN_vkDestroyObject)(VkDevice device, VkObjectType objType, VkObject object);
typedef VkResult (VKAPI *PFN_vkQueueBindObjectMemory)(VkQueue queue, VkObjectType objType, VkObject object, uint32_t allocationIdx, VkDeviceMemory mem, VkDeviceSize offset);
typedef VkResult (VKAPI *PFN_vkBindObjectMemory)(VkDevice device, VkObjectType objType, VkObject object, VkDeviceMemory mem, VkDeviceSize memOffset);
typedef VkResult (VKAPI *PFN_vkGetObjectMemoryRequirements)(VkDevice device, VkObjectType objType, VkObject object, VkMemoryRequirements* pMemoryRequirements);
typedef VkResult (VKAPI *PFN_vkQueueBindObjectMemoryRange)(VkQueue queue, VkObjectType objType, VkObject object, uint32_t allocationIdx, VkDeviceSize rangeOffset, VkDeviceSize rangeSize, VkDeviceMemory mem, VkDeviceSize memOffset);
typedef VkResult (VKAPI *PFN_vkQueueBindImageMemoryRange)(VkQueue queue, VkImage image, uint32_t allocationIdx, const VkImageMemoryBindInfo* pBindInfo, VkDeviceMemory mem, VkDeviceSize memOffset);
@ -2113,11 +2113,10 @@ VkResult VKAPI vkDestroyObject(
VkObjectType objType,
VkObject object);
VkResult VKAPI vkQueueBindObjectMemory(
VkQueue queue,
VkResult VKAPI vkBindObjectMemory(
VkDevice device,
VkObjectType objType,
VkObject object,
uint32_t allocationIdx,
VkDeviceMemory mem,
VkDeviceSize memOffset);

7
src/vulkan/device.c
View file

@ -1118,11 +1118,10 @@ VkResult anv_GetObjectMemoryRequirements(
return VK_SUCCESS;
}
VkResult anv_QueueBindObjectMemory(
VkQueue queue,
VkResult anv_BindObjectMemory(
VkDevice device,
VkObjectType objType,
VkObject object,
uint32_t allocationIdx,
VkDeviceMemory _mem,
VkDeviceSize memOffset)
{
@ -1144,7 +1143,7 @@ VkResult anv_QueueBindObjectMemory(
default:
break;
}
return VK_SUCCESS;
}

8
src/vulkan/x11.c
View file

@ -147,10 +147,10 @@ VkResult anv_CreateSwapChainWSI(
},
(VkDeviceMemory *) &memory);
anv_QueueBindObjectMemory(VK_NULL_HANDLE,
VK_OBJECT_TYPE_IMAGE,
(VkImage) image, 0,
(VkDeviceMemory) memory, 0);
anv_BindObjectMemory(VK_NULL_HANDLE,
VK_OBJECT_TYPE_IMAGE,
(VkImage) image,
(VkDeviceMemory) memory, 0);
ret = anv_gem_set_tiling(device, memory->bo.gem_handle,
surface->stride, I915_TILING_X);