diff --git a/src/gallium/drivers/panfrost/pan_cmdstream.c b/src/gallium/drivers/panfrost/pan_cmdstream.c index 3f6a968c977..82558bc285c 100644 --- a/src/gallium/drivers/panfrost/pan_cmdstream.c +++ b/src/gallium/drivers/panfrost/pan_cmdstream.c @@ -1814,7 +1814,7 @@ panfrost_create_sampler_view_bo(struct panfrost_sampler_view *so, iview.astc.narrow = true; } - GENX(pan_texture_emit)(&iview, tex, &payload); + GENX(pan_sampled_texture_emit)(&iview, tex, &payload); } static void diff --git a/src/gallium/drivers/panfrost/pan_fb_preload.c b/src/gallium/drivers/panfrost/pan_fb_preload.c index 4db6381dbe7..edc6d359379 100644 --- a/src/gallium/drivers/panfrost/pan_fb_preload.c +++ b/src/gallium/drivers/panfrost/pan_fb_preload.c @@ -947,7 +947,7 @@ pan_preload_emit_textures(struct pan_pool *pool, const struct pan_fb_info *fb, GENX(pan_texture_estimate_payload_size)(views[i]); struct pan_ptr surfaces = pan_pool_alloc_aligned(pool, payload_size, 64); - GENX(pan_texture_emit)(views[i], texture, &surfaces); + GENX(pan_sampled_texture_emit)(views[i], texture, &surfaces); } return textures.gpu; @@ -964,7 +964,7 @@ pan_preload_emit_textures(struct pan_pool *pool, const struct pan_fb_info *fb, .gpu = texture.gpu + pan_size(TEXTURE), }; - GENX(pan_texture_emit)(views[i], texture.cpu, &surfaces); + GENX(pan_sampled_texture_emit)(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 324aff9d56b..841cb95a9bd 100644 --- a/src/panfrost/lib/pan_texture.c +++ b/src/panfrost/lib/pan_texture.c @@ -797,9 +797,9 @@ pan_texture_get_extent(const struct pan_image_view *iview, * consists of a 32-byte header followed by pointers. */ void -GENX(pan_texture_emit)(const struct pan_image_view *iview, - struct mali_texture_packed *out, - const struct pan_ptr *payload) +GENX(pan_sampled_texture_emit)(const struct pan_image_view *iview, + struct mali_texture_packed *out, + const struct pan_ptr *payload) { const struct util_format_description *desc = util_format_description(iview->format); diff --git a/src/panfrost/lib/pan_texture.h b/src/panfrost/lib/pan_texture.h index 5f949974ab1..5f44fa31caf 100644 --- a/src/panfrost/lib/pan_texture.h +++ b/src/panfrost/lib/pan_texture.h @@ -48,9 +48,9 @@ void GENX(pan_texture_afbc_reswizzle)(struct pan_image_view *iview); unsigned GENX(pan_texture_estimate_payload_size)(const struct pan_image_view *iview); -void GENX(pan_texture_emit)(const struct pan_image_view *iview, - struct mali_texture_packed *out, - const struct pan_ptr *payload); +void GENX(pan_sampled_texture_emit)(const struct pan_image_view *iview, + struct mali_texture_packed *out, + const struct pan_ptr *payload); #if PAN_ARCH >= 9 void GENX(pan_storage_texture_emit)(const struct pan_image_view *iview, diff --git a/src/panfrost/vulkan/panvk_vX_buffer_view.c b/src/panfrost/vulkan/panvk_vX_buffer_view.c index 1d380b62a18..34ad49987d0 100644 --- a/src/panfrost/vulkan/panvk_vX_buffer_view.c +++ b/src/panfrost/vulkan/panvk_vX_buffer_view.c @@ -117,7 +117,7 @@ panvk_per_arch(CreateBufferView)(VkDevice _device, .cpu = panvk_priv_mem_host_addr(view->mem), }; - GENX(pan_texture_emit)(&pview, &view->descs.tex, &ptr); + GENX(pan_sampled_texture_emit)(&pview, &view->descs.tex, &ptr); } #if PAN_ARCH <= 7 diff --git a/src/panfrost/vulkan/panvk_vX_image_view.c b/src/panfrost/vulkan/panvk_vX_image_view.c index e416d86941a..a5e0782a1d3 100644 --- a/src/panfrost/vulkan/panvk_vX_image_view.c +++ b/src/panfrost/vulkan/panvk_vX_image_view.c @@ -171,7 +171,7 @@ prepare_tex_descs(struct panvk_image_view *view) pview.planes[0] = view->pview.planes[plane]; pview.format = vk_format_to_pipe_format(plane_format); - GENX(pan_texture_emit)(&pview, &view->descs.tex[plane], &ptr); + GENX(pan_sampled_texture_emit)(&pview, &view->descs.tex[plane], &ptr); #if PAN_ARCH >= 9 if (view->vk.usage & VK_IMAGE_USAGE_STORAGE_BIT) { GENX(pan_storage_texture_emit)( @@ -185,7 +185,7 @@ prepare_tex_descs(struct panvk_image_view *view) ptr.gpu += tex_payload_size; } } else { - GENX(pan_texture_emit)(&pview, &view->descs.tex[0], &ptr); + GENX(pan_sampled_texture_emit)(&pview, &view->descs.tex[0], &ptr); #if PAN_ARCH >= 9 if (view->vk.usage & VK_IMAGE_USAGE_STORAGE_BIT) GENX(pan_storage_texture_emit)(&pview, &view->descs.storage_tex[0], @@ -217,7 +217,8 @@ prepare_tex_descs(struct panvk_image_view *view) ptr.cpu += tex_payload_size; ptr.gpu += tex_payload_size; - GENX(pan_texture_emit)(&pview, &view->descs.zs.other_aspect_tex, &ptr); + GENX(pan_sampled_texture_emit)(&pview, &view->descs.zs.other_aspect_tex, + &ptr); return VK_SUCCESS; }