fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 13:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

gallium: Drop users of post-processing filters

Browse source 
Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Reviewed-by: Marek Olšák <maraeo@gmail.com>
Reviewed-by: Emma Anholt <emma@anholt.net>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Reviewed-by: Christian Gmeiner <cgmeiner@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5448>
This commit is contained in:
Alyssa Rosenzweig 2020-06-12 15:37:08 -04:00 • committed by Marge Bot
parent fd46a48ccc
commit 168141fbac
7 changed files with 0 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/gallium/frontends/dri/dri_context.c
View file

@ -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;
}

1
src/gallium/frontends/dri/dri_context.h
View file

@ -75,7 +75,6 @@ struct dri_context
/* gallium */
struct st_context *st;
struct pp_queue_t *pp;
struct hud_context *hud;
};

14
src/gallium/frontends/dri/dri_drawable.c
View file

@ -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])

12
src/gallium/frontends/dri/dri_screen.c
View file

@ -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,

4
src/gallium/frontends/dri/dri_screen.h
View file

@ -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;

5
src/gallium/frontends/dri/drisw.c
View file

@ -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);

5
src/gallium/frontends/hgl/hgl_context.h
View file

@ -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