From a597a64ae2d8ab4db6ddeaf2970c77ee7390abdf Mon Sep 17 00:00:00 2001 From: Christian Gmeiner Date: Fri, 3 Jan 2020 09:15:35 +0100 Subject: [PATCH] etnaviv: move descriptor based texture structs This moves the descriptor based texture structs and their helpers into the only user. Signed-off-by: Christian Gmeiner Reviewed-by: Jonathan Marek --- .../drivers/etnaviv/etnaviv_texture_desc.c | 31 ++++++++++++++ .../drivers/etnaviv/etnaviv_texture_desc.h | 40 ------------------- 2 files changed, 31 insertions(+), 40 deletions(-) diff --git a/src/gallium/drivers/etnaviv/etnaviv_texture_desc.c b/src/gallium/drivers/etnaviv/etnaviv_texture_desc.c index 29ae71b785c..fc5d799d973 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_texture_desc.c +++ b/src/gallium/drivers/etnaviv/etnaviv_texture_desc.c @@ -41,6 +41,37 @@ #include +struct etna_sampler_state_desc { + struct pipe_sampler_state base; + uint32_t SAMP_CTRL0; + uint32_t SAMP_CTRL1; + uint32_t SAMP_LOD_MINMAX; + uint32_t SAMP_LOD_BIAS; +}; + +static inline struct etna_sampler_state_desc * +etna_sampler_state_desc(struct pipe_sampler_state *samp) +{ + return (struct etna_sampler_state_desc *)samp; +} + +struct etna_sampler_view_desc { + struct pipe_sampler_view base; + /* format-dependent merged with sampler state */ + uint32_t SAMP_CTRL0; + uint32_t SAMP_CTRL1; + + struct etna_bo *bo; + struct etna_reloc DESC_ADDR; + struct etna_sampler_ts ts; +}; + +static inline struct etna_sampler_view_desc * +etna_sampler_view_desc(struct pipe_sampler_view *view) +{ + return (struct etna_sampler_view_desc *)view; +} + static void * etna_create_sampler_state_desc(struct pipe_context *pipe, const struct pipe_sampler_state *ss) diff --git a/src/gallium/drivers/etnaviv/etnaviv_texture_desc.h b/src/gallium/drivers/etnaviv/etnaviv_texture_desc.h index f189644ece3..278918ad433 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_texture_desc.h +++ b/src/gallium/drivers/etnaviv/etnaviv_texture_desc.h @@ -28,48 +28,8 @@ #ifndef H_ETNAVIV_TEXTURE_DESC #define H_ETNAVIV_TEXTURE_DESC -#include "drm/etnaviv_drmif.h" - #include "etnaviv_texture.h" -#include "pipe/p_context.h" -#include "pipe/p_state.h" - -#include "hw/state_3d.xml.h" - -struct etna_context; - -struct etna_sampler_state_desc { - struct pipe_sampler_state base; - uint32_t SAMP_CTRL0; - uint32_t SAMP_CTRL1; - uint32_t SAMP_LOD_MINMAX; - uint32_t SAMP_LOD_BIAS; -}; - -static inline struct etna_sampler_state_desc * -etna_sampler_state_desc(struct pipe_sampler_state *samp) -{ - return (struct etna_sampler_state_desc *)samp; -} - -struct etna_sampler_view_desc { - struct pipe_sampler_view base; - /* format-dependent merged with sampler state */ - uint32_t SAMP_CTRL0; - uint32_t SAMP_CTRL1; - - struct etna_bo *bo; - struct etna_reloc DESC_ADDR; - struct etna_sampler_ts ts; -}; - -static inline struct etna_sampler_view_desc * -etna_sampler_view_desc(struct pipe_sampler_view *view) -{ - return (struct etna_sampler_view_desc *)view; -} - /* Initialize context for descriptor-based texture views and descriptors */ void etna_texture_desc_init(struct pipe_context *pctx); -- 2.30.2