fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 22:49:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

radv: use common GetBufferMemoryRequirements2()

Browse source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22047>
This commit is contained in:
Samuel Pitoiset 2023-03-21 08:38:11 +01:00 • committed by Marge Bot
parent 099a537e51
commit d4bce9508b
3 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/amd/vulkan/radv_acceleration_structure.c
View file

@ -454,7 +454,7 @@ radv_device_init_null_accel_struct(struct radv_device *device)
VkMemoryRequirements2 mem_req = {
.sType = VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2,
};
radv_GetBufferMemoryRequirements2(_device, &info, &mem_req);
vk_common_GetBufferMemoryRequirements2(_device, &info, &mem_req);
VkMemoryAllocateInfo alloc_info = {
.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO,

14
src/amd/vulkan/radv_buffer.c
View file

@ -28,6 +28,7 @@
#include "radv_private.h"
#include "vk_buffer.h"
#include "vk_common_entrypoints.h"
void
radv_buffer_init(struct radv_buffer *buffer, struct radv_device *device,
@ -155,7 +156,7 @@ radv_BindBufferMemory2(VkDevice _device, uint32_t bindInfoCount,
.sType = VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2,
};
radv_GetBufferMemoryRequirements2(_device, &info, &reqs);
vk_common_GetBufferMemoryRequirements2(_device, &info, &reqs);
if (pBindInfos[i].memoryOffset + reqs.memoryRequirements.size > mem->alloc_size) {
return vk_errorf(device, VK_ERROR_UNKNOWN,
@ -231,17 +232,6 @@ radv_get_buffer_memory_requirements(struct radv_device *device, VkDeviceSize siz
}
}
VKAPI_ATTR void VKAPI_CALL
radv_GetBufferMemoryRequirements2(VkDevice _device, const VkBufferMemoryRequirementsInfo2 *pInfo,
VkMemoryRequirements2 *pMemoryRequirements)
{
RADV_FROM_HANDLE(radv_device, device, _device);
RADV_FROM_HANDLE(radv_buffer, buffer, pInfo->buffer);
radv_get_buffer_memory_requirements(device, buffer->vk.size, buffer->vk.create_flags,
buffer->vk.usage, pMemoryRequirements);
}
VKAPI_ATTR void VKAPI_CALL
radv_GetDeviceBufferMemoryRequirements(VkDevice _device,
const VkDeviceBufferMemoryRequirements *pInfo,

2
src/amd/vulkan/radv_device.c
View file

@ -345,7 +345,7 @@ radv_device_init_vrs_state(struct radv_device *device)
VkMemoryRequirements2 mem_req = {
.sType = VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2,
};
radv_GetBufferMemoryRequirements2(radv_device_to_handle(device), &info, &mem_req);
vk_common_GetBufferMemoryRequirements2(radv_device_to_handle(device), &info, &mem_req);
VkMemoryAllocateInfo alloc_info = {
.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO,