From c68530bedb00966fd8e7df982c623f5dc329e016 Mon Sep 17 00:00:00 2001 From: David Heidelberg Date: Tue, 3 Jan 2023 00:25:52 +0100 Subject: [PATCH] postprocess: move the definition of pp_filters into **/pp_init.c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit An LTO-friendly move. Fixes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/7881 Reviewed-by: Adam Jackson Reviewed-by: Marek Olšák Signed-off-by: David Heidelberg Part-of: --- src/gallium/auxiliary/postprocess/filters.h | 13 +------------ src/gallium/auxiliary/postprocess/pp_init.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/gallium/auxiliary/postprocess/filters.h b/src/gallium/auxiliary/postprocess/filters.h index 321f333a326..c582721be15 100644 --- a/src/gallium/auxiliary/postprocess/filters.h +++ b/src/gallium/auxiliary/postprocess/filters.h @@ -49,16 +49,5 @@ struct pp_filter_t pp_free_func free; /* Free function */ }; -/* Order matters. Put new filters in a suitable place. */ - -static const struct pp_filter_t pp_filters[PP_FILTERS] = { -/* name inner shaders verts init run free */ - { "pp_noblue", 0, 2, 1, pp_noblue_init, pp_nocolor, pp_nocolor_free }, - { "pp_nogreen", 0, 2, 1, pp_nogreen_init, pp_nocolor, pp_nocolor_free }, - { "pp_nored", 0, 2, 1, pp_nored_init, pp_nocolor, pp_nocolor_free }, - { "pp_celshade", 0, 2, 1, pp_celshade_init, pp_nocolor, pp_celshade_free }, - { "pp_jimenezmlaa", 2, 5, 2, pp_jimenezmlaa_init, pp_jimenezmlaa, pp_jimenezmlaa_free }, - { "pp_jimenezmlaa_color", 2, 5, 2, pp_jimenezmlaa_init_color, pp_jimenezmlaa_color, pp_jimenezmlaa_free }, -}; - +extern const struct pp_filter_t pp_filters[PP_FILTERS]; #endif diff --git a/src/gallium/auxiliary/postprocess/pp_init.c b/src/gallium/auxiliary/postprocess/pp_init.c index 4d551db7a71..cdaa464cae9 100644 --- a/src/gallium/auxiliary/postprocess/pp_init.c +++ b/src/gallium/auxiliary/postprocess/pp_init.c @@ -37,6 +37,16 @@ #include "util/u_memory.h" #include "cso_cache/cso_context.h" +const struct pp_filter_t pp_filters[PP_FILTERS] = { +/* name inner shaders verts init run free */ + { "pp_noblue", 0, 2, 1, pp_noblue_init, pp_nocolor, pp_nocolor_free }, + { "pp_nogreen", 0, 2, 1, pp_nogreen_init, pp_nocolor, pp_nocolor_free }, + { "pp_nored", 0, 2, 1, pp_nored_init, pp_nocolor, pp_nocolor_free }, + { "pp_celshade", 0, 2, 1, pp_celshade_init, pp_nocolor, pp_celshade_free }, + { "pp_jimenezmlaa", 2, 5, 2, pp_jimenezmlaa_init, pp_jimenezmlaa, pp_jimenezmlaa_free }, + { "pp_jimenezmlaa_color", 2, 5, 2, pp_jimenezmlaa_init_color, pp_jimenezmlaa_color, pp_jimenezmlaa_free }, +}; + /** Initialize the post-processing queue. */ struct pp_queue_t * pp_init(struct pipe_context *pipe, const unsigned int *enabled,