mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-01-10 14:40:13 +01:00
panvk: clang-format the source files
We recently stopped enforcing clang-format in CI, but we still want to be able to use it on new changes without pulling unrelated formatting changes. Let's run it one more time to fix the existing formatting issues. Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com> Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28104>
This commit is contained in:
Boris Brezillon
parent
2d2820349a
commit
43bb5acf26
2 changed files with 26 additions and 35 deletions
|
|
@ -31,9 +31,9 @@
|
|||
#include "decode.h"
|
||||
|
||||
#include "pan_encoder.h"
|
||||
#include "pan_util.h"
|
||||
#include "pan_props.h"
|
||||
#include "pan_samples.h"
|
||||
#include "pan_util.h"
|
||||
|
||||
#include "vk_cmd_enqueue_entrypoints.h"
|
||||
#include "vk_common_entrypoints.h"
|
||||
|
|
@ -323,8 +323,8 @@ panvk_destroy_physical_device(struct vk_physical_device *device)
|
|||
}
|
||||
|
||||
static void *
|
||||
panvk_kmod_zalloc(const struct pan_kmod_allocator *allocator,
|
||||
size_t size, bool transient)
|
||||
panvk_kmod_zalloc(const struct pan_kmod_allocator *allocator, size_t size,
|
||||
bool transient)
|
||||
{
|
||||
const VkAllocationCallbacks *vkalloc = allocator->priv;
|
||||
|
||||
|
|
@ -515,8 +515,7 @@ panvk_physical_device_init(struct panvk_physical_device *device,
|
|||
panvk_get_driver_uuid(&device->device_uuid);
|
||||
panvk_get_device_uuid(&device->device_uuid);
|
||||
|
||||
device->drm_syncobj_type =
|
||||
vk_drm_syncobj_get_type(device->kmod.dev->fd);
|
||||
device->drm_syncobj_type = vk_drm_syncobj_get_type(device->kmod.dev->fd);
|
||||
/* We don't support timelines in the uAPI yet and we don't want it getting
|
||||
* suddenly turned on by vk_drm_syncobj_get_type() without us adding panvk
|
||||
* code for it first.
|
||||
|
|
@ -872,10 +871,10 @@ panvk_queue_finish(struct panvk_queue *queue)
|
|||
vk_queue_finish(&queue->vk);
|
||||
}
|
||||
|
||||
struct panvk_priv_bo *panvk_priv_bo_create(struct panvk_device *dev,
|
||||
size_t size, uint32_t flags,
|
||||
const struct VkAllocationCallbacks *alloc,
|
||||
VkSystemAllocationScope scope)
|
||||
struct panvk_priv_bo *
|
||||
panvk_priv_bo_create(struct panvk_device *dev, size_t size, uint32_t flags,
|
||||
const struct VkAllocationCallbacks *alloc,
|
||||
VkSystemAllocationScope scope)
|
||||
{
|
||||
int ret;
|
||||
struct panvk_priv_bo *priv_bo =
|
||||
|
|
@ -915,7 +914,6 @@ struct panvk_priv_bo *panvk_priv_bo_create(struct panvk_device *dev,
|
|||
if (ret)
|
||||
goto err_munmap_bo;
|
||||
|
||||
|
||||
priv_bo->addr.dev = op.va.start;
|
||||
|
||||
if (dev->debug.decode_ctx) {
|
||||
|
|
@ -1078,8 +1076,8 @@ panvk_CreateDevice(VkPhysicalDevice physicalDevice,
|
|||
&device->vk.alloc, VK_SYSTEM_ALLOCATION_SCOPE_DEVICE);
|
||||
|
||||
device->sample_positions = panvk_priv_bo_create(
|
||||
device, panfrost_sample_positions_buffer_size(), 0,
|
||||
&device->vk.alloc, VK_SYSTEM_ALLOCATION_SCOPE_DEVICE);
|
||||
device, panfrost_sample_positions_buffer_size(), 0, &device->vk.alloc,
|
||||
VK_SYSTEM_ALLOCATION_SCOPE_DEVICE);
|
||||
panfrost_upload_sample_positions(device->sample_positions->addr.host);
|
||||
|
||||
vk_device_set_drm_fd(&device->vk, device->kmod.dev->fd);
|
||||
|
|
@ -1398,7 +1396,8 @@ panvk_InvalidateMappedMemoryRanges(VkDevice _device, uint32_t memoryRangeCount,
|
|||
}
|
||||
|
||||
VkDeviceAddress
|
||||
panvk_GetBufferDeviceAddress(VkDevice _device, const VkBufferDeviceAddressInfo *pInfo)
|
||||
panvk_GetBufferDeviceAddress(VkDevice _device,
|
||||
const VkBufferDeviceAddressInfo *pInfo)
|
||||
{
|
||||
VK_FROM_HANDLE(panvk_buffer, buffer, pInfo->buffer);
|
||||
|
||||
|
|
@ -1466,12 +1465,12 @@ panvk_BindBufferMemory2(VkDevice device, uint32_t bindInfoCount,
|
|||
buffer->dev_addr = mem->addr.dev + pBindInfos[i].memoryOffset;
|
||||
|
||||
/* FIXME: Only host map for index buffers so we can do the min/max
|
||||
* index retrieval on the CPU. This is all broken anyway and the
|
||||
* min/max search should be done with a compute shader that also
|
||||
* patches the job descriptor accordingly (basically an indirect draw).
|
||||
*
|
||||
* Make sure this goes away as soon as we fixed indirect draws.
|
||||
*/
|
||||
* index retrieval on the CPU. This is all broken anyway and the
|
||||
* min/max search should be done with a compute shader that also
|
||||
* patches the job descriptor accordingly (basically an indirect draw).
|
||||
*
|
||||
* Make sure this goes away as soon as we fixed indirect draws.
|
||||
*/
|
||||
if (buffer->vk.usage & VK_BUFFER_USAGE_INDEX_BUFFER_BIT) {
|
||||
VkDeviceSize offset = pBindInfos[i].memoryOffset;
|
||||
VkDeviceSize pgsize = getpagesize();
|
||||
|
|
@ -1479,7 +1478,7 @@ panvk_BindBufferMemory2(VkDevice device, uint32_t bindInfoCount,
|
|||
off_t map_end = offset + buffer->vk.size;
|
||||
void *map_addr =
|
||||
pan_kmod_bo_mmap(mem->bo, map_start, map_end - map_start,
|
||||
PROT_WRITE, MAP_SHARED, NULL);
|
||||
PROT_WRITE, MAP_SHARED, NULL);
|
||||
|
||||
assert(map_addr != MAP_FAILED);
|
||||
buffer->host_ptr = map_addr + (offset & pgsize);
|
||||
|
|
|
|||
|
|
@ -569,9 +569,7 @@ panvk_meta_copy_img2img(struct panvk_cmd_buffer *cmdbuf,
|
|||
unsigned fmtidx = panvk_meta_copy_img2img_format_idx(key);
|
||||
unsigned ms = dst->pimage.layout.nr_samples > 1 ? 1 : 0;
|
||||
|
||||
mali_ptr rsd =
|
||||
cmdbuf->device->meta.copy.img2img[ms][texdimidx][fmtidx]
|
||||
.rsd;
|
||||
mali_ptr rsd = cmdbuf->device->meta.copy.img2img[ms][texdimidx][fmtidx].rsd;
|
||||
|
||||
struct pan_image_view srcview = {
|
||||
.format = key.srcfmt,
|
||||
|
|
@ -1026,8 +1024,7 @@ panvk_meta_copy_buf2img(struct panvk_cmd_buffer *cmdbuf,
|
|||
|
||||
unsigned fmtidx = panvk_meta_copy_buf2img_format_idx(key);
|
||||
|
||||
mali_ptr rsd =
|
||||
cmdbuf->device->meta.copy.buf2img[fmtidx].rsd;
|
||||
mali_ptr rsd = cmdbuf->device->meta.copy.buf2img[fmtidx].rsd;
|
||||
|
||||
const struct vk_image_buffer_layout buflayout =
|
||||
vk_image_buffer_copy_layout(&img->vk, region);
|
||||
|
|
@ -1466,8 +1463,7 @@ panvk_meta_copy_img2buf(struct panvk_cmd_buffer *cmdbuf,
|
|||
img->pimage.layout.dim, img->pimage.layout.array_size > 1);
|
||||
unsigned fmtidx = panvk_meta_copy_img2buf_format_idx(key);
|
||||
|
||||
mali_ptr rsd =
|
||||
cmdbuf->device->meta.copy.img2buf[texdimidx][fmtidx].rsd;
|
||||
mali_ptr rsd = cmdbuf->device->meta.copy.img2buf[texdimidx][fmtidx].rsd;
|
||||
|
||||
struct panvk_meta_copy_img2buf_info info = {
|
||||
.buf.ptr = panvk_buffer_gpu_ptr(buf, region->bufferOffset),
|
||||
|
|
@ -1615,8 +1611,7 @@ struct panvk_meta_copy_buf2buf_info {
|
|||
.range = ~0)
|
||||
|
||||
static mali_ptr
|
||||
panvk_meta_copy_buf2buf_shader(struct panvk_device *dev,
|
||||
unsigned blksz,
|
||||
panvk_meta_copy_buf2buf_shader(struct panvk_device *dev, unsigned blksz,
|
||||
struct pan_shader_info *shader_info)
|
||||
{
|
||||
struct pan_pool *bin_pool = &dev->meta.bin_pool.base;
|
||||
|
|
@ -1693,10 +1688,8 @@ panvk_meta_copy_buf2buf(struct panvk_cmd_buffer *cmdbuf,
|
|||
unsigned alignment = ffs((info.src | info.dst | region->size) & 15);
|
||||
unsigned log2blksz = alignment ? alignment - 1 : 4;
|
||||
|
||||
assert(log2blksz <
|
||||
ARRAY_SIZE(cmdbuf->device->meta.copy.buf2buf));
|
||||
mali_ptr rsd =
|
||||
cmdbuf->device->meta.copy.buf2buf[log2blksz].rsd;
|
||||
assert(log2blksz < ARRAY_SIZE(cmdbuf->device->meta.copy.buf2buf));
|
||||
mali_ptr rsd = cmdbuf->device->meta.copy.buf2buf[log2blksz].rsd;
|
||||
|
||||
mali_ptr pushconsts =
|
||||
pan_pool_upload_aligned(&cmdbuf->desc_pool.base, &info, sizeof(info), 16);
|
||||
|
|
@ -1890,8 +1883,7 @@ panvk_meta_update_buf(struct panvk_cmd_buffer *cmdbuf,
|
|||
|
||||
unsigned log2blksz = ffs(sizeof(uint32_t)) - 1;
|
||||
|
||||
mali_ptr rsd =
|
||||
cmdbuf->device->meta.copy.buf2buf[log2blksz].rsd;
|
||||
mali_ptr rsd = cmdbuf->device->meta.copy.buf2buf[log2blksz].rsd;
|
||||
|
||||
mali_ptr pushconsts =
|
||||
pan_pool_upload_aligned(&cmdbuf->desc_pool.base, &info, sizeof(info), 16);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue