postprocess: refactor header files, etc

Move private data structures and function prototypes out of the
public postprocess.h header file.
Create a pp_private.h for the shared, private data structures, functions.
Remove pp_program.h header.

Reviewed-by: Marek Olšák <[email protected]>

1 files changed, 6 insertions, 39 deletions

diff --git a/src/gallium/auxiliary/postprocess/postprocess.h b/src/gallium/auxiliary/postprocess/postprocess.h
index e0ab43e320f..c4b20301c68 100644
--- a/src/gallium/auxiliary/postprocess/postprocess.h
+++ b/src/gallium/auxiliary/postprocess/postprocess.h
@@ -28,42 +28,19 @@
 #ifndef POSTPROCESS_H
 #define POSTPROCESS_H
 
-#include "postprocess/pp_program.h"
+#include "pipe/p_state.h"
 
 #define PP_FILTERS 6            /* Increment this if you add filters */
 #define PP_MAX_PASSES 6
 
+struct cso_context;
+
 struct pp_queue_t;              /* Forward definition */
+struct pp_program;
 
 /* Less typing later on */
 typedef void (*pp_func) (struct pp_queue_t *, struct pipe_resource *,
                          struct pipe_resource *, unsigned int);
-/**
-*	The main post-processing queue.
-*/
-struct pp_queue_t
-{
-   pp_func *pp_queue;           /* An array of pp_funcs */
-   unsigned int n_filters;      /* Number of enabled filters */
-
-   struct pipe_resource *tmp[2];        /* Two temp FBOs for the queue */
-   struct pipe_resource *inner_tmp[3];  /* Three for filter use */
-
-   unsigned int n_tmp, n_inner_tmp;
-
-   struct pipe_resource *depth; /* depth of original input */
-   struct pipe_resource *stencil;       /* stencil shared by inner_tmps */
-   struct pipe_resource *constbuf;      /* MLAA constant buffer */
-   struct pipe_resource *areamaptex;    /* MLAA area map texture */
-
-   struct pipe_surface *tmps[2], *inner_tmps[3], *stencils;
-
-   void ***shaders;             /* Shaders in TGSI form */
-   unsigned int *filters;       /* Active filter to filters.h mapping. */
-   struct pp_program *p;
-
-   bool fbos_init;
-};
 
 /* Main functions */
 
@@ -72,19 +49,9 @@ struct pp_queue_t *pp_init(struct pipe_context *pipe, const unsigned int *,
 void pp_run(struct pp_queue_t *, struct pipe_resource *,
             struct pipe_resource *, struct pipe_resource *);
 void pp_free(struct pp_queue_t *);
-void pp_free_fbos(struct pp_queue_t *);
-void pp_debug(const char *, ...);
-struct pp_program *pp_init_prog(struct pp_queue_t *, struct pipe_context *pipe,
-                             struct cso_context *);
+
 void pp_init_fbos(struct pp_queue_t *, unsigned int, unsigned int);
-void pp_blit(struct pipe_context *pipe,
-             struct pipe_resource *src_tex,
-             int srcX0, int srcY0,
-             int srcX1, int srcY1,
-             int srcZ0,
-             struct pipe_surface *dst,
-             int dstX0, int dstY0,
-             int dstX1, int dstY1);
+
 
 /* The filters */