diff --git a/docs/_extra/_redirects b/docs/_extra/_redirects index 3bbf34c7342..322ca43c5be 100644 --- a/docs/_extra/_redirects +++ b/docs/_extra/_redirects @@ -8,7 +8,6 @@ /gallium/drivers/llvmpipe.html /drivers/llvmpipe.html 301 /gallium/drivers/zink.html /drivers/zink.html 301 /llvmpipe.html /drivers/llvmpipe.html 301 -/postprocess.html /gallium/postprocess.html 301 /versions.html /relnotes.html 301 /vmware-guest.html /drivers/vmware-guest.html 301 /shading.html /glsl.html diff --git a/docs/gallium/index.rst b/docs/gallium/index.rst index 207bd3aae8f..07a2581f2b3 100644 --- a/docs/gallium/index.rst +++ b/docs/gallium/index.rst @@ -15,7 +15,6 @@ Contents: context cso buffermapping - postprocess glossary Indices and tables diff --git a/docs/gallium/postprocess.rst b/docs/gallium/postprocess.rst deleted file mode 100644 index 929caaeaa09..00000000000 --- a/docs/gallium/postprocess.rst +++ /dev/null @@ -1,33 +0,0 @@ -Gallium Post-processing -======================= - -The Gallium drivers support user-defined image post-processing. At the -end of drawing a frame a post-processing filter can be applied to the -rendered image. Example filters include morphological antialiasing and -cell shading. - -The filters can be toggled per-app via driconf, or per-session via the -corresponding environment variables. - -Multiple filters can be used together. - -PP environment variables ------------------------- - -- PP_DEBUG - If defined debug information will be printed to stderr. - -Current filters ---------------- - -- pp_nored, pp_nogreen, pp_noblue - set to 1 to remove the - corresponding color channel. These are basic filters for easy testing - of the PP queue. -- pp_jimenezmlaa, pp_jimenezmlaa_color - `Jimenez's - MLAA `__ is a morphological - antialiasing filter. The two versions use depth and color data, - respectively. Which works better depends on the app - depth will not - blur text, but it will miss transparent textures for example. Set to - a number from 2 to 32, roughly corresponding to quality. Numbers - higher than 8 see minimizing gains. -- pp_celshade - set to 1 to enable cell shading (a more complex color - filter). diff --git a/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h b/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h index 4886abe9f62..81f7a92d765 100644 --- a/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h +++ b/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h @@ -6,15 +6,6 @@ DRI_CONF_SECTION_PERFORMANCE DRI_CONF_MESA_NO_ERROR(false) DRI_CONF_SECTION_END -DRI_CONF_SECTION_QUALITY - DRI_CONF_PP_CELSHADE(0) - DRI_CONF_PP_NORED(0) - DRI_CONF_PP_NOGREEN(0) - DRI_CONF_PP_NOBLUE(0) - DRI_CONF_PP_JIMENEZMLAA(0, 0, 32) - DRI_CONF_PP_JIMENEZMLAA_COLOR(0, 0, 32) -DRI_CONF_SECTION_END - DRI_CONF_SECTION_DEBUG DRI_CONF_FORCE_GLSL_EXTENSIONS_WARN(false) DRI_CONF_DISABLE_GLSL_LINE_CONTINUATIONS(false) diff --git a/src/util/driconf.h b/src/util/driconf.h index 348425a00c6..8762d0c5b60 100644 --- a/src/util/driconf.h +++ b/src/util/driconf.h @@ -413,34 +413,6 @@ DRI_CONF_OPT_B(precise_trig, def, \ "Prefer accuracy over performance in trig functions") -#define DRI_CONF_PP_CELSHADE(def) \ - DRI_CONF_OPT_E(pp_celshade, def, 0, 1, \ - "A post-processing filter to cel-shade the output", \ - { 0 } ) - -#define DRI_CONF_PP_NORED(def) \ - DRI_CONF_OPT_E(pp_nored, def, 0, 1, \ - "A post-processing filter to remove the red channel", \ - { 0 } ) - -#define DRI_CONF_PP_NOGREEN(def) \ - DRI_CONF_OPT_E(pp_nogreen, def, 0, 1, \ - "A post-processing filter to remove the green channel", \ - { 0 } ) - -#define DRI_CONF_PP_NOBLUE(def) \ - DRI_CONF_OPT_E(pp_noblue, def, 0, 1, \ - "A post-processing filter to remove the blue channel", \ - { 0 } ) - -#define DRI_CONF_PP_JIMENEZMLAA(def,min,max) \ - DRI_CONF_OPT_I(pp_jimenezmlaa, def, min, max, \ - "Morphological anti-aliasing based on Jimenez' MLAA. 0 to disable, 8 for default quality") - -#define DRI_CONF_PP_JIMENEZMLAA_COLOR(def,min,max) \ - DRI_CONF_OPT_I(pp_jimenezmlaa_color, def, min, max, \ - "Morphological anti-aliasing based on Jimenez' MLAA. 0 to disable, 8 for default quality. Color version, usable with 2d GL apps") - #define DRI_CONF_PP_LOWER_DEPTH_RANGE_RATE() \ DRI_CONF_OPT_F(lower_depth_range_rate, 1.0, 0.0, 1.0, \ "Lower depth range for fixing misrendering issues due to z coordinate float point interpolation accuracy")