diff --git a/src/gallium/frontends/dri/dri_context.c b/src/gallium/frontends/dri/dri_context.c index bae29d639d5..cfeb490ecea 100644 --- a/src/gallium/frontends/dri/dri_context.c +++ b/src/gallium/frontends/dri/dri_context.c @@ -196,8 +196,6 @@ dri_create_context(struct dri_screen *screen, ctx->st->frontend_context = (void *) ctx; if (ctx->st->cso_context) { - ctx->pp = pp_init(ctx->st->pipe, screen->pp_enabled, ctx->st->cso_context, - ctx->st, st_context_invalidate_state); ctx->hud = hud_create(ctx->st->cso_context, share_ctx ? share_ctx->hud : NULL, ctx->st, st_context_invalidate_state); @@ -260,9 +258,6 @@ dri_destroy_context(struct dri_context *ctx) hud_destroy(ctx->hud, ctx->st->cso_context); } - if (ctx->pp) - pp_free(ctx->pp); - /* No particular reason to wait for command completion before * destroying a context, but we flush the context here * to avoid having to add code elsewhere to cope with flushing a @@ -344,11 +339,6 @@ dri_make_current(struct dri_context *ctx, st_api_make_current(ctx->st, &draw->base, &read->base); - /* This is ok to call here. If they are already init, it's a no-op. */ - if (ctx->pp && draw->textures[ST_ATTACHMENT_BACK_LEFT]) - pp_init_fbos(ctx->pp, draw->textures[ST_ATTACHMENT_BACK_LEFT]->width0, - draw->textures[ST_ATTACHMENT_BACK_LEFT]->height0); - return GL_TRUE; } diff --git a/src/gallium/frontends/dri/dri_context.h b/src/gallium/frontends/dri/dri_context.h index 7bd8b847db9..dd3ab8fb290 100644 --- a/src/gallium/frontends/dri/dri_context.h +++ b/src/gallium/frontends/dri/dri_context.h @@ -75,7 +75,6 @@ struct dri_context /* gallium */ struct st_context *st; - struct pp_queue_t *pp; struct hud_context *hud; }; diff --git a/src/gallium/frontends/dri/dri_drawable.c b/src/gallium/frontends/dri/dri_drawable.c index 2efcb633985..cb027a25d04 100644 --- a/src/gallium/frontends/dri/dri_drawable.c +++ b/src/gallium/frontends/dri/dri_drawable.c @@ -392,18 +392,6 @@ dri_pipe_blit(struct pipe_context *pipe, pipe->blit(pipe, &blit); } -static void -dri_postprocessing(struct dri_context *ctx, - struct dri_drawable *drawable, - enum st_attachment_type att) -{ - struct pipe_resource *src = drawable->textures[att]; - struct pipe_resource *zsbuf = drawable->textures[ST_ATTACHMENT_DEPTH_STENCIL]; - - if (ctx->pp && src) - pp_run(ctx->pp, src, src, zsbuf); -} - struct notify_before_flush_cb_args { struct dri_context *ctx; struct dri_drawable *drawable; @@ -443,8 +431,6 @@ notify_before_flush_cb(void* _args) /* FRONT_LEFT is resolved in drawable->flush_frontbuffer. */ } - dri_postprocessing(args->ctx, args->drawable, ST_ATTACHMENT_BACK_LEFT); - if (pipe->invalidate_resource && (args->flags & __DRI2_FLUSH_INVALIDATE_ANCILLARY)) { if (args->drawable->textures[ST_ATTACHMENT_DEPTH_STENCIL]) diff --git a/src/gallium/frontends/dri/dri_screen.c b/src/gallium/frontends/dri/dri_screen.c index 972d210db5d..1519e77af46 100644 --- a/src/gallium/frontends/dri/dri_screen.c +++ b/src/gallium/frontends/dri/dri_screen.c @@ -606,17 +606,6 @@ dri_destroy_screen(struct dri_screen *screen) free(screen); } -static void -dri_postprocessing_init(struct dri_screen *screen) -{ - unsigned i; - - for (i = 0; i < PP_FILTERS; i++) { - screen->pp_enabled[i] = driQueryOptioni(&screen->dev->option_cache, - pp_filters[i].name); - } -} - static void dri_set_background_context(struct st_context *st, struct util_queue_monitoring *queue_info) @@ -644,7 +633,6 @@ dri_init_screen(struct dri_screen *screen, screen->target = PIPE_TEXTURE_RECT; dri_init_options(screen); - dri_postprocessing_init(screen); st_api_query_versions(&screen->base, &screen->options, diff --git a/src/gallium/frontends/dri/dri_screen.h b/src/gallium/frontends/dri/dri_screen.h index acdd624cd21..a9dd5101301 100644 --- a/src/gallium/frontends/dri/dri_screen.h +++ b/src/gallium/frontends/dri/dri_screen.h @@ -40,7 +40,6 @@ #include "frontend/api.h" #include "frontend/opencl_interop.h" #include "util/u_thread.h" -#include "postprocess/filters.h" #include "kopper_interface.h" struct dri_context; @@ -91,9 +90,6 @@ struct dri_screen struct st_config_options options; - /* Which postprocessing filters are enabled. */ - unsigned pp_enabled[PP_FILTERS]; - /* drm */ int fd; bool can_share_buffer; diff --git a/src/gallium/frontends/dri/drisw.c b/src/gallium/frontends/dri/drisw.c index 394b6986832..d0fd0ece2be 100644 --- a/src/gallium/frontends/dri/drisw.c +++ b/src/gallium/frontends/dri/drisw.c @@ -249,9 +249,6 @@ drisw_swap_buffers_with_damage(struct dri_drawable *drawable, int nrects, const if (ptex) { struct pipe_fence_handle *fence = NULL; - if (ctx->pp) - pp_run(ctx->pp, ptex, ptex, drawable->textures[ST_ATTACHMENT_DEPTH_STENCIL]); - if (ctx->hud) hud_run(ctx->hud, ctx->st->cso_context, ptex); @@ -301,8 +298,6 @@ drisw_copy_sub_buffer(struct dri_drawable *drawable, int x, int y, _mesa_glthread_finish(ctx->st->ctx); struct pipe_fence_handle *fence = NULL; - if (ctx->pp && drawable->textures[ST_ATTACHMENT_DEPTH_STENCIL]) - pp_run(ctx->pp, ptex, ptex, drawable->textures[ST_ATTACHMENT_DEPTH_STENCIL]); st_context_flush(ctx->st, ST_FLUSH_FRONT, &fence, NULL, NULL); diff --git a/src/gallium/frontends/hgl/hgl_context.h b/src/gallium/frontends/hgl/hgl_context.h index 4ec985e1571..711e63eaff6 100644 --- a/src/gallium/frontends/hgl/hgl_context.h +++ b/src/gallium/frontends/hgl/hgl_context.h @@ -12,7 +12,6 @@ #include "util/format/u_formats.h" #include "util/compiler.h" #include "pipe/p_screen.h" -#include "postprocess/filters.h" #include "frontend/api.h" @@ -73,10 +72,6 @@ struct hgl_context { struct hgl_display* display; struct st_context* st; - - // Post processing - struct pp_queue_t* postProcess; - unsigned int postProcessEnable[PP_FILTERS]; }; // hgl framebuffer