From 5247d6730223a400aed9068db8a82c134c655005 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Wed, 8 Jul 2020 15:59:17 -0400 Subject: [PATCH] panfrost: Move panfrost_translate_texture_type We need it in pan_job.c Signed-off-by: Alyssa Rosenzweig Part-of: --- src/gallium/drivers/panfrost/pan_context.c | 26 -------------------- src/gallium/drivers/panfrost/pan_resource.h | 27 +++++++++++++++++++++ 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/src/gallium/drivers/panfrost/pan_context.c b/src/gallium/drivers/panfrost/pan_context.c index 52f0b8f3c7e..d55cbd098db 100644 --- a/src/gallium/drivers/panfrost/pan_context.c +++ b/src/gallium/drivers/panfrost/pan_context.c @@ -885,32 +885,6 @@ panfrost_set_stencil_ref( ctx->stencil_ref = *ref; } -static enum mali_texture_type -panfrost_translate_texture_type(enum pipe_texture_target t) { - switch (t) - { - case PIPE_BUFFER: - case PIPE_TEXTURE_1D: - case PIPE_TEXTURE_1D_ARRAY: - return MALI_TEX_1D; - - case PIPE_TEXTURE_2D: - case PIPE_TEXTURE_2D_ARRAY: - case PIPE_TEXTURE_RECT: - return MALI_TEX_2D; - - case PIPE_TEXTURE_3D: - return MALI_TEX_3D; - - case PIPE_TEXTURE_CUBE: - case PIPE_TEXTURE_CUBE_ARRAY: - return MALI_TEX_CUBE; - - default: - unreachable("Unknown target"); - } -} - void panfrost_create_sampler_view_bo(struct panfrost_sampler_view *so, struct pipe_context *pctx, diff --git a/src/gallium/drivers/panfrost/pan_resource.h b/src/gallium/drivers/panfrost/pan_resource.h index bc4e0dbb6c4..baf7604b4f6 100644 --- a/src/gallium/drivers/panfrost/pan_resource.h +++ b/src/gallium/drivers/panfrost/pan_resource.h @@ -126,4 +126,31 @@ panfrost_resource_set_damage_region(struct pipe_screen *screen, unsigned int nrects, const struct pipe_box *rects); +static inline enum mali_texture_type +panfrost_translate_texture_type(enum pipe_texture_target t) { + switch (t) + { + case PIPE_BUFFER: + case PIPE_TEXTURE_1D: + case PIPE_TEXTURE_1D_ARRAY: + return MALI_TEX_1D; + + case PIPE_TEXTURE_2D: + case PIPE_TEXTURE_2D_ARRAY: + case PIPE_TEXTURE_RECT: + return MALI_TEX_2D; + + case PIPE_TEXTURE_3D: + return MALI_TEX_3D; + + case PIPE_TEXTURE_CUBE: + case PIPE_TEXTURE_CUBE_ARRAY: + return MALI_TEX_CUBE; + + default: + unreachable("Unknown target"); + } +} + + #endif /* PAN_RESOURCE_H */ -- 2.30.2