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 <christian.gmeiner@gmail.com>
Reviewed-by: Jonathan Marek <jonathan@marek.ca>

diff --git a/src/gallium/drivers/etnaviv/etnaviv_texture_desc.c b/src/gallium/drivers/etnaviv/etnaviv_texture_desc.c
index 29ae71b785c5dcc54fd03483202d802780c3fdfd..fc5d799d973f0e5a8e76d191e928e00d75bbf913 100644 (file)
--- a/src/gallium/drivers/etnaviv/etnaviv_texture_desc.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_texture_desc.c
@@ -41,6 +41,37 @@
 
 #include <drm_fourcc.h>
 
+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 f189644ece3a94f52e63f1b5d3f9e66e2a2bc1ac..278918ad433d4761bcd674f8c22a5b18415ce417 100644 (file)
--- 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);