Module: Mesa Branch: main Commit: 11d0a5292b4fc6993b58548e0020b0fd43e08e97 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=11d0a5292b4fc6993b58548e0020b0fd43e08e97
Author: Alyssa Rosenzweig <[email protected]> Date: Tue Apr 19 16:36:45 2022 -0400 panfrost: Remove unused dev argument This function has enough arguments as it is... Motivated by wanting to unit test this monster. Signed-off-by: Alyssa Rosenzweig <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15991> --- src/gallium/drivers/panfrost/pan_resource.c | 4 ++-- src/panfrost/lib/pan_layout.c | 3 +-- src/panfrost/lib/pan_texture.h | 3 +-- src/panfrost/vulkan/panvk_image.c | 3 +-- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/gallium/drivers/panfrost/pan_resource.c b/src/gallium/drivers/panfrost/pan_resource.c index 085be31b51d..928a63abb80 100644 --- a/src/gallium/drivers/panfrost/pan_resource.c +++ b/src/gallium/drivers/panfrost/pan_resource.c @@ -89,7 +89,7 @@ panfrost_resource_from_handle(struct pipe_screen *pscreen, .line_stride = whandle->stride, }; - bool valid = pan_image_layout_init(dev, &rsc->image.layout, mod, + bool valid = pan_image_layout_init(&rsc->image.layout, mod, templat->format, dim, prsc->width0, prsc->height0, prsc->depth0, prsc->array_size, @@ -502,7 +502,7 @@ panfrost_resource_setup(struct panfrost_device *dev, fmt = PIPE_FORMAT_Z32_FLOAT; ASSERTED bool valid = - pan_image_layout_init(dev, &pres->image.layout, + pan_image_layout_init(&pres->image.layout, chosen_mod, fmt, dim, pres->base.width0, pres->base.height0, diff --git a/src/panfrost/lib/pan_layout.c b/src/panfrost/lib/pan_layout.c index fdf2d996915..ce04cf352cf 100644 --- a/src/panfrost/lib/pan_layout.c +++ b/src/panfrost/lib/pan_layout.c @@ -178,8 +178,7 @@ panfrost_texture_offset(const struct pan_image_layout *layout, } bool -pan_image_layout_init(const struct panfrost_device *dev, - struct pan_image_layout *layout, +pan_image_layout_init(struct pan_image_layout *layout, uint64_t modifier, enum pipe_format format, enum mali_texture_dimension dim, diff --git a/src/panfrost/lib/pan_texture.h b/src/panfrost/lib/pan_texture.h index 1e030319ae9..53fd71d76be 100644 --- a/src/panfrost/lib/pan_texture.h +++ b/src/panfrost/lib/pan_texture.h @@ -214,8 +214,7 @@ struct pan_image_explicit_layout { }; bool -pan_image_layout_init(const struct panfrost_device *dev, - struct pan_image_layout *layout, +pan_image_layout_init(struct pan_image_layout *layout, uint64_t modifier, enum pipe_format format, enum mali_texture_dimension dim, diff --git a/src/panfrost/vulkan/panvk_image.c b/src/panfrost/vulkan/panvk_image.c index 38bc774aa77..f7791f9d3d6 100644 --- a/src/panfrost/vulkan/panvk_image.c +++ b/src/panfrost/vulkan/panvk_image.c @@ -69,14 +69,13 @@ panvk_image_create(VkDevice _device, const VkSubresourceLayout *plane_layouts) { VK_FROM_HANDLE(panvk_device, device, _device); - const struct panfrost_device *pdev = &device->physical_device->pdev; struct panvk_image *image = NULL; image = vk_image_create(&device->vk, pCreateInfo, alloc, sizeof(*image)); if (!image) return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY); - pan_image_layout_init(pdev, &image->pimage.layout, modifier, + pan_image_layout_init(&image->pimage.layout, modifier, vk_format_to_pipe_format(image->vk.format), panvk_image_type_to_mali_tex_dim(image->vk.image_type), image->vk.extent.width, image->vk.extent.height,
