KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pvr: Use the common AcquireNextImage implementation 

The only reason for the wrapper was so that we could dummy signal the
semaphore and fence.  Now that the WSI code always dos this for us, we
can drop our wrapper.

Reviewed-by: Rajnesh Kanwal <rajnesh.kanwal@imgtec.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4037>
This commit is contained in:
Jason Ekstrand 2022-05-19 19:39:04 -05:00 committed by Marge Bot
parent 384c31425a
commit 12920b227f
1 changed files with 0 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/imagination/vulkan/pvr_wsi.c
View File

@ -31,10 +31,7 @@
#include "pvr_private.h"
#include "util/u_atomic.h"
#include "vk_fence.h"
#include "vk_object.h"
#include "vk_semaphore.h"
#include "vk_sync_dummy.h"
#include "wsi_common.h"
static PFN_vkVoidFunction pvr_wsi_proc_addr(VkPhysicalDevice physicalDevice,
@ -89,45 +86,3 @@ VkResult pvr_QueuePresentKHR(VkQueue _queue,
return VK_SUCCESS;
}
VkResult pvr_AcquireNextImage2KHR(VkDevice _device,
const VkAcquireNextImageInfoKHR *pAcquireInfo,
uint32_t *pImageIndex)
{
VK_FROM_HANDLE(vk_semaphore, sem, pAcquireInfo->semaphore);
VK_FROM_HANDLE(vk_fence, fence, pAcquireInfo->fence);
PVR_FROM_HANDLE(pvr_device, device, _device);
VkResult result;
VkResult ret;
result = wsi_common_acquire_next_image2(&device->pdevice->wsi_device,
_device,
pAcquireInfo,
pImageIndex);
if (result != VK_SUCCESS && result != VK_SUBOPTIMAL_KHR)
return result;
if (fence) {
vk_fence_reset_temporary(&device->vk, fence);
ret = vk_sync_create(&device->vk,
&vk_sync_dummy_type,
0U,
0UL,
&fence->temporary);
if (ret != VK_SUCCESS)
return ret;
}
if (sem) {
vk_semaphore_reset_temporary(&device->vk, sem);
ret = vk_sync_create(&device->vk,
&vk_sync_dummy_type,
0U,
0UL,
&sem->temporary);
if (ret != VK_SUCCESS)
return ret;
}
return result;
}