mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-05-04 22:49:13 +02:00
radv: move event related code to radv_event.c
radv_device.c is getting too big. Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21767>
This commit is contained in:
Samuel Pitoiset
Marge Bot
parent
4de305cb8a
commit
17c5a91028
3 changed files with 142 additions and 113 deletions
|
|
@ -69,6 +69,7 @@ libradv_files = files(
|
|||
'radv_descriptor_set.c',
|
||||
'radv_descriptor_set.h',
|
||||
'radv_device_generated_commands.c',
|
||||
'radv_event.c',
|
||||
'radv_formats.c',
|
||||
'radv_image.c',
|
||||
'radv_instance.c',
|
||||
|
|
|
|||
|
|
@ -1758,119 +1758,6 @@ radv_BindImageMemory2(VkDevice _device, uint32_t bindInfoCount,
|
|||
return VK_SUCCESS;
|
||||
}
|
||||
|
||||
static void
|
||||
radv_destroy_event(struct radv_device *device, const VkAllocationCallbacks *pAllocator,
|
||||
struct radv_event *event)
|
||||
{
|
||||
if (event->bo)
|
||||
device->ws->buffer_destroy(device->ws, event->bo);
|
||||
|
||||
vk_object_base_finish(&event->base);
|
||||
vk_free2(&device->vk.alloc, pAllocator, event);
|
||||
}
|
||||
|
||||
VkResult
|
||||
radv_create_event(struct radv_device *device, const VkEventCreateInfo *pCreateInfo,
|
||||
const VkAllocationCallbacks *pAllocator, VkEvent *pEvent, bool is_internal)
|
||||
{
|
||||
enum radeon_bo_domain bo_domain;
|
||||
enum radeon_bo_flag bo_flags;
|
||||
struct radv_event *event;
|
||||
VkResult result;
|
||||
|
||||
event = vk_alloc2(&device->vk.alloc, pAllocator, sizeof(*event), 8,
|
||||
VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
|
||||
if (!event)
|
||||
return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY);
|
||||
|
||||
vk_object_base_init(&device->vk, &event->base, VK_OBJECT_TYPE_EVENT);
|
||||
|
||||
if (pCreateInfo->flags & VK_EVENT_CREATE_DEVICE_ONLY_BIT) {
|
||||
bo_domain = RADEON_DOMAIN_VRAM;
|
||||
bo_flags = RADEON_FLAG_NO_CPU_ACCESS;
|
||||
} else {
|
||||
bo_domain = RADEON_DOMAIN_GTT;
|
||||
bo_flags = RADEON_FLAG_CPU_ACCESS;
|
||||
}
|
||||
|
||||
result = device->ws->buffer_create(
|
||||
device->ws, 8, 8, bo_domain,
|
||||
RADEON_FLAG_VA_UNCACHED | RADEON_FLAG_NO_INTERPROCESS_SHARING | bo_flags,
|
||||
RADV_BO_PRIORITY_FENCE, 0, &event->bo);
|
||||
if (result != VK_SUCCESS) {
|
||||
radv_destroy_event(device, pAllocator, event);
|
||||
return vk_error(device, result);
|
||||
}
|
||||
|
||||
if (!(pCreateInfo->flags & VK_EVENT_CREATE_DEVICE_ONLY_BIT)) {
|
||||
event->map = (uint64_t *)device->ws->buffer_map(event->bo);
|
||||
if (!event->map) {
|
||||
radv_destroy_event(device, pAllocator, event);
|
||||
return vk_error(device, VK_ERROR_OUT_OF_DEVICE_MEMORY);
|
||||
}
|
||||
}
|
||||
|
||||
*pEvent = radv_event_to_handle(event);
|
||||
radv_rmv_log_event_create(device, *pEvent, pCreateInfo->flags, is_internal);
|
||||
return VK_SUCCESS;
|
||||
}
|
||||
|
||||
VKAPI_ATTR VkResult VKAPI_CALL
|
||||
radv_CreateEvent(VkDevice _device, const VkEventCreateInfo *pCreateInfo,
|
||||
const VkAllocationCallbacks *pAllocator, VkEvent *pEvent)
|
||||
{
|
||||
RADV_FROM_HANDLE(radv_device, device, _device);
|
||||
VkResult result = radv_create_event(device, pCreateInfo, pAllocator, pEvent, false);
|
||||
if (result != VK_SUCCESS)
|
||||
return result;
|
||||
|
||||
return VK_SUCCESS;
|
||||
}
|
||||
|
||||
VKAPI_ATTR void VKAPI_CALL
|
||||
radv_DestroyEvent(VkDevice _device, VkEvent _event, const VkAllocationCallbacks *pAllocator)
|
||||
{
|
||||
RADV_FROM_HANDLE(radv_device, device, _device);
|
||||
RADV_FROM_HANDLE(radv_event, event, _event);
|
||||
|
||||
if (!event)
|
||||
return;
|
||||
|
||||
radv_destroy_event(device, pAllocator, event);
|
||||
}
|
||||
|
||||
VKAPI_ATTR VkResult VKAPI_CALL
|
||||
radv_GetEventStatus(VkDevice _device, VkEvent _event)
|
||||
{
|
||||
RADV_FROM_HANDLE(radv_device, device, _device);
|
||||
RADV_FROM_HANDLE(radv_event, event, _event);
|
||||
|
||||
if (vk_device_is_lost(&device->vk))
|
||||
return VK_ERROR_DEVICE_LOST;
|
||||
|
||||
if (*event->map == 1)
|
||||
return VK_EVENT_SET;
|
||||
return VK_EVENT_RESET;
|
||||
}
|
||||
|
||||
VKAPI_ATTR VkResult VKAPI_CALL
|
||||
radv_SetEvent(VkDevice _device, VkEvent _event)
|
||||
{
|
||||
RADV_FROM_HANDLE(radv_event, event, _event);
|
||||
*event->map = 1;
|
||||
|
||||
return VK_SUCCESS;
|
||||
}
|
||||
|
||||
VKAPI_ATTR VkResult VKAPI_CALL
|
||||
radv_ResetEvent(VkDevice _device, VkEvent _event)
|
||||
{
|
||||
RADV_FROM_HANDLE(radv_event, event, _event);
|
||||
*event->map = 0;
|
||||
|
||||
return VK_SUCCESS;
|
||||
}
|
||||
|
||||
void
|
||||
radv_buffer_init(struct radv_buffer *buffer, struct radv_device *device,
|
||||
struct radeon_winsys_bo *bo, uint64_t size,
|
||||
|
|
|
|||
141
src/amd/vulkan/radv_event.c
Normal file
141
src/amd/vulkan/radv_event.c
Normal file
|
|
@ -0,0 +1,141 @@
|
|||
/*
|
||||
* Copyright © 2016 Red Hat.
|
||||
* Copyright © 2016 Bas Nieuwenhuizen
|
||||
*
|
||||
* based in part on anv driver which is:
|
||||
* Copyright © 2015 Intel Corporation
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the "Software"),
|
||||
* to deal in the Software without restriction, including without limitation
|
||||
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
* and/or sell copies of the Software, and to permit persons to whom the
|
||||
* Software is furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice (including the next
|
||||
* paragraph) shall be included in all copies or substantial portions of the
|
||||
* Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
||||
* IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#include "radv_private.h"
|
||||
|
||||
static void
|
||||
radv_destroy_event(struct radv_device *device, const VkAllocationCallbacks *pAllocator,
|
||||
struct radv_event *event)
|
||||
{
|
||||
if (event->bo)
|
||||
device->ws->buffer_destroy(device->ws, event->bo);
|
||||
|
||||
vk_object_base_finish(&event->base);
|
||||
vk_free2(&device->vk.alloc, pAllocator, event);
|
||||
}
|
||||
|
||||
VkResult
|
||||
radv_create_event(struct radv_device *device, const VkEventCreateInfo *pCreateInfo,
|
||||
const VkAllocationCallbacks *pAllocator, VkEvent *pEvent, bool is_internal)
|
||||
{
|
||||
enum radeon_bo_domain bo_domain;
|
||||
enum radeon_bo_flag bo_flags;
|
||||
struct radv_event *event;
|
||||
VkResult result;
|
||||
|
||||
event = vk_alloc2(&device->vk.alloc, pAllocator, sizeof(*event), 8,
|
||||
VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
|
||||
if (!event)
|
||||
return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY);
|
||||
|
||||
vk_object_base_init(&device->vk, &event->base, VK_OBJECT_TYPE_EVENT);
|
||||
|
||||
if (pCreateInfo->flags & VK_EVENT_CREATE_DEVICE_ONLY_BIT) {
|
||||
bo_domain = RADEON_DOMAIN_VRAM;
|
||||
bo_flags = RADEON_FLAG_NO_CPU_ACCESS;
|
||||
} else {
|
||||
bo_domain = RADEON_DOMAIN_GTT;
|
||||
bo_flags = RADEON_FLAG_CPU_ACCESS;
|
||||
}
|
||||
|
||||
result = device->ws->buffer_create(
|
||||
device->ws, 8, 8, bo_domain,
|
||||
RADEON_FLAG_VA_UNCACHED | RADEON_FLAG_NO_INTERPROCESS_SHARING | bo_flags,
|
||||
RADV_BO_PRIORITY_FENCE, 0, &event->bo);
|
||||
if (result != VK_SUCCESS) {
|
||||
radv_destroy_event(device, pAllocator, event);
|
||||
return vk_error(device, result);
|
||||
}
|
||||
|
||||
if (!(pCreateInfo->flags & VK_EVENT_CREATE_DEVICE_ONLY_BIT)) {
|
||||
event->map = (uint64_t *)device->ws->buffer_map(event->bo);
|
||||
if (!event->map) {
|
||||
radv_destroy_event(device, pAllocator, event);
|
||||
return vk_error(device, VK_ERROR_OUT_OF_DEVICE_MEMORY);
|
||||
}
|
||||
}
|
||||
|
||||
*pEvent = radv_event_to_handle(event);
|
||||
radv_rmv_log_event_create(device, *pEvent, pCreateInfo->flags, is_internal);
|
||||
return VK_SUCCESS;
|
||||
}
|
||||
|
||||
VKAPI_ATTR VkResult VKAPI_CALL
|
||||
radv_CreateEvent(VkDevice _device, const VkEventCreateInfo *pCreateInfo,
|
||||
const VkAllocationCallbacks *pAllocator, VkEvent *pEvent)
|
||||
{
|
||||
RADV_FROM_HANDLE(radv_device, device, _device);
|
||||
VkResult result = radv_create_event(device, pCreateInfo, pAllocator, pEvent, false);
|
||||
if (result != VK_SUCCESS)
|
||||
return result;
|
||||
|
||||
return VK_SUCCESS;
|
||||
}
|
||||
|
||||
VKAPI_ATTR void VKAPI_CALL
|
||||
radv_DestroyEvent(VkDevice _device, VkEvent _event, const VkAllocationCallbacks *pAllocator)
|
||||
{
|
||||
RADV_FROM_HANDLE(radv_device, device, _device);
|
||||
RADV_FROM_HANDLE(radv_event, event, _event);
|
||||
|
||||
if (!event)
|
||||
return;
|
||||
|
||||
radv_destroy_event(device, pAllocator, event);
|
||||
}
|
||||
|
||||
VKAPI_ATTR VkResult VKAPI_CALL
|
||||
radv_GetEventStatus(VkDevice _device, VkEvent _event)
|
||||
{
|
||||
RADV_FROM_HANDLE(radv_device, device, _device);
|
||||
RADV_FROM_HANDLE(radv_event, event, _event);
|
||||
|
||||
if (vk_device_is_lost(&device->vk))
|
||||
return VK_ERROR_DEVICE_LOST;
|
||||
|
||||
if (*event->map == 1)
|
||||
return VK_EVENT_SET;
|
||||
return VK_EVENT_RESET;
|
||||
}
|
||||
|
||||
VKAPI_ATTR VkResult VKAPI_CALL
|
||||
radv_SetEvent(VkDevice _device, VkEvent _event)
|
||||
{
|
||||
RADV_FROM_HANDLE(radv_event, event, _event);
|
||||
*event->map = 1;
|
||||
|
||||
return VK_SUCCESS;
|
||||
}
|
||||
|
||||
VKAPI_ATTR VkResult VKAPI_CALL
|
||||
radv_ResetEvent(VkDevice _device, VkEvent _event)
|
||||
{
|
||||
RADV_FROM_HANDLE(radv_event, event, _event);
|
||||
*event->map = 0;
|
||||
|
||||
return VK_SUCCESS;
|
||||
}
|
||||
Loading…
Add table
Reference in a new issue