Mesa (main): panfrost: Remove unused functions
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Aug 25 20:18:05 UTC 2021
Module: Mesa
Branch: main
Commit: c08423699cf28554e01419d359aec676baffb94c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c08423699cf28554e01419d359aec676baffb94c
Author: Alyssa Rosenzweig <alyssa at collabora.com>
Date: Tue Aug 24 16:37:15 2021 -0400
panfrost: Remove unused functions
Flagged by cppcheck.
Signed-off-by: Alyssa Rosenzweig <alyssa at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12530>
---
src/gallium/drivers/panfrost/pan_job.c | 11 ---------
src/gallium/drivers/panfrost/pan_job.h | 5 ----
src/gallium/drivers/panfrost/pan_resource.c | 38 -----------------------------
src/gallium/drivers/panfrost/pan_resource.h | 10 --------
4 files changed, 64 deletions(-)
diff --git a/src/gallium/drivers/panfrost/pan_job.c b/src/gallium/drivers/panfrost/pan_job.c
index 649809a2903..8ce736b94eb 100644
--- a/src/gallium/drivers/panfrost/pan_job.c
+++ b/src/gallium/drivers/panfrost/pan_job.c
@@ -956,14 +956,3 @@ panfrost_batch_union_scissor(struct panfrost_batch *batch,
batch->maxx = MAX2(batch->maxx, maxx);
batch->maxy = MAX2(batch->maxy, maxy);
}
-
-void
-panfrost_batch_intersection_scissor(struct panfrost_batch *batch,
- unsigned minx, unsigned miny,
- unsigned maxx, unsigned maxy)
-{
- batch->minx = MAX2(batch->minx, minx);
- batch->miny = MAX2(batch->miny, miny);
- batch->maxx = MIN2(batch->maxx, maxx);
- batch->maxy = MIN2(batch->maxy, maxy);
-}
diff --git a/src/gallium/drivers/panfrost/pan_job.h b/src/gallium/drivers/panfrost/pan_job.h
index bc1420cf18a..32ba7be754e 100644
--- a/src/gallium/drivers/panfrost/pan_job.h
+++ b/src/gallium/drivers/panfrost/pan_job.h
@@ -195,9 +195,4 @@ panfrost_batch_union_scissor(struct panfrost_batch *batch,
unsigned minx, unsigned miny,
unsigned maxx, unsigned maxy);
-void
-panfrost_batch_intersection_scissor(struct panfrost_batch *batch,
- unsigned minx, unsigned miny,
- unsigned maxx, unsigned maxy);
-
#endif
diff --git a/src/gallium/drivers/panfrost/pan_resource.c b/src/gallium/drivers/panfrost/pan_resource.c
index a0539ee340d..571dc69ebcc 100644
--- a/src/gallium/drivers/panfrost/pan_resource.c
+++ b/src/gallium/drivers/panfrost/pan_resource.c
@@ -1278,44 +1278,6 @@ panfrost_generate_mipmap(
return blit_res;
}
-/* Computes the address to a texture at a particular slice */
-
-mali_ptr
-panfrost_get_texture_address(struct panfrost_resource *rsrc,
- unsigned level, unsigned layer,
- unsigned sample)
-{
- bool is_3d = rsrc->base.target == PIPE_TEXTURE_3D;
- unsigned array_idx = is_3d ? 0 : layer;
- unsigned surface_idx = is_3d ? layer : sample;
- return rsrc->image.data.bo->ptr.gpu +
- panfrost_texture_offset(&rsrc->image.layout, level,
- array_idx, surface_idx);
-}
-
-void
-panfrost_get_afbc_pointers(struct panfrost_resource *rsrc,
- unsigned level, unsigned layer,
- mali_ptr *header, mali_ptr *body)
-{
- assert(drm_is_afbc(rsrc->image.layout.modifier));
-
- struct pan_image_slice_layout *slice = &rsrc->image.layout.slices[level];
-
- if (rsrc->base.target == PIPE_TEXTURE_3D) {
- *header = rsrc->image.data.bo->ptr.gpu + slice->offset +
- (layer * slice->afbc.surface_stride);
- *body = rsrc->image.data.bo->ptr.gpu + slice->offset +
- slice->afbc.header_size +
- (slice->surface_stride * layer);
- } else {
- *header = rsrc->image.data.bo->ptr.gpu +
- panfrost_texture_offset(&rsrc->image.layout,
- level, layer, 0);
- *body = *header + slice->afbc.header_size;
- }
-}
-
static void
panfrost_resource_set_stencil(struct pipe_resource *prsrc,
struct pipe_resource *stencil)
diff --git a/src/gallium/drivers/panfrost/pan_resource.h b/src/gallium/drivers/panfrost/pan_resource.h
index b0cb3b7485a..cb1260ce799 100644
--- a/src/gallium/drivers/panfrost/pan_resource.h
+++ b/src/gallium/drivers/panfrost/pan_resource.h
@@ -107,16 +107,6 @@ pan_transfer(struct pipe_transfer *p)
return (struct panfrost_transfer *)p;
}
-mali_ptr
-panfrost_get_texture_address(struct panfrost_resource *rsrc,
- unsigned level, unsigned layer,
- unsigned sample);
-
-void
-panfrost_get_afbc_pointers(struct panfrost_resource *rsrc,
- unsigned level, unsigned layer,
- mali_ptr *header, mali_ptr *body);
-
void panfrost_resource_screen_init(struct pipe_screen *screen);
void panfrost_resource_screen_destroy(struct pipe_screen *screen);
More information about the mesa-commit
mailing list