From de2fd7dd0ba3856aa1cb08302bed0814b16f8810 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Sat, 16 Nov 2013 13:55:44 -0700 Subject: [PATCH] postprocess: rename program to pp_program MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To match the pp_ namespace convention. Reviewed-by: Marek Olšák --- src/gallium/auxiliary/postprocess/postprocess.h | 4 ++-- src/gallium/auxiliary/postprocess/pp_colors.c | 2 +- src/gallium/auxiliary/postprocess/pp_filters.h | 14 +++++++------- src/gallium/auxiliary/postprocess/pp_init.c | 2 +- src/gallium/auxiliary/postprocess/pp_mlaa.c | 2 +- src/gallium/auxiliary/postprocess/pp_program.c | 6 +++--- src/gallium/auxiliary/postprocess/pp_program.h | 2 +- src/gallium/auxiliary/postprocess/pp_run.c | 14 +++++++------- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/gallium/auxiliary/postprocess/postprocess.h b/src/gallium/auxiliary/postprocess/postprocess.h index 04b6c75bfb0..e0ab43e320f 100644 --- a/src/gallium/auxiliary/postprocess/postprocess.h +++ b/src/gallium/auxiliary/postprocess/postprocess.h @@ -60,7 +60,7 @@ struct pp_queue_t void ***shaders; /* Shaders in TGSI form */ unsigned int *filters; /* Active filter to filters.h mapping. */ - struct program *p; + struct pp_program *p; bool fbos_init; }; @@ -74,7 +74,7 @@ void pp_run(struct pp_queue_t *, struct pipe_resource *, void pp_free(struct pp_queue_t *); void pp_free_fbos(struct pp_queue_t *); void pp_debug(const char *, ...); -struct program *pp_init_prog(struct pp_queue_t *, struct pipe_context *pipe, +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, diff --git a/src/gallium/auxiliary/postprocess/pp_colors.c b/src/gallium/auxiliary/postprocess/pp_colors.c index c30e92e3c72..a0b9d282c61 100644 --- a/src/gallium/auxiliary/postprocess/pp_colors.c +++ b/src/gallium/auxiliary/postprocess/pp_colors.c @@ -35,7 +35,7 @@ pp_nocolor(struct pp_queue_t *ppq, struct pipe_resource *in, struct pipe_resource *out, unsigned int n) { - struct program *p = ppq->p; + struct pp_program *p = ppq->p; pp_filter_setup_in(p, in); pp_filter_setup_out(p, out); diff --git a/src/gallium/auxiliary/postprocess/pp_filters.h b/src/gallium/auxiliary/postprocess/pp_filters.h index ada21cc5365..eaebe4ce294 100644 --- a/src/gallium/auxiliary/postprocess/pp_filters.h +++ b/src/gallium/auxiliary/postprocess/pp_filters.h @@ -43,15 +43,15 @@ /* Helper functions for the filters */ -void pp_filter_setup_in(struct program *, struct pipe_resource *); -void pp_filter_setup_out(struct program *, struct pipe_resource *); -void pp_filter_end_pass(struct program *); +void pp_filter_setup_in(struct pp_program *, struct pipe_resource *); +void pp_filter_setup_out(struct pp_program *, struct pipe_resource *); +void pp_filter_end_pass(struct pp_program *); void *pp_tgsi_to_state(struct pipe_context *, const char *, bool, const char *); -void pp_filter_misc_state(struct program *); -void pp_filter_draw(struct program *); -void pp_filter_set_fb(struct program *); -void pp_filter_set_clear_fb(struct program *); +void pp_filter_misc_state(struct pp_program *); +void pp_filter_draw(struct pp_program *); +void pp_filter_set_fb(struct pp_program *); +void pp_filter_set_clear_fb(struct pp_program *); #endif diff --git a/src/gallium/auxiliary/postprocess/pp_init.c b/src/gallium/auxiliary/postprocess/pp_init.c index bbebb5ce6e6..edd54ce2fa9 100644 --- a/src/gallium/auxiliary/postprocess/pp_init.c +++ b/src/gallium/auxiliary/postprocess/pp_init.c @@ -255,7 +255,7 @@ pp_init_fbos(struct pp_queue_t *ppq, unsigned int w, unsigned int h) { - struct program *p = ppq->p; /* The lazy will inherit the earth */ + struct pp_program *p = ppq->p; /* The lazy will inherit the earth */ unsigned int i; struct pipe_resource tmp_res; diff --git a/src/gallium/auxiliary/postprocess/pp_mlaa.c b/src/gallium/auxiliary/postprocess/pp_mlaa.c index b299c66599c..656283fd9fc 100644 --- a/src/gallium/auxiliary/postprocess/pp_mlaa.c +++ b/src/gallium/auxiliary/postprocess/pp_mlaa.c @@ -75,7 +75,7 @@ pp_jimenezmlaa_run(struct pp_queue_t *ppq, struct pipe_resource *in, struct pipe_resource *out, unsigned int n, bool iscolor) { - struct program *p = ppq->p; + struct pp_program *p = ppq->p; struct pipe_depth_stencil_alpha_state mstencil; struct pipe_sampler_view v_tmp, *arr[3]; diff --git a/src/gallium/auxiliary/postprocess/pp_program.c b/src/gallium/auxiliary/postprocess/pp_program.c index 61a03234e89..916d6fceaac 100644 --- a/src/gallium/auxiliary/postprocess/pp_program.c +++ b/src/gallium/auxiliary/postprocess/pp_program.c @@ -37,17 +37,17 @@ #include "util/u_memory.h" /** Initialize the internal details */ -struct program * +struct pp_program * pp_init_prog(struct pp_queue_t *ppq, struct pipe_context *pipe, struct cso_context *cso) { - struct program *p; + struct pp_program *p; pp_debug("Initializing program\n"); if (!pipe) return NULL; - p = CALLOC(1, sizeof(struct program)); + p = CALLOC(1, sizeof(struct pp_program)); if (!p) return NULL; diff --git a/src/gallium/auxiliary/postprocess/pp_program.h b/src/gallium/auxiliary/postprocess/pp_program.h index b7774dc0877..6fecdc3fe5e 100644 --- a/src/gallium/auxiliary/postprocess/pp_program.h +++ b/src/gallium/auxiliary/postprocess/pp_program.h @@ -34,7 +34,7 @@ /** * Internal control details. */ -struct program +struct pp_program { struct pipe_screen *screen; struct pipe_context *pipe; diff --git a/src/gallium/auxiliary/postprocess/pp_run.c b/src/gallium/auxiliary/postprocess/pp_run.c index 81b538c4475..c71dbe9adb6 100644 --- a/src/gallium/auxiliary/postprocess/pp_run.c +++ b/src/gallium/auxiliary/postprocess/pp_run.c @@ -208,7 +208,7 @@ pp_run(struct pp_queue_t *ppq, struct pipe_resource *in, /** Setup this resource as the filter input. */ void -pp_filter_setup_in(struct program *p, struct pipe_resource *in) +pp_filter_setup_in(struct pp_program *p, struct pipe_resource *in) { struct pipe_sampler_view v_tmp; u_sampler_view_default_template(&v_tmp, in, in->format); @@ -217,7 +217,7 @@ pp_filter_setup_in(struct program *p, struct pipe_resource *in) /** Setup this resource as the filter output. */ void -pp_filter_setup_out(struct program *p, struct pipe_resource *out) +pp_filter_setup_out(struct pp_program *p, struct pipe_resource *out) { p->surf.format = out->format; @@ -226,7 +226,7 @@ pp_filter_setup_out(struct program *p, struct pipe_resource *out) /** Clean up the input and output set with the above. */ void -pp_filter_end_pass(struct program *p) +pp_filter_end_pass(struct pp_program *p) { pipe_surface_reference(&p->framebuffer.cbufs[0], NULL); pipe_sampler_view_reference(&p->view, NULL); @@ -277,7 +277,7 @@ pp_tgsi_to_state(struct pipe_context *pipe, const char *text, bool isvs, /** Setup misc state for the filter. */ void -pp_filter_misc_state(struct program *p) +pp_filter_misc_state(struct pp_program *p) { cso_set_blend(p->cso, &p->blend); cso_set_depth_stencil_alpha(p->cso, &p->depthstencil); @@ -289,7 +289,7 @@ pp_filter_misc_state(struct program *p) /** Draw with the filter to the set output. */ void -pp_filter_draw(struct program *p) +pp_filter_draw(struct pp_program *p) { util_draw_vertex_buffer(p->pipe, p->cso, p->vbuf, 0, 0, PIPE_PRIM_QUADS, 4, 2); @@ -297,14 +297,14 @@ pp_filter_draw(struct program *p) /** Set the framebuffer as active. */ void -pp_filter_set_fb(struct program *p) +pp_filter_set_fb(struct pp_program *p) { cso_set_framebuffer(p->cso, &p->framebuffer); } /** Set the framebuffer as active and clear it. */ void -pp_filter_set_clear_fb(struct program *p) +pp_filter_set_clear_fb(struct pp_program *p) { cso_set_framebuffer(p->cso, &p->framebuffer); p->pipe->clear(p->pipe, PIPE_CLEAR_COLOR, &p->clear_color, 0, 0);