From 68a2d25d0db2031e5bba37b2981179e795dd504e Mon Sep 17 00:00:00 2001 From: Ilia Mirkin Date: Sun, 23 Jan 2022 12:14:43 -0500 Subject: [PATCH] freedreno/a4xx: move tex_type to header This will be used in several places. Factor it out for common use. Signed-off-by: Ilia Mirkin Part-of: --- src/gallium/drivers/freedreno/a4xx/fd4_texture.c | 25 +----------------------- src/gallium/drivers/freedreno/a4xx/fd4_texture.h | 23 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/gallium/drivers/freedreno/a4xx/fd4_texture.c b/src/gallium/drivers/freedreno/a4xx/fd4_texture.c index eb26f7d..ae6e2e1 100644 --- a/src/gallium/drivers/freedreno/a4xx/fd4_texture.c +++ b/src/gallium/drivers/freedreno/a4xx/fd4_texture.c @@ -125,29 +125,6 @@ fd4_sampler_state_create(struct pipe_context *pctx, return so; } -static enum a4xx_tex_type -tex_type(unsigned target) -{ - switch (target) { - default: - assert(0); - case PIPE_BUFFER: - return A4XX_TEX_BUFFER; - case PIPE_TEXTURE_1D: - case PIPE_TEXTURE_1D_ARRAY: - return A4XX_TEX_1D; - case PIPE_TEXTURE_RECT: - case PIPE_TEXTURE_2D: - case PIPE_TEXTURE_2D_ARRAY: - return A4XX_TEX_2D; - case PIPE_TEXTURE_3D: - return A4XX_TEX_3D; - case PIPE_TEXTURE_CUBE: - case PIPE_TEXTURE_CUBE_ARRAY: - return A4XX_TEX_CUBE; - } -} - static bool use_astc_srgb_workaround(struct pipe_context *pctx, enum pipe_format format) { @@ -178,7 +155,7 @@ fd4_sampler_view_create(struct pipe_context *pctx, struct pipe_resource *prsc, so->base.reference.count = 1; so->base.context = pctx; - so->texconst0 = A4XX_TEX_CONST_0_TYPE(tex_type(cso->target)) | + so->texconst0 = A4XX_TEX_CONST_0_TYPE(fd4_tex_type(cso->target)) | A4XX_TEX_CONST_0_FMT(fd4_pipe2tex(format)) | fd4_tex_swiz(format, cso->swizzle_r, cso->swizzle_g, cso->swizzle_b, cso->swizzle_a); diff --git a/src/gallium/drivers/freedreno/a4xx/fd4_texture.h b/src/gallium/drivers/freedreno/a4xx/fd4_texture.h index 402f07c..4ba990c 100644 --- a/src/gallium/drivers/freedreno/a4xx/fd4_texture.h +++ b/src/gallium/drivers/freedreno/a4xx/fd4_texture.h @@ -65,4 +65,27 @@ unsigned fd4_get_const_idx(struct fd_context *ctx, void fd4_texture_init(struct pipe_context *pctx); +static inline enum a4xx_tex_type +fd4_tex_type(unsigned target) +{ + switch (target) { + default: + assert(0); + case PIPE_BUFFER: + return A4XX_TEX_BUFFER; + case PIPE_TEXTURE_1D: + case PIPE_TEXTURE_1D_ARRAY: + return A4XX_TEX_1D; + case PIPE_TEXTURE_RECT: + case PIPE_TEXTURE_2D: + case PIPE_TEXTURE_2D_ARRAY: + return A4XX_TEX_2D; + case PIPE_TEXTURE_3D: + return A4XX_TEX_3D; + case PIPE_TEXTURE_CUBE: + case PIPE_TEXTURE_CUBE_ARRAY: + return A4XX_TEX_CUBE; + } +} + #endif /* FD4_TEXTURE_H_ */ -- 2.7.4