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

pvr: Rename transfer 3D heap to transfer frag heap

Browse source 
This better matches the naming throughout the rest of the driver.

Signed-off-by: Matt Coster <matt.coster@imgtec.com>
Reviewed-by: Karmjit Mahil <Karmjit.Mahil@imgtec.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23872>
This commit is contained in:
Matt Coster 2022-08-18 16:21:38 +01:00 • committed by Marge Bot
parent a76818e525
commit 70f86b25a1
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/imagination/vulkan/pvr_cmd_buffer.c
View file

@ -2377,7 +2377,7 @@ VkResult pvr_cmd_buffer_alloc_mem(struct pvr_cmd_buffer *cmd_buffer,
allocator = &cmd_buffer->device->suballoc_general;
else if (heap == cmd_buffer->device->heaps.pds_heap)
allocator = &cmd_buffer->device->suballoc_pds;
else if (heap == cmd_buffer->device->heaps.transfer_3d_heap)
else if (heap == cmd_buffer->device->heaps.transfer_frag_heap)
allocator = &cmd_buffer->device->suballoc_transfer;
else if (heap == cmd_buffer->device->heaps.usc_heap)
allocator = &cmd_buffer->device->suballoc_usc;

4
src/imagination/vulkan/pvr_device.c
View file

@ -1808,7 +1808,7 @@ VkResult pvr_CreateDevice(VkPhysicalDevice physicalDevice,
device,
PVR_SUBALLOCATOR_PDS_SIZE);
pvr_bo_suballocator_init(&device->suballoc_transfer,
device->heaps.transfer_3d_heap,
device->heaps.transfer_frag_heap,
device,
PVR_SUBALLOCATOR_TRANSFER_SIZE);
pvr_bo_suballocator_init(&device->suballoc_usc,
@ -2535,7 +2535,7 @@ VkResult pvr_gpu_upload(struct pvr_device *device,
allocator = &device->suballoc_general;
else if (heap == device->heaps.pds_heap)
allocator = &device->suballoc_pds;
else if (heap == device->heaps.transfer_3d_heap)
else if (heap == device->heaps.transfer_frag_heap)
allocator = &device->suballoc_transfer;
else if (heap == device->heaps.usc_heap)
allocator = &device->suballoc_usc;

6
src/imagination/vulkan/pvr_job_transfer.c
View file

@ -3994,7 +3994,7 @@ static VkResult pvr_isp_ctrl_stream(const struct pvr_device_info *dev_info,
/* Allocate space for IPF control stream. */
result = pvr_cmd_buffer_alloc_mem(transfer_cmd->cmd_buffer,
ctx->device->heaps.transfer_3d_heap,
ctx->device->heaps.transfer_frag_heap,
total_stream_size,
&pvr_cs_bo);
if (result != VK_SUCCESS)
@ -4002,7 +4002,7 @@ static VkResult pvr_isp_ctrl_stream(const struct pvr_device_info *dev_info,
stream_base_vaddr =
PVR_DEV_ADDR(pvr_cs_bo->dev_addr.addr -
ctx->device->heaps.transfer_3d_heap->base_addr.addr);
ctx->device->heaps.transfer_frag_heap->base_addr.addr);
cs_ptr = pvr_bo_suballoc_get_map_addr(pvr_cs_bo);
blk_cs_ptr = cs_ptr + region_arrays_size / sizeof(uint32_t);
@ -4416,7 +4416,7 @@ static VkResult pvr_isp_ctrl_stream(const struct pvr_device_info *dev_info,
pvr_csb_pack (&regs->isp_mtile_base, CR_ISP_MTILE_BASE, reg) {
reg.addr =
PVR_DEV_ADDR(pvr_cs_bo->dev_addr.addr -
ctx->device->heaps.transfer_3d_heap->base_addr.addr);
ctx->device->heaps.transfer_frag_heap->base_addr.addr);
}
pvr_csb_pack (&regs->isp_render, CR_ISP_RENDER, reg) {

2
src/imagination/vulkan/winsys/pvr_winsys.h
View file

@ -50,7 +50,7 @@ struct pvr_winsys_heaps {
struct pvr_winsys_heap *general_heap;
struct pvr_winsys_heap *pds_heap;
struct pvr_winsys_heap *rgn_hdr_heap;
struct pvr_winsys_heap *transfer_3d_heap;
struct pvr_winsys_heap *transfer_frag_heap;
struct pvr_winsys_heap *usc_heap;
struct pvr_winsys_heap *vis_test_heap;
};

2
src/imagination/vulkan/winsys/pvrsrvkm/pvr_srv.c
View file

@ -617,7 +617,7 @@ static void pvr_srv_winsys_get_heaps_info(struct pvr_winsys *ws,
heaps->general_heap = &srv_ws->general_heap.base;
heaps->pds_heap = &srv_ws->pds_heap.base;
heaps->transfer_3d_heap = &srv_ws->transfer_3d_heap.base;
heaps->transfer_frag_heap = &srv_ws->transfer_3d_heap.base;
heaps->usc_heap = &srv_ws->usc_heap.base;
heaps->vis_test_heap = &srv_ws->vis_test_heap.base;