From 83a8df1b37ded3d6fcf41f94cc2fc0ae9e9a4ab7 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Wed, 3 Sep 2025 11:36:19 +0200 Subject: [PATCH] pvr: drop pointless PVR_FROM_HANDLE macro All it does is call VK_FROM_HANDLE, let's just do that directly instead. Reviewed-by: Simon Perretta Part-of: --- src/imagination/vulkan/pvr_blit.c | 54 ++++++------- src/imagination/vulkan/pvr_cmd_buffer.c | 72 +++++++++--------- src/imagination/vulkan/pvr_descriptor_set.c | 48 ++++++------ src/imagination/vulkan/pvr_device.c | 84 ++++++++++----------- src/imagination/vulkan/pvr_formats.c | 2 +- src/imagination/vulkan/pvr_image.c | 30 ++++---- src/imagination/vulkan/pvr_pass.c | 8 +- src/imagination/vulkan/pvr_pipeline.c | 14 ++-- src/imagination/vulkan/pvr_private.h | 3 - src/imagination/vulkan/pvr_query.c | 22 +++--- src/imagination/vulkan/pvr_query_compute.c | 6 +- src/imagination/vulkan/pvr_wsi.c | 4 +- 12 files changed, 172 insertions(+), 175 deletions(-) diff --git a/src/imagination/vulkan/pvr_blit.c b/src/imagination/vulkan/pvr_blit.c index 15230a1d0c1..12c1b476064 100644 --- a/src/imagination/vulkan/pvr_blit.c +++ b/src/imagination/vulkan/pvr_blit.c @@ -213,9 +213,9 @@ static void pvr_setup_transfer_surface(struct pvr_device *device, void pvr_CmdBlitImage2(VkCommandBuffer commandBuffer, const VkBlitImageInfo2 *pBlitImageInfo) { - PVR_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); - PVR_FROM_HANDLE(pvr_image, src, pBlitImageInfo->srcImage); - PVR_FROM_HANDLE(pvr_image, dst, pBlitImageInfo->dstImage); + VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); + VK_FROM_HANDLE(pvr_image, src, pBlitImageInfo->srcImage); + VK_FROM_HANDLE(pvr_image, dst, pBlitImageInfo->dstImage); struct pvr_device *device = cmd_buffer->device; enum pvr_filter filter = PVR_FILTER_DONTCARE; @@ -695,9 +695,9 @@ static bool pvr_can_merge_ds_regions(const VkImageCopy2 *pRegionA, void pvr_CmdCopyImage2(VkCommandBuffer commandBuffer, const VkCopyImageInfo2 *pCopyImageInfo) { - PVR_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); - PVR_FROM_HANDLE(pvr_image, src, pCopyImageInfo->srcImage); - PVR_FROM_HANDLE(pvr_image, dst, pCopyImageInfo->dstImage); + VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); + VK_FROM_HANDLE(pvr_image, src, pCopyImageInfo->srcImage); + VK_FROM_HANDLE(pvr_image, dst, pCopyImageInfo->dstImage); const bool can_merge_ds = src->vk.format == VK_FORMAT_D24_UNORM_S8_UINT && dst->vk.format == VK_FORMAT_D24_UNORM_S8_UINT; @@ -894,9 +894,9 @@ void pvr_CmdCopyBufferToImage2( VkCommandBuffer commandBuffer, const VkCopyBufferToImageInfo2 *pCopyBufferToImageInfo) { - PVR_FROM_HANDLE(pvr_buffer, src, pCopyBufferToImageInfo->srcBuffer); - PVR_FROM_HANDLE(pvr_image, dst, pCopyBufferToImageInfo->dstImage); - PVR_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); + VK_FROM_HANDLE(pvr_buffer, src, pCopyBufferToImageInfo->srcBuffer); + VK_FROM_HANDLE(pvr_image, dst, pCopyBufferToImageInfo->dstImage); + VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); PVR_CHECK_COMMAND_BUFFER_BUILDING_STATE(cmd_buffer); @@ -1088,9 +1088,9 @@ void pvr_CmdCopyImageToBuffer2( VkCommandBuffer commandBuffer, const VkCopyImageToBufferInfo2 *pCopyImageToBufferInfo) { - PVR_FROM_HANDLE(pvr_buffer, dst, pCopyImageToBufferInfo->dstBuffer); - PVR_FROM_HANDLE(pvr_image, src, pCopyImageToBufferInfo->srcImage); - PVR_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); + VK_FROM_HANDLE(pvr_buffer, dst, pCopyImageToBufferInfo->dstBuffer); + VK_FROM_HANDLE(pvr_image, src, pCopyImageToBufferInfo->srcImage); + VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); PVR_CHECK_COMMAND_BUFFER_BUILDING_STATE(cmd_buffer); @@ -1189,8 +1189,8 @@ void pvr_CmdClearColorImage(VkCommandBuffer commandBuffer, uint32_t rangeCount, const VkImageSubresourceRange *pRanges) { - PVR_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); - PVR_FROM_HANDLE(pvr_image, image, _image); + VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); + VK_FROM_HANDLE(pvr_image, image, _image); for (uint32_t i = 0; i < rangeCount; i++) { const VkResult result = @@ -1207,8 +1207,8 @@ void pvr_CmdClearDepthStencilImage(VkCommandBuffer commandBuffer, uint32_t rangeCount, const VkImageSubresourceRange *pRanges) { - PVR_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); - PVR_FROM_HANDLE(pvr_image, image, _image); + VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); + VK_FROM_HANDLE(pvr_image, image, _image); for (uint32_t i = 0; i < rangeCount; i++) { const VkImageAspectFlags ds_aspect = VK_IMAGE_ASPECT_DEPTH_BIT | @@ -1348,8 +1348,8 @@ void pvr_CmdUpdateBuffer(VkCommandBuffer commandBuffer, VkDeviceSize dataSize, const void *pData) { - PVR_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); - PVR_FROM_HANDLE(pvr_buffer, dst, dstBuffer); + VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); + VK_FROM_HANDLE(pvr_buffer, dst, dstBuffer); struct pvr_suballoc_bo *pvr_bo; VkResult result; @@ -1372,9 +1372,9 @@ void pvr_CmdUpdateBuffer(VkCommandBuffer commandBuffer, void pvr_CmdCopyBuffer2(VkCommandBuffer commandBuffer, const VkCopyBufferInfo2 *pCopyBufferInfo) { - PVR_FROM_HANDLE(pvr_buffer, src, pCopyBufferInfo->srcBuffer); - PVR_FROM_HANDLE(pvr_buffer, dst, pCopyBufferInfo->dstBuffer); - PVR_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); + VK_FROM_HANDLE(pvr_buffer, src, pCopyBufferInfo->srcBuffer); + VK_FROM_HANDLE(pvr_buffer, dst, pCopyBufferInfo->dstBuffer); + VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); PVR_CHECK_COMMAND_BUFFER_BUILDING_STATE(cmd_buffer); @@ -1399,8 +1399,8 @@ void pvr_CmdFillBuffer(VkCommandBuffer commandBuffer, VkDeviceSize fillSize, uint32_t data) { - PVR_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); - PVR_FROM_HANDLE(pvr_buffer, dst, dstBuffer); + VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); + VK_FROM_HANDLE(pvr_buffer, dst, dstBuffer); PVR_CHECK_COMMAND_BUFFER_BUILDING_STATE(cmd_buffer); @@ -2182,7 +2182,7 @@ void pvr_CmdClearAttachments(VkCommandBuffer commandBuffer, uint32_t rectCount, const VkClearRect *pRects) { - PVR_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); + VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); struct pvr_cmd_buffer_state *state = &cmd_buffer->state; struct pvr_sub_cmd_gfx *sub_cmd = &state->current_sub_cmd->gfx; @@ -2256,9 +2256,9 @@ void pvr_CmdClearAttachments(VkCommandBuffer commandBuffer, void pvr_CmdResolveImage2(VkCommandBuffer commandBuffer, const VkResolveImageInfo2 *pResolveImageInfo) { - PVR_FROM_HANDLE(pvr_image, src, pResolveImageInfo->srcImage); - PVR_FROM_HANDLE(pvr_image, dst, pResolveImageInfo->dstImage); - PVR_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); + VK_FROM_HANDLE(pvr_image, src, pResolveImageInfo->srcImage); + VK_FROM_HANDLE(pvr_image, dst, pResolveImageInfo->dstImage); + VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); PVR_CHECK_COMMAND_BUFFER_BUILDING_STATE(cmd_buffer); diff --git a/src/imagination/vulkan/pvr_cmd_buffer.c b/src/imagination/vulkan/pvr_cmd_buffer.c index 9dccba61635..67bbf3cf9bc 100644 --- a/src/imagination/vulkan/pvr_cmd_buffer.c +++ b/src/imagination/vulkan/pvr_cmd_buffer.c @@ -244,7 +244,7 @@ pvr_AllocateCommandBuffers(VkDevice _device, VkCommandBuffer *pCommandBuffers) { VK_FROM_HANDLE(vk_command_pool, pool, pAllocateInfo->commandPool); - PVR_FROM_HANDLE(pvr_device, device, _device); + VK_FROM_HANDLE(pvr_device, device, _device); VkResult result = VK_SUCCESS; uint32_t i; @@ -2569,8 +2569,8 @@ void pvr_CmdBindPipeline(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline _pipeline) { - PVR_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); - PVR_FROM_HANDLE(pvr_pipeline, pipeline, _pipeline); + VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); + VK_FROM_HANDLE(pvr_pipeline, pipeline, _pipeline); switch (pipelineBindPoint) { case VK_PIPELINE_BIND_POINT_COMPUTE: @@ -2661,7 +2661,7 @@ void pvr_CmdSetViewport(VkCommandBuffer commandBuffer, uint32_t viewportCount, const VkViewport *pViewports) { - PVR_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); + VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); const uint32_t total_count = firstViewport + viewportCount; assert(firstViewport < PVR_MAX_VIEWPORTS && viewportCount > 0); @@ -2694,7 +2694,7 @@ void pvr_CmdBindDescriptorSets2KHR( VkCommandBuffer commandBuffer, const VkBindDescriptorSetsInfoKHR *pBindDescriptorSetsInfo) { - PVR_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); + VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); VK_FROM_HANDLE(vk_pipeline_layout, pipeline_layout, pBindDescriptorSetsInfo->layout); @@ -2756,7 +2756,7 @@ void pvr_CmdBindVertexBuffers2(VkCommandBuffer commandBuffer, const VkDeviceSize *pSizes, const VkDeviceSize *pStrides) { - PVR_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); + VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); struct pvr_vertex_binding *const vb = cmd_buffer->state.vertex_bindings; assert(firstBinding < PVR_MAX_VERTEX_INPUT_BINDINGS && @@ -2790,8 +2790,8 @@ void pvr_CmdBindIndexBuffer(VkCommandBuffer commandBuffer, VkDeviceSize offset, VkIndexType indexType) { - PVR_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); - PVR_FROM_HANDLE(pvr_buffer, index_buffer, buffer); + VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); + VK_FROM_HANDLE(pvr_buffer, index_buffer, buffer); struct pvr_cmd_buffer_state *const state = &cmd_buffer->state; assert(offset < index_buffer->vk.size); @@ -2820,7 +2820,7 @@ static void update_push_constants(struct pvr_push_constants *push_consts, void pvr_CmdPushConstants2KHR(VkCommandBuffer commandBuffer, const VkPushConstantsInfoKHR *pPushConstantsInfo) { - PVR_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); + VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); struct pvr_cmd_buffer_state *const state = &cmd_buffer->state; if (pPushConstantsInfo->stageFlags & VK_SHADER_STAGE_VERTEX_BIT) { @@ -2882,7 +2882,7 @@ static VkResult pvr_cmd_buffer_attachments_setup( for (uint32_t i = 0; i < pass->attachment_count; i++) { if (pImageless && pImageless->attachmentCount) { assert(pImageless->attachmentCount == pass->attachment_count); - PVR_FROM_HANDLE(pvr_image_view, img_view, pImageless->pAttachments[i]); + VK_FROM_HANDLE(pvr_image_view, img_view, pImageless->pAttachments[i]); info->attachments[i] = img_view; } else { info->attachments[i] = framebuffer->attachments[i]; @@ -3299,11 +3299,11 @@ void pvr_CmdBeginRenderPass2(VkCommandBuffer commandBuffer, const VkRenderPassBeginInfo *pRenderPassBeginInfo, const VkSubpassBeginInfo *pSubpassBeginInfo) { - PVR_FROM_HANDLE(pvr_framebuffer, + VK_FROM_HANDLE(pvr_framebuffer, framebuffer, pRenderPassBeginInfo->framebuffer); - PVR_FROM_HANDLE(pvr_render_pass, pass, pRenderPassBeginInfo->renderPass); - PVR_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); + VK_FROM_HANDLE(pvr_render_pass, pass, pRenderPassBeginInfo->renderPass); + VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); const struct pvr_renderpass_hwsetup_subpass *hw_subpass; struct pvr_cmd_buffer_state *state = &cmd_buffer->state; VkResult result; @@ -3370,7 +3370,7 @@ void pvr_CmdBeginRenderPass2(VkCommandBuffer commandBuffer, VkResult pvr_BeginCommandBuffer(VkCommandBuffer commandBuffer, const VkCommandBufferBeginInfo *pBeginInfo) { - PVR_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); + VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); struct pvr_cmd_buffer_state *state; VkResult result; @@ -4560,7 +4560,7 @@ void pvr_CmdDispatchBase(VkCommandBuffer commandBuffer, uint32_t groupCountY, uint32_t groupCountZ) { - PVR_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); + VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); PVR_CHECK_COMMAND_BUFFER_BUILDING_STATE(cmd_buffer); @@ -4577,8 +4577,8 @@ void pvr_CmdDispatchIndirect(VkCommandBuffer commandBuffer, VkBuffer _buffer, VkDeviceSize offset) { - PVR_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); - PVR_FROM_HANDLE(pvr_buffer, buffer, _buffer); + VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); + VK_FROM_HANDLE(pvr_buffer, buffer, _buffer); PVR_CHECK_COMMAND_BUFFER_BUILDING_STATE(cmd_buffer); @@ -6742,7 +6742,7 @@ void pvr_CmdDraw(VkCommandBuffer commandBuffer, .base_instance = firstInstance, }; - PVR_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); + VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); struct vk_dynamic_graphics_state *const dynamic_state = &cmd_buffer->vk.dynamic_graphics_state; struct pvr_cmd_buffer_state *state = &cmd_buffer->state; @@ -6783,7 +6783,7 @@ void pvr_CmdDrawIndexed(VkCommandBuffer commandBuffer, .draw_indexed = true, }; - PVR_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); + VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); struct vk_dynamic_graphics_state *const dynamic_state = &cmd_buffer->vk.dynamic_graphics_state; struct pvr_cmd_buffer_state *state = &cmd_buffer->state; @@ -6822,11 +6822,11 @@ void pvr_CmdDrawIndexedIndirect(VkCommandBuffer commandBuffer, .draw_indexed = true, }; - PVR_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); + VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); struct pvr_cmd_buffer_state *state = &cmd_buffer->state; struct vk_dynamic_graphics_state *const dynamic_state = &cmd_buffer->vk.dynamic_graphics_state; - PVR_FROM_HANDLE(pvr_buffer, buffer, _buffer); + VK_FROM_HANDLE(pvr_buffer, buffer, _buffer); VkResult result; PVR_CHECK_COMMAND_BUFFER_BUILDING_STATE(cmd_buffer); @@ -6861,9 +6861,9 @@ void pvr_CmdDrawIndirect(VkCommandBuffer commandBuffer, .draw_indirect = true, }; - PVR_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); + VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); struct pvr_cmd_buffer_state *state = &cmd_buffer->state; - PVR_FROM_HANDLE(pvr_buffer, buffer, _buffer); + VK_FROM_HANDLE(pvr_buffer, buffer, _buffer); struct vk_dynamic_graphics_state *const dynamic_state = &cmd_buffer->vk.dynamic_graphics_state; VkResult result; @@ -6972,7 +6972,7 @@ pvr_resolve_unemitted_resolve_attachments(struct pvr_cmd_buffer *cmd_buffer, void pvr_CmdEndRenderPass2(VkCommandBuffer commandBuffer, const VkSubpassEndInfo *pSubpassEndInfo) { - PVR_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); + VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); struct pvr_cmd_buffer_state *state = &cmd_buffer->state; struct pvr_image_view **attachments; VkClearValue *clear_values; @@ -7300,7 +7300,7 @@ void pvr_CmdExecuteCommands(VkCommandBuffer commandBuffer, uint32_t commandBufferCount, const VkCommandBuffer *pCommandBuffers) { - PVR_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); + VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); struct pvr_cmd_buffer_state *state = &cmd_buffer->state; struct pvr_cmd_buffer *last_cmd_buffer; VkResult result; @@ -7323,7 +7323,7 @@ void pvr_CmdExecuteCommands(VkCommandBuffer commandBuffer, if (state->current_sub_cmd && state->current_sub_cmd->type == PVR_SUB_CMD_TYPE_GRAPHICS) { for (uint32_t i = 0; i < commandBufferCount; i++) { - PVR_FROM_HANDLE(pvr_cmd_buffer, sec_cmd_buffer, pCommandBuffers[i]); + VK_FROM_HANDLE(pvr_cmd_buffer, sec_cmd_buffer, pCommandBuffers[i]); assert(sec_cmd_buffer->vk.level == VK_COMMAND_BUFFER_LEVEL_SECONDARY); @@ -7343,7 +7343,7 @@ void pvr_CmdExecuteCommands(VkCommandBuffer commandBuffer, } } else { for (uint32_t i = 0; i < commandBufferCount; i++) { - PVR_FROM_HANDLE(pvr_cmd_buffer, sec_cmd_buffer, pCommandBuffers[i]); + VK_FROM_HANDLE(pvr_cmd_buffer, sec_cmd_buffer, pCommandBuffers[i]); assert(sec_cmd_buffer->vk.level == VK_COMMAND_BUFFER_LEVEL_SECONDARY); @@ -7422,7 +7422,7 @@ void pvr_CmdNextSubpass2(VkCommandBuffer commandBuffer, const VkSubpassBeginInfo *pSubpassBeginInfo, const VkSubpassEndInfo *pSubpassEndInfo) { - PVR_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); + VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); struct pvr_cmd_buffer_state *state = &cmd_buffer->state; struct pvr_render_pass_info *rp_info = &state->render_pass_info; const struct pvr_renderpass_hwsetup_subpass *hw_subpass; @@ -7602,7 +7602,7 @@ static bool pvr_is_stencil_store_load_needed( } for (uint32_t i = 0; i < image_barrier_count; i++) { - PVR_FROM_HANDLE(pvr_image, image, image_barriers[i].image); + VK_FROM_HANDLE(pvr_image, image, image_barriers[i].image); const uint32_t stencil_bit = VK_IMAGE_ASPECT_STENCIL_BIT; if (!(image_barriers[i].subresourceRange.aspectMask & stencil_bit)) @@ -7687,7 +7687,7 @@ pvr_cmd_buffer_insert_barrier_event(struct pvr_cmd_buffer *cmd_buffer, void pvr_CmdPipelineBarrier2(VkCommandBuffer commandBuffer, const VkDependencyInfo *pDependencyInfo) { - PVR_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); + VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); struct pvr_cmd_buffer_state *const state = &cmd_buffer->state; const struct pvr_render_pass *const render_pass = state->render_pass_info.pass; @@ -7827,8 +7827,8 @@ void pvr_CmdResetEvent2(VkCommandBuffer commandBuffer, VkEvent _event, VkPipelineStageFlags2 stageMask) { - PVR_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); - PVR_FROM_HANDLE(pvr_event, event, _event); + VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); + VK_FROM_HANDLE(pvr_event, event, _event); VkResult result; PVR_CHECK_COMMAND_BUFFER_BUILDING_STATE(cmd_buffer); @@ -7852,8 +7852,8 @@ void pvr_CmdSetEvent2(VkCommandBuffer commandBuffer, VkEvent _event, const VkDependencyInfo *pDependencyInfo) { - PVR_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); - PVR_FROM_HANDLE(pvr_event, event, _event); + VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); + VK_FROM_HANDLE(pvr_event, event, _event); VkPipelineStageFlags2 stage_mask = 0; VkResult result; @@ -7888,7 +7888,7 @@ void pvr_CmdWaitEvents2(VkCommandBuffer commandBuffer, const VkEvent *pEvents, const VkDependencyInfo *pDependencyInfos) { - PVR_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); + VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); struct pvr_event **events_array; uint32_t *stage_masks; VkResult result; @@ -7952,7 +7952,7 @@ void pvr_CmdWriteTimestamp2(VkCommandBuffer commandBuffer, VkResult pvr_EndCommandBuffer(VkCommandBuffer commandBuffer) { - PVR_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); + VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); struct pvr_cmd_buffer_state *state = &cmd_buffer->state; VkResult result; diff --git a/src/imagination/vulkan/pvr_descriptor_set.c b/src/imagination/vulkan/pvr_descriptor_set.c index 3a94ba21d3d..ed9b08bf7bc 100644 --- a/src/imagination/vulkan/pvr_descriptor_set.c +++ b/src/imagination/vulkan/pvr_descriptor_set.c @@ -108,7 +108,7 @@ VkResult pvr_CreateDescriptorSetLayout( const VkAllocationCallbacks *pAllocator, VkDescriptorSetLayout *pSetLayout) { - PVR_FROM_HANDLE(pvr_device, device, _device); + VK_FROM_HANDLE(pvr_device, device, _device); VkDescriptorSetLayoutBinding *bindings; uint32_t binding_count = 0; uint32_t immutable_sampler_count = 0; @@ -249,7 +249,7 @@ VkResult pvr_CreateDescriptorPool(VkDevice _device, const VkAllocationCallbacks *pAllocator, VkDescriptorPool *pDescriptorPool) { - PVR_FROM_HANDLE(pvr_device, device, _device); + VK_FROM_HANDLE(pvr_device, device, _device); const uint32_t cache_line_size = rogue_get_slc_cache_line_size(&device->pdevice->dev_info); struct pvr_descriptor_pool *pool; @@ -350,8 +350,8 @@ void pvr_DestroyDescriptorPool(VkDevice _device, VkDescriptorPool _pool, const VkAllocationCallbacks *pAllocator) { - PVR_FROM_HANDLE(pvr_device, device, _device); - PVR_FROM_HANDLE(pvr_descriptor_pool, pool, _pool); + VK_FROM_HANDLE(pvr_device, device, _device); + VK_FROM_HANDLE(pvr_descriptor_pool, pool, _pool); if (!pool) return; @@ -373,8 +373,8 @@ VkResult pvr_ResetDescriptorPool(VkDevice _device, VkDescriptorPool descriptorPool, VkDescriptorPoolResetFlags flags) { - PVR_FROM_HANDLE(pvr_descriptor_pool, pool, descriptorPool); - PVR_FROM_HANDLE(pvr_device, device, _device); + VK_FROM_HANDLE(pvr_descriptor_pool, pool, descriptorPool); + VK_FROM_HANDLE(pvr_device, device, _device); list_for_each_entry_safe (struct pvr_descriptor_set, set, @@ -456,8 +456,8 @@ pvr_AllocateDescriptorSets(VkDevice _device, const VkDescriptorSetAllocateInfo *pAllocateInfo, VkDescriptorSet *pDescriptorSets) { - PVR_FROM_HANDLE(pvr_descriptor_pool, pool, pAllocateInfo->descriptorPool); - PVR_FROM_HANDLE(pvr_device, device, _device); + VK_FROM_HANDLE(pvr_descriptor_pool, pool, pAllocateInfo->descriptorPool); + VK_FROM_HANDLE(pvr_device, device, _device); VkResult result; uint32_t i; @@ -466,7 +466,7 @@ pvr_AllocateDescriptorSets(VkDevice _device, } for (i = 0; i < pAllocateInfo->descriptorSetCount; i++) { - PVR_FROM_HANDLE(pvr_descriptor_set_layout, + VK_FROM_HANDLE(pvr_descriptor_set_layout, layout, pAllocateInfo->pSetLayouts[i]); struct pvr_descriptor_set *set; @@ -497,8 +497,8 @@ VkResult pvr_FreeDescriptorSets(VkDevice _device, uint32_t count, const VkDescriptorSet *pDescriptorSets) { - PVR_FROM_HANDLE(pvr_descriptor_pool, pool, descriptorPool); - PVR_FROM_HANDLE(pvr_device, device, _device); + VK_FROM_HANDLE(pvr_descriptor_pool, pool, descriptorPool); + VK_FROM_HANDLE(pvr_device, device, _device); for (uint32_t i = 0; i < count; i++) { struct pvr_descriptor_set *set; @@ -573,7 +573,7 @@ write_sampler(const struct pvr_descriptor_set *set, sampler = binding->immutable_samplers[elem]; } else { assert(image_info); - PVR_FROM_HANDLE(pvr_sampler, info_sampler, image_info->sampler); + VK_FROM_HANDLE(pvr_sampler, info_sampler, image_info->sampler); sampler = info_sampler; } @@ -587,8 +587,8 @@ write_image_sampler(const struct pvr_descriptor_set *set, const struct pvr_descriptor_set_layout_binding *binding, uint32_t elem) { - PVR_FROM_HANDLE(pvr_sampler, info_sampler, image_info->sampler); - PVR_FROM_HANDLE(pvr_image_view, image_view, image_info->imageView); + VK_FROM_HANDLE(pvr_sampler, info_sampler, image_info->sampler); + VK_FROM_HANDLE(pvr_image_view, image_view, image_info->imageView); const unsigned desc_offset = binding->offset + (elem * binding->stride); void *desc_mapping = (uint8_t *)set->mapping + desc_offset; @@ -611,7 +611,7 @@ write_input_attachment(const struct pvr_descriptor_set *set, const struct pvr_descriptor_set_layout_binding *binding, uint32_t elem) { - PVR_FROM_HANDLE(pvr_image_view, image_view, image_info->imageView); + VK_FROM_HANDLE(pvr_image_view, image_view, image_info->imageView); const unsigned desc_offset = binding->offset + (elem * binding->stride); void *desc_mapping = (uint8_t *)set->mapping + desc_offset; @@ -629,7 +629,7 @@ write_sampled_image(const struct pvr_descriptor_set *set, uint32_t elem, const struct pvr_device_info *dev_info) { - PVR_FROM_HANDLE(pvr_image_view, image_view, image_info->imageView); + VK_FROM_HANDLE(pvr_image_view, image_view, image_info->imageView); const unsigned desc_offset = binding->offset + (elem * binding->stride); void *desc_mapping = (uint8_t *)set->mapping + desc_offset; @@ -647,7 +647,7 @@ write_storage_image(const struct pvr_descriptor_set *set, uint32_t elem, const struct pvr_device_info *dev_info) { - PVR_FROM_HANDLE(pvr_image_view, image_view, image_info->imageView); + VK_FROM_HANDLE(pvr_image_view, image_view, image_info->imageView); bool is_cube = image_view->vk.view_type == VK_IMAGE_VIEW_TYPE_CUBE || image_view->vk.view_type == VK_IMAGE_VIEW_TYPE_CUBE_ARRAY; @@ -680,7 +680,7 @@ write_buffer_view(const struct pvr_descriptor_set *set, bool is_texel_buffer, const struct pvr_device_info *dev_info) { - PVR_FROM_HANDLE(pvr_buffer_view, buffer_view, _buffer_view); + VK_FROM_HANDLE(pvr_buffer_view, buffer_view, _buffer_view); const unsigned desc_offset = binding->offset + (elem * binding->stride); void *desc_mapping = (uint8_t *)set->mapping + desc_offset; @@ -707,12 +707,12 @@ void pvr_UpdateDescriptorSets(VkDevice _device, uint32_t descriptorCopyCount, const VkCopyDescriptorSet *pDescriptorCopies) { - PVR_FROM_HANDLE(pvr_device, device, _device); + VK_FROM_HANDLE(pvr_device, device, _device); const struct pvr_device_info *dev_info = &device->pdevice->dev_info; for (uint32_t i = 0; i < descriptorWriteCount; i++) { const VkWriteDescriptorSet *write = &pDescriptorWrites[i]; - PVR_FROM_HANDLE(pvr_descriptor_set, set, write->dstSet); + VK_FROM_HANDLE(pvr_descriptor_set, set, write->dstSet); const struct pvr_descriptor_set_layout *layout = set->layout; const struct pvr_descriptor_set_layout_binding *binding; @@ -814,8 +814,8 @@ void pvr_UpdateDescriptorSets(VkDevice _device, for (uint32_t i = 0; i < descriptorCopyCount; i++) { const VkCopyDescriptorSet *copy = &pDescriptorCopies[i]; - PVR_FROM_HANDLE(pvr_descriptor_set, src_set, copy->srcSet); - PVR_FROM_HANDLE(pvr_descriptor_set, dst_set, copy->dstSet); + VK_FROM_HANDLE(pvr_descriptor_set, src_set, copy->srcSet); + VK_FROM_HANDLE(pvr_descriptor_set, dst_set, copy->dstSet); const struct pvr_descriptor_set_layout *src_layout = src_set->layout; const struct pvr_descriptor_set_layout *dst_layout = dst_set->layout; @@ -889,11 +889,11 @@ void pvr_UpdateDescriptorSetWithTemplate( VkDescriptorUpdateTemplate descriptorUpdateTemplate, const void *pData) { - PVR_FROM_HANDLE(pvr_device, device, _device); + VK_FROM_HANDLE(pvr_device, device, _device); VK_FROM_HANDLE(vk_descriptor_update_template, template, descriptorUpdateTemplate); - PVR_FROM_HANDLE(pvr_descriptor_set, set, descriptorSet); + VK_FROM_HANDLE(pvr_descriptor_set, set, descriptorSet); const struct pvr_device_info *dev_info = &device->pdevice->dev_info; diff --git a/src/imagination/vulkan/pvr_device.c b/src/imagination/vulkan/pvr_device.c index 488ec0c8335..42488d9153a 100644 --- a/src/imagination/vulkan/pvr_device.c +++ b/src/imagination/vulkan/pvr_device.c @@ -746,7 +746,7 @@ static void pvr_physical_device_destroy(struct vk_physical_device *vk_pdevice) void pvr_DestroyInstance(VkInstance _instance, const VkAllocationCallbacks *pAllocator) { - PVR_FROM_HANDLE(pvr_instance, instance, _instance); + VK_FROM_HANDLE(pvr_instance, instance, _instance); if (!instance) return; @@ -1422,7 +1422,7 @@ void pvr_GetPhysicalDeviceMemoryProperties2( VkPhysicalDevice physicalDevice, VkPhysicalDeviceMemoryProperties2 *pMemoryProperties) { - PVR_FROM_HANDLE(pvr_physical_device, pdevice, physicalDevice); + VK_FROM_HANDLE(pvr_physical_device, pdevice, physicalDevice); pMemoryProperties->memoryProperties = pdevice->memory; @@ -1437,7 +1437,7 @@ PFN_vkVoidFunction pvr_GetInstanceProcAddr(VkInstance _instance, const struct vk_instance *vk_instance = NULL; if (_instance != NULL) { - PVR_FROM_HANDLE(pvr_instance, instance, _instance); + VK_FROM_HANDLE(pvr_instance, instance, _instance); vk_instance = &instance->vk; } @@ -1993,7 +1993,7 @@ VkResult pvr_CreateDevice(VkPhysicalDevice physicalDevice, const VkAllocationCallbacks *pAllocator, VkDevice *pDevice) { - PVR_FROM_HANDLE(pvr_physical_device, pdevice, physicalDevice); + VK_FROM_HANDLE(pvr_physical_device, pdevice, physicalDevice); uint32_t initial_free_list_size = PVR_GLOBAL_FREE_LIST_INITIAL_SIZE; struct pvr_instance *instance = pdevice->instance; struct vk_device_dispatch_table dispatch_table; @@ -2213,7 +2213,7 @@ err_out: void pvr_DestroyDevice(VkDevice _device, const VkAllocationCallbacks *pAllocator) { - PVR_FROM_HANDLE(pvr_device, device, _device); + VK_FROM_HANDLE(pvr_device, device, _device); if (!device) return; @@ -2261,7 +2261,7 @@ VkResult pvr_AllocateMemory(VkDevice _device, VkDeviceMemory *pMem) { const VkImportMemoryFdInfoKHR *fd_info = NULL; - PVR_FROM_HANDLE(pvr_device, device, _device); + VK_FROM_HANDLE(pvr_device, device, _device); enum pvr_winsys_bo_type type = PVR_WINSYS_BO_TYPE_GPU; struct pvr_device_memory *mem; VkResult result; @@ -2382,8 +2382,8 @@ VkResult pvr_GetMemoryFdKHR(VkDevice _device, const VkMemoryGetFdInfoKHR *pGetFdInfo, int *pFd) { - PVR_FROM_HANDLE(pvr_device, device, _device); - PVR_FROM_HANDLE(pvr_device_memory, mem, pGetFdInfo->memory); + VK_FROM_HANDLE(pvr_device, device, _device); + VK_FROM_HANDLE(pvr_device_memory, mem, pGetFdInfo->memory); assert(pGetFdInfo->sType == VK_STRUCTURE_TYPE_MEMORY_GET_FD_INFO_KHR); @@ -2400,7 +2400,7 @@ pvr_GetMemoryFdPropertiesKHR(VkDevice _device, int fd, VkMemoryFdPropertiesKHR *pMemoryFdProperties) { - PVR_FROM_HANDLE(pvr_device, device, _device); + VK_FROM_HANDLE(pvr_device, device, _device); switch (handleType) { case VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT: @@ -2423,8 +2423,8 @@ void pvr_FreeMemory(VkDevice _device, VkDeviceMemory _mem, const VkAllocationCallbacks *pAllocator) { - PVR_FROM_HANDLE(pvr_device, device, _device); - PVR_FROM_HANDLE(pvr_device_memory, mem, _mem); + VK_FROM_HANDLE(pvr_device, device, _device); + VK_FROM_HANDLE(pvr_device_memory, mem, _mem); if (!mem) return; @@ -2448,8 +2448,8 @@ VkResult pvr_MapMemory(VkDevice _device, VkMemoryMapFlags flags, void **ppData) { - PVR_FROM_HANDLE(pvr_device, device, _device); - PVR_FROM_HANDLE(pvr_device_memory, mem, _memory); + VK_FROM_HANDLE(pvr_device, device, _device); + VK_FROM_HANDLE(pvr_device_memory, mem, _memory); VkResult result; if (!mem) { @@ -2489,8 +2489,8 @@ VkResult pvr_MapMemory(VkDevice _device, void pvr_UnmapMemory(VkDevice _device, VkDeviceMemory _memory) { - PVR_FROM_HANDLE(pvr_device, device, _device); - PVR_FROM_HANDLE(pvr_device_memory, mem, _memory); + VK_FROM_HANDLE(pvr_device, device, _device); + VK_FROM_HANDLE(pvr_device_memory, mem, _memory); if (!mem || !mem->bo->map) return; @@ -2589,12 +2589,12 @@ VkResult pvr_BindBufferMemory2(VkDevice _device, uint32_t bindInfoCount, const VkBindBufferMemoryInfo *pBindInfos) { - PVR_FROM_HANDLE(pvr_device, device, _device); + VK_FROM_HANDLE(pvr_device, device, _device); uint32_t i; for (i = 0; i < bindInfoCount; i++) { - PVR_FROM_HANDLE(pvr_device_memory, mem, pBindInfos[i].memory); - PVR_FROM_HANDLE(pvr_buffer, buffer, pBindInfos[i].buffer); + VK_FROM_HANDLE(pvr_device_memory, mem, pBindInfos[i].memory); + VK_FROM_HANDLE(pvr_buffer, buffer, pBindInfos[i].buffer); VkResult result = pvr_bind_memory(device, mem, @@ -2605,7 +2605,7 @@ VkResult pvr_BindBufferMemory2(VkDevice _device, &buffer->dev_addr); if (result != VK_SUCCESS) { while (i--) { - PVR_FROM_HANDLE(pvr_buffer, buffer, pBindInfos[i].buffer); + VK_FROM_HANDLE(pvr_buffer, buffer, pBindInfos[i].buffer); pvr_unbind_memory(device, buffer->vma); } @@ -2631,7 +2631,7 @@ VkResult pvr_CreateEvent(VkDevice _device, const VkAllocationCallbacks *pAllocator, VkEvent *pEvent) { - PVR_FROM_HANDLE(pvr_device, device, _device); + VK_FROM_HANDLE(pvr_device, device, _device); struct pvr_event *event = vk_object_alloc(&device->vk, pAllocator, @@ -2652,8 +2652,8 @@ void pvr_DestroyEvent(VkDevice _device, VkEvent _event, const VkAllocationCallbacks *pAllocator) { - PVR_FROM_HANDLE(pvr_device, device, _device); - PVR_FROM_HANDLE(pvr_event, event, _event); + VK_FROM_HANDLE(pvr_device, device, _device); + VK_FROM_HANDLE(pvr_event, event, _event); if (!event) return; @@ -2666,8 +2666,8 @@ void pvr_DestroyEvent(VkDevice _device, VkResult pvr_GetEventStatus(VkDevice _device, VkEvent _event) { - PVR_FROM_HANDLE(pvr_device, device, _device); - PVR_FROM_HANDLE(pvr_event, event, _event); + VK_FROM_HANDLE(pvr_device, device, _device); + VK_FROM_HANDLE(pvr_event, event, _event); VkResult result; switch (event->state) { @@ -2706,10 +2706,10 @@ VkResult pvr_GetEventStatus(VkDevice _device, VkEvent _event) VkResult pvr_SetEvent(VkDevice _device, VkEvent _event) { - PVR_FROM_HANDLE(pvr_event, event, _event); + VK_FROM_HANDLE(pvr_event, event, _event); if (event->sync) { - PVR_FROM_HANDLE(pvr_device, device, _device); + VK_FROM_HANDLE(pvr_device, device, _device); const VkResult result = vk_sync_signal(&device->vk, event->sync, 0); if (result != VK_SUCCESS) @@ -2723,10 +2723,10 @@ VkResult pvr_SetEvent(VkDevice _device, VkEvent _event) VkResult pvr_ResetEvent(VkDevice _device, VkEvent _event) { - PVR_FROM_HANDLE(pvr_event, event, _event); + VK_FROM_HANDLE(pvr_event, event, _event); if (event->sync) { - PVR_FROM_HANDLE(pvr_device, device, _device); + VK_FROM_HANDLE(pvr_device, device, _device); const VkResult result = vk_sync_reset(&device->vk, event->sync); if (result != VK_SUCCESS) @@ -2745,7 +2745,7 @@ VkResult pvr_CreateBuffer(VkDevice _device, const VkAllocationCallbacks *pAllocator, VkBuffer *pBuffer) { - PVR_FROM_HANDLE(pvr_device, device, _device); + VK_FROM_HANDLE(pvr_device, device, _device); const uint32_t alignment = 4096; struct pvr_buffer *buffer; @@ -2772,8 +2772,8 @@ void pvr_DestroyBuffer(VkDevice _device, VkBuffer _buffer, const VkAllocationCallbacks *pAllocator) { - PVR_FROM_HANDLE(pvr_device, device, _device); - PVR_FROM_HANDLE(pvr_buffer, buffer, _buffer); + VK_FROM_HANDLE(pvr_device, device, _device); + VK_FROM_HANDLE(pvr_buffer, buffer, _buffer); if (!buffer) return; @@ -3024,8 +3024,8 @@ VkResult pvr_CreateFramebuffer(VkDevice _device, const VkAllocationCallbacks *pAllocator, VkFramebuffer *pFramebuffer) { - PVR_FROM_HANDLE(pvr_render_pass, pass, pCreateInfo->renderPass); - PVR_FROM_HANDLE(pvr_device, device, _device); + VK_FROM_HANDLE(pvr_render_pass, pass, pCreateInfo->renderPass); + VK_FROM_HANDLE(pvr_device, device, _device); const VkFramebufferAttachmentsCreateInfoKHR *pImageless; struct pvr_spm_bgobj_state *spm_bgobj_state_per_render; struct pvr_spm_eot_state *spm_eot_state_per_render; @@ -3169,8 +3169,8 @@ void pvr_DestroyFramebuffer(VkDevice _device, VkFramebuffer _fb, const VkAllocationCallbacks *pAllocator) { - PVR_FROM_HANDLE(pvr_framebuffer, framebuffer, _fb); - PVR_FROM_HANDLE(pvr_device, device, _device); + VK_FROM_HANDLE(pvr_framebuffer, framebuffer, _fb); + VK_FROM_HANDLE(pvr_device, device, _device); if (!framebuffer) return; @@ -3229,7 +3229,7 @@ VkResult pvr_CreateSampler(VkDevice _device, const VkAllocationCallbacks *pAllocator, VkSampler *pSampler) { - PVR_FROM_HANDLE(pvr_device, device, _device); + VK_FROM_HANDLE(pvr_device, device, _device); struct pvr_sampler *sampler; float lod_rounding_bias; VkFilter min_filter; @@ -3393,8 +3393,8 @@ void pvr_DestroySampler(VkDevice _device, VkSampler _sampler, const VkAllocationCallbacks *pAllocator) { - PVR_FROM_HANDLE(pvr_device, device, _device); - PVR_FROM_HANDLE(pvr_sampler, sampler, _sampler); + VK_FROM_HANDLE(pvr_device, device, _device); + VK_FROM_HANDLE(pvr_sampler, sampler, _sampler); if (!sampler) return; @@ -3410,8 +3410,8 @@ void pvr_GetBufferMemoryRequirements2( const VkBufferMemoryRequirementsInfo2 *pInfo, VkMemoryRequirements2 *pMemoryRequirements) { - PVR_FROM_HANDLE(pvr_buffer, buffer, pInfo->buffer); - PVR_FROM_HANDLE(pvr_device, device, _device); + VK_FROM_HANDLE(pvr_buffer, buffer, pInfo->buffer); + VK_FROM_HANDLE(pvr_device, device, _device); uint64_t size; /* The Vulkan 1.0.166 spec says: @@ -3448,8 +3448,8 @@ void pvr_GetImageMemoryRequirements2(VkDevice _device, const VkImageMemoryRequirementsInfo2 *pInfo, VkMemoryRequirements2 *pMemoryRequirements) { - PVR_FROM_HANDLE(pvr_device, device, _device); - PVR_FROM_HANDLE(pvr_image, image, pInfo->image); + VK_FROM_HANDLE(pvr_device, device, _device); + VK_FROM_HANDLE(pvr_image, image, pInfo->image); /* The Vulkan 1.0.166 spec says: * diff --git a/src/imagination/vulkan/pvr_formats.c b/src/imagination/vulkan/pvr_formats.c index 6219633826f..b1ada5822e3 100644 --- a/src/imagination/vulkan/pvr_formats.c +++ b/src/imagination/vulkan/pvr_formats.c @@ -1082,7 +1082,7 @@ VkResult pvr_GetPhysicalDeviceImageFormatProperties2( VkImageFormatProperties2 *pImageFormatProperties) { const VkPhysicalDeviceExternalImageFormatInfo *external_info = NULL; - PVR_FROM_HANDLE(pvr_physical_device, pdevice, physicalDevice); + VK_FROM_HANDLE(pvr_physical_device, pdevice, physicalDevice); VkExternalImageFormatProperties *external_props = NULL; VkResult result; diff --git a/src/imagination/vulkan/pvr_image.c b/src/imagination/vulkan/pvr_image.c index ebbf032e565..7b08050af1e 100644 --- a/src/imagination/vulkan/pvr_image.c +++ b/src/imagination/vulkan/pvr_image.c @@ -152,7 +152,7 @@ VkResult pvr_CreateImage(VkDevice _device, const VkAllocationCallbacks *pAllocator, VkImage *pImage) { - PVR_FROM_HANDLE(pvr_device, device, _device); + VK_FROM_HANDLE(pvr_device, device, _device); struct pvr_image *image; image = @@ -179,8 +179,8 @@ void pvr_DestroyImage(VkDevice _device, VkImage _image, const VkAllocationCallbacks *pAllocator) { - PVR_FROM_HANDLE(pvr_device, device, _device); - PVR_FROM_HANDLE(pvr_image, image, _image); + VK_FROM_HANDLE(pvr_device, device, _device); + VK_FROM_HANDLE(pvr_image, image, _image); if (!image) return; @@ -227,12 +227,12 @@ VkResult pvr_BindImageMemory2(VkDevice _device, uint32_t bindInfoCount, const VkBindImageMemoryInfo *pBindInfos) { - PVR_FROM_HANDLE(pvr_device, device, _device); + VK_FROM_HANDLE(pvr_device, device, _device); uint32_t i; for (i = 0; i < bindInfoCount; i++) { - PVR_FROM_HANDLE(pvr_device_memory, mem, pBindInfos[i].memory); - PVR_FROM_HANDLE(pvr_image, image, pBindInfos[i].image); + VK_FROM_HANDLE(pvr_device_memory, mem, pBindInfos[i].memory); + VK_FROM_HANDLE(pvr_image, image, pBindInfos[i].image); VkResult result = pvr_bind_memory(device, mem, @@ -243,7 +243,7 @@ VkResult pvr_BindImageMemory2(VkDevice _device, &image->dev_addr); if (result != VK_SUCCESS) { while (i--) { - PVR_FROM_HANDLE(pvr_image, image, pBindInfos[i].image); + VK_FROM_HANDLE(pvr_image, image, pBindInfos[i].image); pvr_unbind_memory(device, image->vma); } @@ -278,7 +278,7 @@ void pvr_GetImageSubresourceLayout(VkDevice device, const VkImageSubresource *subresource, VkSubresourceLayout *layout) { - PVR_FROM_HANDLE(pvr_image, image, _image); + VK_FROM_HANDLE(pvr_image, image, _image); pvr_get_image_subresource_layout(image, subresource, layout); } @@ -311,7 +311,7 @@ VkResult pvr_CreateImageView(VkDevice _device, const VkAllocationCallbacks *pAllocator, VkImageView *pView) { - PVR_FROM_HANDLE(pvr_device, device, _device); + VK_FROM_HANDLE(pvr_device, device, _device); struct pvr_texture_state_info info = { 0 }; unsigned char input_swizzle[4]; const uint8_t *format_swizzle; @@ -451,8 +451,8 @@ void pvr_DestroyImageView(VkDevice _device, VkImageView _iview, const VkAllocationCallbacks *pAllocator) { - PVR_FROM_HANDLE(pvr_device, device, _device); - PVR_FROM_HANDLE(pvr_image_view, iview, _iview); + VK_FROM_HANDLE(pvr_device, device, _device); + VK_FROM_HANDLE(pvr_image_view, iview, _iview); if (!iview) return; @@ -465,8 +465,8 @@ VkResult pvr_CreateBufferView(VkDevice _device, const VkAllocationCallbacks *pAllocator, VkBufferView *pView) { - PVR_FROM_HANDLE(pvr_buffer, buffer, pCreateInfo->buffer); - PVR_FROM_HANDLE(pvr_device, device, _device); + VK_FROM_HANDLE(pvr_buffer, buffer, pCreateInfo->buffer); + VK_FROM_HANDLE(pvr_device, device, _device); struct pvr_texture_state_info info = { 0 }; const uint8_t *format_swizzle; struct pvr_buffer_view *bview; @@ -533,8 +533,8 @@ void pvr_DestroyBufferView(VkDevice _device, VkBufferView bufferView, const VkAllocationCallbacks *pAllocator) { - PVR_FROM_HANDLE(pvr_buffer_view, bview, bufferView); - PVR_FROM_HANDLE(pvr_device, device, _device); + VK_FROM_HANDLE(pvr_buffer_view, bview, bufferView); + VK_FROM_HANDLE(pvr_device, device, _device); if (!bview) return; diff --git a/src/imagination/vulkan/pvr_pass.c b/src/imagination/vulkan/pvr_pass.c index 8c01ea80023..f64467b3f95 100644 --- a/src/imagination/vulkan/pvr_pass.c +++ b/src/imagination/vulkan/pvr_pass.c @@ -551,7 +551,7 @@ VkResult pvr_CreateRenderPass2(VkDevice _device, VkRenderPass *pRenderPass) { struct pvr_render_pass_attachment *attachments; - PVR_FROM_HANDLE(pvr_device, device, _device); + VK_FROM_HANDLE(pvr_device, device, _device); const struct pvr_device_info *dev_info = &device->pdevice->dev_info; struct pvr_render_subpass *subpasses; const VkAllocationCallbacks *alloc; @@ -807,8 +807,8 @@ void pvr_DestroyRenderPass(VkDevice _device, VkRenderPass _pass, const VkAllocationCallbacks *pAllocator) { - PVR_FROM_HANDLE(pvr_device, device, _device); - PVR_FROM_HANDLE(pvr_render_pass, pass, _pass); + VK_FROM_HANDLE(pvr_device, device, _device); + VK_FROM_HANDLE(pvr_render_pass, pass, _pass); const VkAllocationCallbacks *allocator = pAllocator ? pAllocator : &device->vk.alloc; @@ -825,7 +825,7 @@ void pvr_GetRenderAreaGranularity(VkDevice _device, VkRenderPass renderPass, VkExtent2D *pGranularity) { - PVR_FROM_HANDLE(pvr_device, device, _device); + VK_FROM_HANDLE(pvr_device, device, _device); const struct pvr_device_info *dev_info = &device->pdevice->dev_info; /* Granularity does not depend on any settings in the render pass, so return diff --git a/src/imagination/vulkan/pvr_pipeline.c b/src/imagination/vulkan/pvr_pipeline.c index a50da2bcc37..d0c8ee7bc69 100644 --- a/src/imagination/vulkan/pvr_pipeline.c +++ b/src/imagination/vulkan/pvr_pipeline.c @@ -1186,7 +1186,7 @@ pvr_CreateComputePipelines(VkDevice _device, VkPipeline *pPipelines) { VK_FROM_HANDLE(vk_pipeline_cache, cache, pipelineCache); - PVR_FROM_HANDLE(pvr_device, device, _device); + VK_FROM_HANDLE(pvr_device, device, _device); VkResult result = VK_SUCCESS; for (uint32_t i = 0; i < createInfoCount; i++) { @@ -2461,7 +2461,7 @@ pvr_preprocess_shader_data(pco_data *data, } case MESA_SHADER_FRAGMENT: { - PVR_FROM_HANDLE(pvr_render_pass, pass, pGraphicsCreateInfo->renderPass); + VK_FROM_HANDLE(pvr_render_pass, pass, pGraphicsCreateInfo->renderPass); const struct pvr_render_subpass *const subpass = &pass->subpasses[pGraphicsCreateInfo->subpass]; const struct pvr_renderpass_hw_map *subpass_map = @@ -2529,7 +2529,7 @@ static void pvr_postprocess_shader_data(pco_data *data, } case MESA_SHADER_FRAGMENT: { - PVR_FROM_HANDLE(pvr_render_pass, pass, pGraphicsCreateInfo->renderPass); + VK_FROM_HANDLE(pvr_render_pass, pass, pGraphicsCreateInfo->renderPass); const struct pvr_render_subpass *const subpass = &pass->subpasses[pGraphicsCreateInfo->subpass]; const struct pvr_renderpass_hw_map *subpass_map = @@ -2799,7 +2799,7 @@ err_free_build_context: static struct vk_render_pass_state pvr_create_renderpass_state(const VkGraphicsPipelineCreateInfo *const info) { - PVR_FROM_HANDLE(pvr_render_pass, pass, info->renderPass); + VK_FROM_HANDLE(pvr_render_pass, pass, info->renderPass); const struct pvr_render_subpass *const subpass = &pass->subpasses[info->subpass]; @@ -2969,7 +2969,7 @@ pvr_CreateGraphicsPipelines(VkDevice _device, VkPipeline *pPipelines) { VK_FROM_HANDLE(vk_pipeline_cache, cache, pipelineCache); - PVR_FROM_HANDLE(pvr_device, device, _device); + VK_FROM_HANDLE(pvr_device, device, _device); VkResult result = VK_SUCCESS; for (uint32_t i = 0; i < createInfoCount; i++) { @@ -2996,8 +2996,8 @@ void pvr_DestroyPipeline(VkDevice _device, VkPipeline _pipeline, const VkAllocationCallbacks *pAllocator) { - PVR_FROM_HANDLE(pvr_pipeline, pipeline, _pipeline); - PVR_FROM_HANDLE(pvr_device, device, _device); + VK_FROM_HANDLE(pvr_pipeline, pipeline, _pipeline); + VK_FROM_HANDLE(pvr_device, device, _device); if (!pipeline) return; diff --git a/src/imagination/vulkan/pvr_private.h b/src/imagination/vulkan/pvr_private.h index 5d26ebb441c..ff1f9bdbda9 100644 --- a/src/imagination/vulkan/pvr_private.h +++ b/src/imagination/vulkan/pvr_private.h @@ -1435,9 +1435,6 @@ void pvr_reset_graphics_dirty_state(struct pvr_cmd_buffer *const cmd_buffer, const struct pvr_renderpass_hwsetup_subpass * pvr_get_hw_subpass(const struct pvr_render_pass *pass, const uint32_t subpass); -#define PVR_FROM_HANDLE(__pvr_type, __name, __handle) \ - VK_FROM_HANDLE(__pvr_type, __name, __handle) - VK_DEFINE_HANDLE_CASTS(pvr_cmd_buffer, vk.base, VkCommandBuffer, diff --git a/src/imagination/vulkan/pvr_query.c b/src/imagination/vulkan/pvr_query.c index 77c6f8b9a35..f8b65113eb6 100644 --- a/src/imagination/vulkan/pvr_query.c +++ b/src/imagination/vulkan/pvr_query.c @@ -44,7 +44,7 @@ VkResult pvr_CreateQueryPool(VkDevice _device, const VkAllocationCallbacks *pAllocator, VkQueryPool *pQueryPool) { - PVR_FROM_HANDLE(pvr_device, device, _device); + VK_FROM_HANDLE(pvr_device, device, _device); const uint32_t core_count = device->pdevice->dev_runtime_info.core_count; const uint32_t query_size = pCreateInfo->queryCount * sizeof(uint32_t); struct pvr_query_pool *pool; @@ -111,8 +111,8 @@ void pvr_DestroyQueryPool(VkDevice _device, VkQueryPool queryPool, const VkAllocationCallbacks *pAllocator) { - PVR_FROM_HANDLE(pvr_query_pool, pool, queryPool); - PVR_FROM_HANDLE(pvr_device, device, _device); + VK_FROM_HANDLE(pvr_query_pool, pool, queryPool); + VK_FROM_HANDLE(pvr_device, device, _device); if (!pool) return; @@ -197,8 +197,8 @@ VkResult pvr_GetQueryPoolResults(VkDevice _device, VkDeviceSize stride, VkQueryResultFlags flags) { - PVR_FROM_HANDLE(pvr_query_pool, pool, queryPool); - PVR_FROM_HANDLE(pvr_device, device, _device); + VK_FROM_HANDLE(pvr_query_pool, pool, queryPool); + VK_FROM_HANDLE(pvr_device, device, _device); VG(volatile uint32_t *available = pvr_bo_suballoc_get_map_addr(pool->availability_buffer)); volatile uint32_t *query_results = @@ -265,7 +265,7 @@ void pvr_CmdResetQueryPool(VkCommandBuffer commandBuffer, uint32_t firstQuery, uint32_t queryCount) { - PVR_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); + VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); struct pvr_query_info query_info; VkResult result; @@ -318,7 +318,7 @@ void pvr_ResetQueryPool(VkDevice _device, uint32_t firstQuery, uint32_t queryCount) { - PVR_FROM_HANDLE(pvr_query_pool, pool, queryPool); + VK_FROM_HANDLE(pvr_query_pool, pool, queryPool); uint32_t *availability = pvr_bo_suballoc_get_map_addr(pool->availability_buffer); @@ -334,7 +334,7 @@ void pvr_CmdCopyQueryPoolResults(VkCommandBuffer commandBuffer, VkDeviceSize stride, VkQueryResultFlags flags) { - PVR_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); + VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); struct pvr_query_info query_info; VkResult result; @@ -399,9 +399,9 @@ void pvr_CmdBeginQuery(VkCommandBuffer commandBuffer, uint32_t query, VkQueryControlFlags flags) { - PVR_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); + VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); struct pvr_cmd_buffer_state *state = &cmd_buffer->state; - PVR_FROM_HANDLE(pvr_query_pool, pool, queryPool); + VK_FROM_HANDLE(pvr_query_pool, pool, queryPool); PVR_CHECK_COMMAND_BUFFER_BUILDING_STATE(cmd_buffer); @@ -450,7 +450,7 @@ void pvr_CmdEndQuery(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query) { - PVR_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); + VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); struct pvr_cmd_buffer_state *state = &cmd_buffer->state; PVR_CHECK_COMMAND_BUFFER_BUILDING_STATE(cmd_buffer); diff --git a/src/imagination/vulkan/pvr_query_compute.c b/src/imagination/vulkan/pvr_query_compute.c index e253e42a71c..04071227cee 100644 --- a/src/imagination/vulkan/pvr_query_compute.c +++ b/src/imagination/vulkan/pvr_query_compute.c @@ -474,10 +474,10 @@ VkResult pvr_add_query_program(struct pvr_cmd_buffer *cmd_buffer, } case PVR_QUERY_TYPE_COPY_QUERY_RESULTS: { - PVR_FROM_HANDLE(pvr_query_pool, + VK_FROM_HANDLE(pvr_query_pool, pool, query_info->copy_query_results.query_pool); - PVR_FROM_HANDLE(pvr_buffer, + VK_FROM_HANDLE(pvr_buffer, buffer, query_info->copy_query_results.dst_buffer); @@ -522,7 +522,7 @@ VkResult pvr_add_query_program(struct pvr_cmd_buffer *cmd_buffer, } case PVR_QUERY_TYPE_RESET_QUERY_POOL: { - PVR_FROM_HANDLE(pvr_query_pool, + VK_FROM_HANDLE(pvr_query_pool, pool, query_info->reset_query_pool.query_pool); diff --git a/src/imagination/vulkan/pvr_wsi.c b/src/imagination/vulkan/pvr_wsi.c index a93e4b0e453..bb86e2a57b3 100644 --- a/src/imagination/vulkan/pvr_wsi.c +++ b/src/imagination/vulkan/pvr_wsi.c @@ -37,7 +37,7 @@ static PFN_vkVoidFunction pvr_wsi_proc_addr(VkPhysicalDevice physicalDevice, const char *pName) { - PVR_FROM_HANDLE(pvr_physical_device, pdevice, physicalDevice); + VK_FROM_HANDLE(pvr_physical_device, pdevice, physicalDevice); return vk_instance_get_proc_addr_unchecked(&pdevice->instance->vk, pName); } @@ -71,7 +71,7 @@ void pvr_wsi_finish(struct pvr_physical_device *pdevice) VkResult pvr_QueuePresentKHR(VkQueue _queue, const VkPresentInfoKHR *pPresentInfo) { - PVR_FROM_HANDLE(pvr_queue, queue, _queue); + VK_FROM_HANDLE(pvr_queue, queue, _queue); VkResult result; result = wsi_common_queue_present(&queue->device->pdevice->wsi_device,