diff --git a/src/gallium/drivers/panfrost/pan_cmdstream.c b/src/gallium/drivers/panfrost/pan_cmdstream.c index 68dde550c22..54d99b693f0 100644 --- a/src/gallium/drivers/panfrost/pan_cmdstream.c +++ b/src/gallium/drivers/panfrost/pan_cmdstream.c @@ -1577,7 +1577,7 @@ panfrost_create_sampler_view_bo(struct panfrost_sampler_view *so, } } - GENX(panfrost_new_texture)(device, &iview, tex, &payload); + GENX(panfrost_new_texture)(&iview, tex, &payload); } static void diff --git a/src/panfrost/lib/pan_blitter.c b/src/panfrost/lib/pan_blitter.c index 9f4236f6da9..4f406aed731 100644 --- a/src/panfrost/lib/pan_blitter.c +++ b/src/panfrost/lib/pan_blitter.c @@ -963,7 +963,7 @@ pan_blitter_emit_textures(struct pan_pool *pool, unsigned tex_count, struct panfrost_ptr surfaces = pan_pool_alloc_aligned(pool, payload_size, 64); - GENX(panfrost_new_texture)(pool->dev, views[i], texture, &surfaces); + GENX(panfrost_new_texture)(views[i], texture, &surfaces); } return textures.gpu; @@ -980,7 +980,7 @@ pan_blitter_emit_textures(struct pan_pool *pool, unsigned tex_count, .gpu = texture.gpu + pan_size(TEXTURE), }; - GENX(panfrost_new_texture)(pool->dev, views[i], texture.cpu, &surfaces); + GENX(panfrost_new_texture)(views[i], texture.cpu, &surfaces); textures[i] = texture.gpu; } diff --git a/src/panfrost/lib/pan_texture.c b/src/panfrost/lib/pan_texture.c index 40f9ca7c144..badddceeaa6 100644 --- a/src/panfrost/lib/pan_texture.c +++ b/src/panfrost/lib/pan_texture.c @@ -665,8 +665,7 @@ panfrost_modifier_to_layout(uint64_t modifier) * consists of a 32-byte header followed by pointers. */ void -GENX(panfrost_new_texture)(const struct panfrost_device *dev, - const struct pan_image_view *iview, void *out, +GENX(panfrost_new_texture)(const struct pan_image_view *iview, void *out, const struct panfrost_ptr *payload) { const struct pan_image *base_image = pan_image_view_get_plane(iview, 0); diff --git a/src/panfrost/lib/pan_texture.h b/src/panfrost/lib/pan_texture.h index 7e2ac995cdd..81a49748af0 100644 --- a/src/panfrost/lib/pan_texture.h +++ b/src/panfrost/lib/pan_texture.h @@ -274,8 +274,7 @@ struct pan_block_size panfrost_block_size(uint64_t modifier, unsigned GENX(panfrost_estimate_texture_payload_size)( const struct pan_image_view *iview); -void GENX(panfrost_new_texture)(const struct panfrost_device *dev, - const struct pan_image_view *iview, void *out, +void GENX(panfrost_new_texture)(const struct pan_image_view *iview, void *out, const struct panfrost_ptr *payload); #endif diff --git a/src/panfrost/vulkan/panvk_vX_image.c b/src/panfrost/vulkan/panvk_vX_image.c index 25eec5ee5a3..313e8c57f4b 100644 --- a/src/panfrost/vulkan/panvk_vX_image.c +++ b/src/panfrost/vulkan/panvk_vX_image.c @@ -125,7 +125,7 @@ panvk_per_arch(CreateImageView)(VkDevice _device, STATIC_ASSERT(sizeof(view->descs.tex) >= pan_size(TEXTURE)); GENX(panfrost_new_texture) - (pdev, &view->pview, &view->descs.tex, &view->bo->ptr); + (&view->pview, &view->descs.tex, &view->bo->ptr); } if (view->vk.usage & VK_IMAGE_USAGE_STORAGE_BIT) { diff --git a/src/panfrost/vulkan/panvk_vX_meta_copy.c b/src/panfrost/vulkan/panvk_vX_meta_copy.c index 9f55999844a..209ed707374 100644 --- a/src/panfrost/vulkan/panvk_vX_meta_copy.c +++ b/src/panfrost/vulkan/panvk_vX_meta_copy.c @@ -39,7 +39,7 @@ panvk_meta_copy_img_emit_texture(struct panfrost_device *pdev, struct panfrost_ptr surfaces = pan_pool_alloc_aligned( desc_pool, payload_size, pan_alignment(SURFACE_WITH_STRIDE)); - GENX(panfrost_new_texture)(pdev, view, texture.cpu, &surfaces); + GENX(panfrost_new_texture)(view, texture.cpu, &surfaces); return texture.gpu; }