summaryrefslogtreecommitdiffstats
path: root/src/amd/vulkan/radv_device.c
diff options
context:
space:
mode:
authorDave Airlie <[email protected]>2017-11-16 11:03:22 +1000
committerJason Ekstrand <[email protected]>2017-12-04 10:04:19 -0800
commit69365d72de7086bf10017ba896e68e3ebdf7b956 (patch)
tree514654bf43cf14ddd96c0aab540c6a5a172a8a9c /src/amd/vulkan/radv_device.c
parente12688f365258f6f719983528a2af9b6ca4e25c5 (diff)
radv/wsi: drop allocate memory special case
Just check if image has scanout flag set v2 (Jason Ekstrand): - Rebase - Also drop the now unused radv_mem_flag_bits enum Reviewed-by: Dave Airlie <[email protected]> Reviewed-by: Chad Versace <[email protected]>
Diffstat (limited to 'src/amd/vulkan/radv_device.c')
-rw-r--r--src/amd/vulkan/radv_device.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index f4320275b35..1b7cd355938 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -2126,13 +2126,11 @@ bool radv_get_memory_fd(struct radv_device *device,
pFD);
}
-VkResult radv_alloc_memory(VkDevice _device,
- const VkMemoryAllocateInfo* pAllocateInfo,
- const VkAllocationCallbacks* pAllocator,
- enum radv_mem_flags_bits mem_flags,
- VkDeviceMemory* pMem)
+static VkResult radv_alloc_memory(struct radv_device *device,
+ const VkMemoryAllocateInfo* pAllocateInfo,
+ const VkAllocationCallbacks* pAllocator,
+ VkDeviceMemory* pMem)
{
- RADV_FROM_HANDLE(radv_device, device, _device);
struct radv_device_memory *mem;
VkResult result;
enum radeon_bo_domain domain;
@@ -2202,9 +2200,6 @@ VkResult radv_alloc_memory(VkDevice _device,
if (mem_type_index == RADV_MEM_TYPE_GTT_WRITE_COMBINE)
flags |= RADEON_FLAG_GTT_WC;
- if (mem_flags & RADV_MEM_IMPLICIT_SYNC)
- flags |= RADEON_FLAG_IMPLICIT_SYNC;
-
if (!dedicate_info && !import_info)
flags |= RADEON_FLAG_NO_INTERPROCESS_SHARING;
@@ -2233,7 +2228,8 @@ VkResult radv_AllocateMemory(
const VkAllocationCallbacks* pAllocator,
VkDeviceMemory* pMem)
{
- return radv_alloc_memory(_device, pAllocateInfo, pAllocator, 0, pMem);
+ RADV_FROM_HANDLE(radv_device, device, _device);
+ return radv_alloc_memory(device, pAllocateInfo, pAllocator, pMem);
}
void radv_FreeMemory(