panfrost: Stop passing a panfrost_device to panfrost_new_texture()
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com> Reviewed-by: Constantine Shablya <constantine.shablya@collabora.com> Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26698>
This commit is contained in:
committed by
Marge Bot
parent
5669622857
commit
0d76cb0268
@@ -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
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user