fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 05:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

pvr: use rogue-prefix for rogue-specific code

Browse source 
Acked-by: Frank Binns <frank.binns@imgtec.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38922>
This commit is contained in:
Erik Faye-Lund 2025-12-10 16:28:29 +01:00
parent 6ae6dd7db6
commit ba2c40cd03
2 changed files with 39 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/imagination/vulkan/meson.build
View file

@ -10,6 +10,7 @@ pvr_entrypoints = custom_target(
command : [ command : [
prog_python, '@INPUT0@', '--xml', '@INPUT1@', '--proto', '--weak', prog_python, '@INPUT0@', '--xml', '@INPUT1@', '--proto', '--weak',
'--out-h', '@OUTPUT0@', '--out-c', '@OUTPUT1@', '--prefix', 'pvr', '--out-h', '@OUTPUT0@', '--out-c', '@OUTPUT1@', '--prefix', 'pvr',
'--device-prefix', 'pvr_rogue',
'--beta', with_vulkan_beta.to_string() '--beta', with_vulkan_beta.to_string()
], ],
depend_files : vk_entrypoints_gen_depend_files, depend_files : vk_entrypoints_gen_depend_files,

75
src/imagination/vulkan/rogue/pvr_blit.c
View file

@ -225,8 +225,8 @@ static void pvr_setup_transfer_surface(struct pvr_device *device,
} }
} }
void pvr_CmdBlitImage2(VkCommandBuffer commandBuffer, void pvr_rogue_CmdBlitImage2(VkCommandBuffer commandBuffer,
const VkBlitImageInfo2 *pBlitImageInfo) const VkBlitImageInfo2 *pBlitImageInfo)
{ {
VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer);
VK_FROM_HANDLE(pvr_image, src, pBlitImageInfo->srcImage); VK_FROM_HANDLE(pvr_image, src, pBlitImageInfo->srcImage);
@ -744,8 +744,8 @@ static bool pvr_can_merge_ds_regions(const VkImageCopy2 *pRegionA,
return true; return true;
} }
void pvr_CmdCopyImage2(VkCommandBuffer commandBuffer, void pvr_rogue_CmdCopyImage2(VkCommandBuffer commandBuffer,
const VkCopyImageInfo2 *pCopyImageInfo) const VkCopyImageInfo2 *pCopyImageInfo)
{ {
VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer);
VK_FROM_HANDLE(pvr_image, src, pCopyImageInfo->srcImage); VK_FROM_HANDLE(pvr_image, src, pCopyImageInfo->srcImage);
@ -949,7 +949,7 @@ pvr_copy_buffer_to_image_region(struct pvr_cmd_buffer *const cmd_buffer,
flags); flags);
} }
void pvr_CmdCopyBufferToImage2( void pvr_rogue_CmdCopyBufferToImage2(
VkCommandBuffer commandBuffer, VkCommandBuffer commandBuffer,
const VkCopyBufferToImageInfo2 *pCopyBufferToImageInfo) const VkCopyBufferToImageInfo2 *pCopyBufferToImageInfo)
{ {
@ -1147,7 +1147,7 @@ pvr_copy_image_to_buffer_region(struct pvr_cmd_buffer *const cmd_buffer,
dst_format); dst_format);
} }
void pvr_CmdCopyImageToBuffer2( void pvr_rogue_CmdCopyImageToBuffer2(
VkCommandBuffer commandBuffer, VkCommandBuffer commandBuffer,
const VkCopyImageToBufferInfo2 *pCopyImageToBufferInfo) const VkCopyImageToBufferInfo2 *pCopyImageToBufferInfo)
{ {
@ -1245,12 +1245,12 @@ static VkResult pvr_clear_image_range(struct pvr_cmd_buffer *cmd_buffer,
return VK_SUCCESS; return VK_SUCCESS;
} }
void pvr_CmdClearColorImage(VkCommandBuffer commandBuffer, void pvr_rogue_CmdClearColorImage(VkCommandBuffer commandBuffer,
VkImage _image, VkImage _image,
VkImageLayout imageLayout, VkImageLayout imageLayout,
const VkClearColorValue *pColor, const VkClearColorValue *pColor,
uint32_t rangeCount, uint32_t rangeCount,
const VkImageSubresourceRange *pRanges) const VkImageSubresourceRange *pRanges)
{ {
VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer);
VK_FROM_HANDLE(pvr_image, image, _image); VK_FROM_HANDLE(pvr_image, image, _image);
@ -1297,12 +1297,13 @@ void pvr_clear_depth_stencil_image(struct pvr_cmd_buffer *cmd_buffer,
} }
} }
void pvr_CmdClearDepthStencilImage(VkCommandBuffer commandBuffer, void pvr_rogue_CmdClearDepthStencilImage(
VkImage _image, VkCommandBuffer commandBuffer,
VkImageLayout imageLayout, VkImage _image,
const VkClearDepthStencilValue *pDepthStencil, VkImageLayout imageLayout,
uint32_t rangeCount, const VkClearDepthStencilValue *pDepthStencil,
const VkImageSubresourceRange *pRanges) uint32_t rangeCount,
const VkImageSubresourceRange *pRanges)
{ {
VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer);
VK_FROM_HANDLE(pvr_image, image, _image); VK_FROM_HANDLE(pvr_image, image, _image);
@ -1418,11 +1419,11 @@ static VkResult pvr_cmd_copy_buffer_region(struct pvr_cmd_buffer *cmd_buffer,
return VK_SUCCESS; return VK_SUCCESS;
} }
void pvr_CmdUpdateBuffer(VkCommandBuffer commandBuffer, void pvr_rogue_CmdUpdateBuffer(VkCommandBuffer commandBuffer,
VkBuffer dstBuffer, VkBuffer dstBuffer,
VkDeviceSize dstOffset, VkDeviceSize dstOffset,
VkDeviceSize dataSize, VkDeviceSize dataSize,
const void *pData) const void *pData)
{ {
VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer);
VK_FROM_HANDLE(pvr_buffer, dst, dstBuffer); VK_FROM_HANDLE(pvr_buffer, dst, dstBuffer);
@ -1445,8 +1446,8 @@ void pvr_CmdUpdateBuffer(VkCommandBuffer commandBuffer,
false); false);
} }
void pvr_CmdCopyBuffer2(VkCommandBuffer commandBuffer, void pvr_rogue_CmdCopyBuffer2(VkCommandBuffer commandBuffer,
const VkCopyBufferInfo2 *pCopyBufferInfo) const VkCopyBufferInfo2 *pCopyBufferInfo)
{ {
VK_FROM_HANDLE(pvr_buffer, src, pCopyBufferInfo->srcBuffer); VK_FROM_HANDLE(pvr_buffer, src, pCopyBufferInfo->srcBuffer);
VK_FROM_HANDLE(pvr_buffer, dst, pCopyBufferInfo->dstBuffer); VK_FROM_HANDLE(pvr_buffer, dst, pCopyBufferInfo->dstBuffer);
@ -1469,11 +1470,11 @@ void pvr_CmdCopyBuffer2(VkCommandBuffer commandBuffer,
} }
} }
void pvr_CmdFillBuffer(VkCommandBuffer commandBuffer, void pvr_rogue_CmdFillBuffer(VkCommandBuffer commandBuffer,
VkBuffer dstBuffer, VkBuffer dstBuffer,
VkDeviceSize dstOffset, VkDeviceSize dstOffset,
VkDeviceSize fillSize, VkDeviceSize fillSize,
uint32_t data) uint32_t data)
{ {
VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer); VK_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer);
VK_FROM_HANDLE(pvr_buffer, dst, dstBuffer); VK_FROM_HANDLE(pvr_buffer, dst, dstBuffer);
@ -2284,11 +2285,11 @@ void pvr_clear_attachments_render_init(struct pvr_cmd_buffer *cmd_buffer,
pvr_clear_attachments(cmd_buffer, 1, attachment, 1, rect, true); pvr_clear_attachments(cmd_buffer, 1, attachment, 1, rect, true);
} }
void pvr_CmdClearAttachments(VkCommandBuffer commandBuffer, void pvr_rogue_CmdClearAttachments(VkCommandBuffer commandBuffer,
uint32_t attachmentCount, uint32_t attachmentCount,
const VkClearAttachment *pAttachments, const VkClearAttachment *pAttachments,
uint32_t rectCount, uint32_t rectCount,
const VkClearRect *pRects) const VkClearRect *pRects)
{ {
VK_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_state *state = &cmd_buffer->state;
@ -2361,8 +2362,8 @@ void pvr_CmdClearAttachments(VkCommandBuffer commandBuffer,
false); false);
} }
void pvr_CmdResolveImage2(VkCommandBuffer commandBuffer, void pvr_rogue_CmdResolveImage2(VkCommandBuffer commandBuffer,
const VkResolveImageInfo2 *pResolveImageInfo) const VkResolveImageInfo2 *pResolveImageInfo)
{ {
VK_FROM_HANDLE(pvr_image, src, pResolveImageInfo->srcImage); VK_FROM_HANDLE(pvr_image, src, pResolveImageInfo->srcImage);
VK_FROM_HANDLE(pvr_image, dst, pResolveImageInfo->dstImage); VK_FROM_HANDLE(pvr_image, dst, pResolveImageInfo->dstImage);