From: Eric Engestrom Date: Fri, 12 Jun 2020 09:42:32 +0000 (+0200) Subject: util: rename xmlpool.h to driconf.h X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=04e8eaf4e82270d4eea578cd6d43eb1deea05a4d;p=mesa.git util: rename xmlpool.h to driconf.h To make it clearer what it is and does. Signed-off-by: Eric Engestrom Part-of: --- diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index 423b5b36b00..1db64cb2ac9 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -63,7 +63,7 @@ #include "util/timespec.h" #include "util/u_atomic.h" #include "compiler/glsl_types.h" -#include "util/xmlpool.h" +#include "util/driconf.h" static struct radv_timeline_point * radv_timeline_find_point_at_least_locked(struct radv_device *device, diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h index 2fc3752a783..3da538c7dc9 100644 --- a/src/egl/drivers/dri2/egl_dri2.h +++ b/src/egl/drivers/dri2/egl_dri2.h @@ -363,7 +363,7 @@ struct dri2_egl_sync { void *fence; }; -/* From xmlpool.h, user exposed so should be stable */ +/* From driconf.h, user exposed so should be stable */ #define DRI_CONF_VBLANK_NEVER 0 #define DRI_CONF_VBLANK_DEF_INTERVAL_0 1 #define DRI_CONF_VBLANK_DEF_INTERVAL_1 2 diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader.c b/src/gallium/auxiliary/pipe-loader/pipe_loader.c index e0fb249b6f0..cfe6faddaf1 100644 --- a/src/gallium/auxiliary/pipe-loader/pipe_loader.c +++ b/src/gallium/auxiliary/pipe-loader/pipe_loader.c @@ -33,7 +33,7 @@ #include "util/u_dl.h" #include "util/u_file.h" #include "util/xmlconfig.h" -#include "util/xmlpool.h" +#include "util/driconf.h" #include diff --git a/src/gallium/auxiliary/postprocess/ADDING b/src/gallium/auxiliary/postprocess/ADDING index 39f2eda0022..b202c5b627e 100644 --- a/src/gallium/auxiliary/postprocess/ADDING +++ b/src/gallium/auxiliary/postprocess/ADDING @@ -61,7 +61,7 @@ main function as is. --------------------------- First time outside of auxiliary/postprocess. First, add a suitable description to -src/util/xmlpool.h. +src/util/driconf.h. Use the name you put into filters.h as the config option name. With driconf aware of the option, make Gallium aware of it too. Add it to diff --git a/src/gallium/auxiliary/target-helpers/drm_helper.h b/src/gallium/auxiliary/target-helpers/drm_helper.h index 6010631e9a6..7d8e30e0ab4 100644 --- a/src/gallium/auxiliary/target-helpers/drm_helper.h +++ b/src/gallium/auxiliary/target-helpers/drm_helper.h @@ -5,7 +5,7 @@ #include "target-helpers/inline_debug_helper.h" #include "target-helpers/drm_helper_public.h" #include "frontend/drm_driver.h" -#include "util/xmlpool.h" +#include "util/driconf.h" #ifdef GALLIUM_I915 #include "i915/drm/i915_drm_public.h" diff --git a/src/gallium/drivers/virgl/virgl_driinfo.h.in b/src/gallium/drivers/virgl/virgl_driinfo.h.in index 8119d77a18d..2c7be56e92c 100644 --- a/src/gallium/drivers/virgl/virgl_driinfo.h.in +++ b/src/gallium/drivers/virgl/virgl_driinfo.h.in @@ -1,6 +1,6 @@ // DriConf options specific to virgl // To add a new tweak: -// 1. Define the tweak in util/xmlpool.h and also add +// 1. Define the tweak in util/driconf.h and also add // the tweak name as define to virgl_protocol.h // 2. Add the tweak here with the appropriated default value // 3. Add the code to query the tweak in virgl_create_screen diff --git a/src/gallium/targets/d3dadapter9/drm.c b/src/gallium/targets/d3dadapter9/drm.c index a230475d7de..41fa71a4349 100644 --- a/src/gallium/targets/d3dadapter9/drm.c +++ b/src/gallium/targets/d3dadapter9/drm.c @@ -38,7 +38,7 @@ #include "d3dadapter/drm.h" #include "util/xmlconfig.h" -#include "util/xmlpool.h" +#include "util/driconf.h" #include "drm-uapi/drm.h" #include diff --git a/src/gallium/targets/pipe-loader/pipe_radeonsi.c b/src/gallium/targets/pipe-loader/pipe_radeonsi.c index f5c5770af08..d8cbe02c1b7 100644 --- a/src/gallium/targets/pipe-loader/pipe_radeonsi.c +++ b/src/gallium/targets/pipe-loader/pipe_radeonsi.c @@ -1,7 +1,7 @@ #include "frontend/drm_driver.h" #include "target-helpers/inline_debug_helper.h" #include "radeonsi/si_public.h" -#include "util/xmlpool.h" +#include "util/driconf.h" static struct pipe_screen * create_screen(int fd, const struct pipe_screen_config *config) diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c index 774c1ee5815..af50fbe9d9c 100644 --- a/src/glx/dri2_glx.c +++ b/src/glx/dri2_glx.c @@ -50,7 +50,7 @@ #include "dri2_priv.h" #include "loader.h" -/* From xmlpool.h, user exposed so should be stable */ +/* From driconf.h, user exposed so should be stable */ #define DRI_CONF_VBLANK_NEVER 0 #define DRI_CONF_VBLANK_DEF_INTERVAL_0 1 #define DRI_CONF_VBLANK_DEF_INTERVAL_1 2 diff --git a/src/glx/dri3_priv.h b/src/glx/dri3_priv.h index f26edabe047..dbd04c00bb4 100644 --- a/src/glx/dri3_priv.h +++ b/src/glx/dri3_priv.h @@ -61,7 +61,7 @@ #include "loader_dri3_helper.h" -/* From xmlpool.h, user exposed so should be stable */ +/* From driconf.h, user exposed so should be stable */ #define DRI_CONF_VBLANK_NEVER 0 #define DRI_CONF_VBLANK_DEF_INTERVAL_0 1 #define DRI_CONF_VBLANK_DEF_INTERVAL_1 2 diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c index 97d0088bd90..13492e4d553 100644 --- a/src/intel/vulkan/anv_device.c +++ b/src/intel/vulkan/anv_device.c @@ -39,7 +39,7 @@ #include "util/os_file.h" #include "util/u_atomic.h" #include "util/u_string.h" -#include "util/xmlpool.h" +#include "util/driconf.h" #include "git_sha1.h" #include "vk_util.h" #include "common/gen_aux_map.h" diff --git a/src/loader/loader.c b/src/loader/loader.c index 8548cbdfedb..e0b08dfa6cb 100644 --- a/src/loader/loader.c +++ b/src/loader/loader.c @@ -53,7 +53,7 @@ #define MAX_DRM_DEVICES 64 #ifdef USE_DRICONF #include "util/xmlconfig.h" -#include "util/xmlpool.h" +#include "util/driconf.h" #endif #endif diff --git a/src/loader/loader_dri3_helper.c b/src/loader/loader_dri3_helper.c index 2c8cb9a9193..95f93da0e3a 100644 --- a/src/loader/loader_dri3_helper.c +++ b/src/loader/loader_dri3_helper.c @@ -37,7 +37,7 @@ #include "util/macros.h" #include "drm-uapi/drm_fourcc.h" -/* From xmlpool.h, user exposed so should be stable */ +/* From driconf.h, user exposed so should be stable */ #define DRI_CONF_VBLANK_NEVER 0 #define DRI_CONF_VBLANK_DEF_INTERVAL_0 1 #define DRI_CONF_VBLANK_DEF_INTERVAL_1 2 diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c index e90179c7f2e..c5e8091cf80 100644 --- a/src/mesa/drivers/dri/common/dri_util.c +++ b/src/mesa/drivers/dri/common/dri_util.c @@ -43,7 +43,7 @@ #include "dri_util.h" #include "utils.h" #include "util/u_endian.h" -#include "util/xmlpool.h" +#include "util/driconf.h" #include "main/mtypes.h" #include "main/framebuffer.h" #include "main/version.h" diff --git a/src/mesa/drivers/dri/i915/intel_screen.c b/src/mesa/drivers/dri/i915/intel_screen.c index 2243b7df5da..cf134339564 100644 --- a/src/mesa/drivers/dri/i915/intel_screen.c +++ b/src/mesa/drivers/dri/i915/intel_screen.c @@ -40,7 +40,7 @@ #include "swrast/s_renderbuffer.h" #include "utils.h" -#include "util/xmlpool.h" +#include "util/driconf.h" #include "util/u_memory.h" static const __DRIconfigOptionsExtension i915_config_options = { diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index 45905c48ffa..b72c247bffb 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -44,7 +44,7 @@ #include "utils.h" #include "util/disk_cache.h" -#include "util/xmlpool.h" +#include "util/driconf.h" #include "util/u_memory.h" #include "common/gen_defines.h" diff --git a/src/mesa/drivers/dri/r200/r200_context.c b/src/mesa/drivers/dri/r200/r200_context.c index f1c5e8f172b..ab0c6c9d38e 100644 --- a/src/mesa/drivers/dri/r200/r200_context.c +++ b/src/mesa/drivers/dri/r200/r200_context.c @@ -65,7 +65,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "radeon_span.h" #include "utils.h" -#include "util/xmlpool.h" /* for symbolic values of enum-type options */ +#include "util/driconf.h" /* for symbolic values of enum-type options */ /* Return various strings for glGetString(). */ diff --git a/src/mesa/drivers/dri/r200/r200_state_init.c b/src/mesa/drivers/dri/r200/r200_state_init.c index 3d6e6559973..5c6b575ff87 100644 --- a/src/mesa/drivers/dri/r200/r200_state_init.c +++ b/src/mesa/drivers/dri/r200/r200_state_init.c @@ -50,7 +50,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "r200_state.h" #include "radeon_queryobj.h" -#include "util/xmlpool.h" +#include "util/driconf.h" /* New (1.3) state mechanism. 3 commands (packet, scalar, vector) in * 1.3 cmdbuffers allow all previous state to be updated as well as diff --git a/src/mesa/drivers/dri/r200/r200_tex.c b/src/mesa/drivers/dri/r200/r200_tex.c index 51f4495e18a..6e51ebe5553 100644 --- a/src/mesa/drivers/dri/r200/r200_tex.c +++ b/src/mesa/drivers/dri/r200/r200_tex.c @@ -46,7 +46,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "r200_tex.h" #include "util/u_memory.h" -#include "util/xmlpool.h" +#include "util/driconf.h" diff --git a/src/mesa/drivers/dri/radeon/radeon_common_context.c b/src/mesa/drivers/dri/radeon/radeon_common_context.c index 47719baa575..416d2d988fe 100644 --- a/src/mesa/drivers/dri/radeon/radeon_common_context.c +++ b/src/mesa/drivers/dri/radeon/radeon_common_context.c @@ -33,7 +33,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ #include "radeon_common.h" -#include "util/xmlpool.h" /* for symbolic values of enum-type options */ +#include "util/driconf.h" /* for symbolic values of enum-type options */ #include "utils.h" #include "drivers/common/meta.h" #include "main/context.h" diff --git a/src/mesa/drivers/dri/radeon/radeon_context.c b/src/mesa/drivers/dri/radeon/radeon_context.c index e05b8ba2ff6..5a1c01fdd0d 100644 --- a/src/mesa/drivers/dri/radeon/radeon_context.c +++ b/src/mesa/drivers/dri/radeon/radeon_context.c @@ -66,7 +66,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "radeon_fog.h" #include "utils.h" -#include "util/xmlpool.h" /* for symbolic values of enum-type options */ +#include "util/driconf.h" /* for symbolic values of enum-type options */ extern const struct tnl_pipeline_stage _radeon_render_stage; extern const struct tnl_pipeline_stage _radeon_tcl_stage; diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c index f438654fb26..c56eba0b935 100644 --- a/src/mesa/drivers/dri/radeon/radeon_screen.c +++ b/src/mesa/drivers/dri/radeon/radeon_screen.c @@ -62,7 +62,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. /* Radeon configuration */ -#include "util/xmlpool.h" +#include "util/driconf.h" #define DRI_CONF_COMMAND_BUFFER_SIZE(def,min,max) \ DRI_CONF_OPT_BEGIN_V(command_buffer_size,int,def, # min ":" # max ) \ diff --git a/src/mesa/drivers/dri/radeon/radeon_state_init.c b/src/mesa/drivers/dri/radeon/radeon_state_init.c index ac387184f69..d1369ce0b2c 100644 --- a/src/mesa/drivers/dri/radeon/radeon_state_init.c +++ b/src/mesa/drivers/dri/radeon/radeon_state_init.c @@ -44,7 +44,7 @@ #include "../r200/r200_reg.h" -#include "util/xmlpool.h" +#include "util/driconf.h" /* New (1.3) state mechanism. 3 commands (packet, scalar, vector) in * 1.3 cmdbuffers allow all previous state to be updated as well as diff --git a/src/mesa/drivers/dri/radeon/radeon_tex.c b/src/mesa/drivers/dri/radeon/radeon_tex.c index c3d7affffab..6a5579b2c2b 100644 --- a/src/mesa/drivers/dri/radeon/radeon_tex.c +++ b/src/mesa/drivers/dri/radeon/radeon_tex.c @@ -44,7 +44,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "radeon_tex.h" #include "util/u_memory.h" -#include "util/xmlpool.h" +#include "util/driconf.h" diff --git a/src/mesa/drivers/dri/radeon/radeon_texture.c b/src/mesa/drivers/dri/radeon/radeon_texture.c index 86059c44751..e6ab7a80ecd 100644 --- a/src/mesa/drivers/dri/radeon/radeon_texture.c +++ b/src/mesa/drivers/dri/radeon/radeon_texture.c @@ -40,7 +40,7 @@ #include "main/texobj.h" #include "drivers/common/meta.h" -#include "util/xmlpool.h" /* for symbolic values of enum-type options */ +#include "util/driconf.h" /* for symbolic values of enum-type options */ #include "radeon_common.h" diff --git a/src/util/driconf.h b/src/util/driconf.h new file mode 100644 index 00000000000..7f9312241d4 --- /dev/null +++ b/src/util/driconf.h @@ -0,0 +1,501 @@ +/* + * XML DRI client-side driver configuration + * Copyright (C) 2003 Felix Kuehling + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * FELIX KUEHLING, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE + * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + */ +/** + * \file driconf.h + * \brief Pool of common options + * \author Felix Kuehling + * + * This file defines macros that can be used to construct + * driConfigOptions in the drivers. + */ + +#ifndef __DRICONF_H +#define __DRICONF_H + +/* + * generic macros + */ + +/** \brief Begin __driConfigOptions */ +#define DRI_CONF_BEGIN \ +"" \ +"" \ +" " \ +" " \ +" " \ +" " \ +" " \ +" " \ +" " \ +"]>" \ +"\n" + +/** \brief End __driConfigOptions */ +#define DRI_CONF_END \ +"\n" + +/** \brief Begin a section of related options */ +#define DRI_CONF_SECTION_BEGIN \ +"
\n" + +/** \brief End a section of related options */ +#define DRI_CONF_SECTION_END \ +"
\n" + +/** \brief Begin an option definition */ +#define DRI_CONF_OPT_BEGIN(name,type,def) \ +"\n" + +/** \brief A verbal description (empty version) */ +#define DRI_CONF_DESC(text) \ +"\n" + +/** \brief Begining of a verbal description */ +#define DRI_CONF_DESC_BEGIN(text) \ +"\n" + +/** \brief End a description */ +#define DRI_CONF_DESC_END \ +"\n" + +/** \brief A verbal description of an enum value */ +#define DRI_CONF_ENUM(value,text) \ +"\n" + + +/** + * \brief Debugging options + */ +#define DRI_CONF_SECTION_DEBUG \ +DRI_CONF_SECTION_BEGIN \ + DRI_CONF_DESC("Debugging") + +#define DRI_CONF_ALWAYS_FLUSH_BATCH(def) \ +DRI_CONF_OPT_BEGIN_B(always_flush_batch, def) \ + DRI_CONF_DESC("Enable flushing batchbuffer after each draw call") \ +DRI_CONF_OPT_END + +#define DRI_CONF_ALWAYS_FLUSH_CACHE(def) \ +DRI_CONF_OPT_BEGIN_B(always_flush_cache, def) \ + DRI_CONF_DESC("Enable flushing GPU caches with each draw call") \ +DRI_CONF_OPT_END + +#define DRI_CONF_DISABLE_THROTTLING(def) \ +DRI_CONF_OPT_BEGIN_B(disable_throttling, def) \ + DRI_CONF_DESC("Disable throttling on first batch after flush") \ +DRI_CONF_OPT_END + +#define DRI_CONF_FORCE_GLSL_EXTENSIONS_WARN(def) \ +DRI_CONF_OPT_BEGIN_B(force_glsl_extensions_warn, def) \ + DRI_CONF_DESC("Force GLSL extension default behavior to 'warn'") \ +DRI_CONF_OPT_END + +#define DRI_CONF_DISABLE_BLEND_FUNC_EXTENDED(def) \ +DRI_CONF_OPT_BEGIN_B(disable_blend_func_extended, def) \ + DRI_CONF_DESC("Disable dual source blending") \ +DRI_CONF_OPT_END + +#define DRI_CONF_DISABLE_ARB_GPU_SHADER5(def) \ +DRI_CONF_OPT_BEGIN_B(disable_arb_gpu_shader5, def) \ + DRI_CONF_DESC("Disable GL_ARB_gpu_shader5") \ +DRI_CONF_OPT_END + +#define DRI_CONF_DUAL_COLOR_BLEND_BY_LOCATION(def) \ +DRI_CONF_OPT_BEGIN_B(dual_color_blend_by_location, def) \ + DRI_CONF_DESC("Identify dual color blending sources by location rather than index") \ +DRI_CONF_OPT_END + +#define DRI_CONF_DISABLE_GLSL_LINE_CONTINUATIONS(def) \ +DRI_CONF_OPT_BEGIN_B(disable_glsl_line_continuations, def) \ + DRI_CONF_DESC("Disable backslash-based line continuations in GLSL source") \ +DRI_CONF_OPT_END + +#define DRI_CONF_FORCE_GLSL_VERSION(def) \ +DRI_CONF_OPT_BEGIN_V(force_glsl_version, int, def, "0:999") \ + DRI_CONF_DESC("Force a default GLSL version for shaders that lack an explicit #version line") \ +DRI_CONF_OPT_END + +#define DRI_CONF_ALLOW_GLSL_EXTENSION_DIRECTIVE_MIDSHADER(def) \ +DRI_CONF_OPT_BEGIN_B(allow_glsl_extension_directive_midshader, def) \ + DRI_CONF_DESC("Allow GLSL #extension directives in the middle of shaders") \ +DRI_CONF_OPT_END + +#define DRI_CONF_ALLOW_GLSL_BUILTIN_CONST_EXPRESSION(def) \ +DRI_CONF_OPT_BEGIN_B(allow_glsl_builtin_const_expression, def) \ + DRI_CONF_DESC("Allow builtins as part of constant expressions") \ +DRI_CONF_OPT_END + +#define DRI_CONF_ALLOW_GLSL_RELAXED_ES(def) \ +DRI_CONF_OPT_BEGIN_B(allow_glsl_relaxed_es, def) \ + DRI_CONF_DESC("Allow some relaxation of GLSL ES shader restrictions") \ +DRI_CONF_OPT_END + +#define DRI_CONF_ALLOW_GLSL_BUILTIN_VARIABLE_REDECLARATION(def) \ +DRI_CONF_OPT_BEGIN_B(allow_glsl_builtin_variable_redeclaration, def) \ + DRI_CONF_DESC("Allow GLSL built-in variables to be redeclared verbatim") \ +DRI_CONF_OPT_END + +#define DRI_CONF_ALLOW_HIGHER_COMPAT_VERSION(def) \ +DRI_CONF_OPT_BEGIN_B(allow_higher_compat_version, def) \ + DRI_CONF_DESC("Allow a higher compat profile (version 3.1+) for apps that request it") \ +DRI_CONF_OPT_END + +#define DRI_CONF_FORCE_GLSL_ABS_SQRT(def) \ +DRI_CONF_OPT_BEGIN_B(force_glsl_abs_sqrt, def) \ + DRI_CONF_DESC("Force computing the absolute value for sqrt() and inversesqrt()") \ +DRI_CONF_OPT_END + +#define DRI_CONF_GLSL_CORRECT_DERIVATIVES_AFTER_DISCARD(def) \ +DRI_CONF_OPT_BEGIN_B(glsl_correct_derivatives_after_discard, def) \ + DRI_CONF_DESC("Implicit and explicit derivatives after a discard behave as if the discard didn't happen") \ +DRI_CONF_OPT_END + +#define DRI_CONF_ALLOW_GLSL_CROSS_STAGE_INTERPOLATION_MISMATCH(def) \ +DRI_CONF_OPT_BEGIN_B(allow_glsl_cross_stage_interpolation_mismatch, def) \ + DRI_CONF_DESC("Allow interpolation qualifier mismatch across shader stages") \ +DRI_CONF_OPT_END + +#define DRI_CONF_ALLOW_GLSL_LAYOUT_QUALIFIER_ON_FUNCTION_PARAMETERS(def) \ +DRI_CONF_OPT_BEGIN_B(allow_glsl_layout_qualifier_on_function_parameters, def) \ + DRI_CONF_DESC("Allow layout qualifiers on function parameters.") \ +DRI_CONF_OPT_END + +#define DRI_CONF_ALLOW_DRAW_OUT_OF_ORDER(def) \ +DRI_CONF_OPT_BEGIN_B(allow_draw_out_of_order, def) \ + DRI_CONF_DESC("Allow out-of-order draw optimizations. Set when Z fighting doesn't have to be accurate.") \ +DRI_CONF_OPT_END + +#define DRI_CONF_FORCE_GL_VENDOR(def) \ +DRI_CONF_OPT_BEGIN(force_gl_vendor, string, def) \ + DRI_CONF_DESC("Allow GPU vendor to be overridden.") \ +DRI_CONF_OPT_END + +#define DRI_CONF_FORCE_COMPAT_PROFILE(def) \ +DRI_CONF_OPT_BEGIN_B(force_compat_profile, def) \ + DRI_CONF_DESC("Force an OpenGL compatibility context") \ +DRI_CONF_OPT_END + +/** + * \brief Image quality-related options + */ +#define DRI_CONF_SECTION_QUALITY \ +DRI_CONF_SECTION_BEGIN \ + DRI_CONF_DESC("Image Quality") + +#define DRI_CONF_PRECISE_TRIG(def) \ +DRI_CONF_OPT_BEGIN_B(precise_trig, def) \ + DRI_CONF_DESC("Prefer accuracy over performance in trig functions") \ +DRI_CONF_OPT_END + +#define DRI_CONF_PP_CELSHADE(def) \ +DRI_CONF_OPT_BEGIN_V(pp_celshade,enum,def,"0:1") \ + DRI_CONF_DESC("A post-processing filter to cel-shade the output") \ +DRI_CONF_OPT_END + +#define DRI_CONF_PP_NORED(def) \ +DRI_CONF_OPT_BEGIN_V(pp_nored,enum,def,"0:1") \ + DRI_CONF_DESC("A post-processing filter to remove the red channel") \ +DRI_CONF_OPT_END + +#define DRI_CONF_PP_NOGREEN(def) \ +DRI_CONF_OPT_BEGIN_V(pp_nogreen,enum,def,"0:1") \ + DRI_CONF_DESC("A post-processing filter to remove the green channel") \ +DRI_CONF_OPT_END + +#define DRI_CONF_PP_NOBLUE(def) \ +DRI_CONF_OPT_BEGIN_V(pp_noblue,enum,def,"0:1") \ + DRI_CONF_DESC("A post-processing filter to remove the blue channel") \ +DRI_CONF_OPT_END + +#define DRI_CONF_PP_JIMENEZMLAA(def,min,max) \ +DRI_CONF_OPT_BEGIN_V(pp_jimenezmlaa,int,def, # min ":" # max ) \ + DRI_CONF_DESC("Morphological anti-aliasing based on Jimenez\\\' MLAA. 0 to disable, 8 for default quality") \ +DRI_CONF_OPT_END + +#define DRI_CONF_PP_JIMENEZMLAA_COLOR(def,min,max) \ +DRI_CONF_OPT_BEGIN_V(pp_jimenezmlaa_color,int,def, # min ":" # max ) \ + DRI_CONF_DESC("Morphological anti-aliasing based on Jimenez\\\' MLAA. 0 to disable, 8 for default quality. Color version, usable with 2d GL apps") \ +DRI_CONF_OPT_END + + + +/** + * \brief Performance-related options + */ +#define DRI_CONF_SECTION_PERFORMANCE \ +DRI_CONF_SECTION_BEGIN \ + DRI_CONF_DESC("Performance") + +#define DRI_CONF_VBLANK_NEVER 0 +#define DRI_CONF_VBLANK_DEF_INTERVAL_0 1 +#define DRI_CONF_VBLANK_DEF_INTERVAL_1 2 +#define DRI_CONF_VBLANK_ALWAYS_SYNC 3 +#define DRI_CONF_VBLANK_MODE(def) \ +DRI_CONF_OPT_BEGIN_V(vblank_mode,enum,def,"0:3") \ + DRI_CONF_DESC_BEGIN("Synchronization with vertical refresh (swap intervals)") \ + DRI_CONF_ENUM(0,"Never synchronize with vertical refresh, ignore application's choice") \ + DRI_CONF_ENUM(1,"Initial swap interval 0, obey application's choice") \ + DRI_CONF_ENUM(2,"Initial swap interval 1, obey application's choice") \ + DRI_CONF_ENUM(3,"Always synchronize with vertical refresh, application chooses the minimum swap interval") \ + DRI_CONF_DESC_END \ +DRI_CONF_OPT_END + +#define DRI_CONF_ADAPTIVE_SYNC(def) \ +DRI_CONF_OPT_BEGIN_B(adaptive_sync,def) \ + DRI_CONF_DESC("Adapt the monitor sync to the application performance (when possible)") \ +DRI_CONF_OPT_END + +#define DRI_CONF_VK_WSI_FORCE_BGRA8_UNORM_FIRST(def) \ +DRI_CONF_OPT_BEGIN_B(vk_wsi_force_bgra8_unorm_first, def) \ + DRI_CONF_DESC("Force vkGetPhysicalDeviceSurfaceFormatsKHR to return VK_FORMAT_B8G8R8A8_UNORM as the first format") \ +DRI_CONF_OPT_END + +#define DRI_CONF_VK_X11_OVERRIDE_MIN_IMAGE_COUNT(def) \ +DRI_CONF_OPT_BEGIN_V(vk_x11_override_min_image_count, int, def, "0:999") \ + DRI_CONF_DESC("Override the VkSurfaceCapabilitiesKHR::minImageCount (0 = no override)") \ +DRI_CONF_OPT_END + +#define DRI_CONF_VK_X11_STRICT_IMAGE_COUNT(def) \ +DRI_CONF_OPT_BEGIN_B(vk_x11_strict_image_count, def) \ + DRI_CONF_DESC("Force the X11 WSI to create exactly the number of image specified by the application in VkSwapchainCreateInfoKHR::minImageCount") \ +DRI_CONF_OPT_END + +#define DRI_CONF_MESA_GLTHREAD(def) \ +DRI_CONF_OPT_BEGIN_B(mesa_glthread, def) \ + DRI_CONF_DESC("Enable offloading GL driver work to a separate thread") \ +DRI_CONF_OPT_END + +#define DRI_CONF_MESA_NO_ERROR(def) \ +DRI_CONF_OPT_BEGIN_B(mesa_no_error, def) \ + DRI_CONF_DESC("Disable GL driver error checking") \ +DRI_CONF_OPT_END + +#define DRI_CONF_DISABLE_EXT_BUFFER_AGE(def) \ +DRI_CONF_OPT_BEGIN_B(glx_disable_ext_buffer_age, def) \ + DRI_CONF_DESC("Disable the GLX_EXT_buffer_age extension") \ +DRI_CONF_OPT_END + +#define DRI_CONF_DISABLE_OML_SYNC_CONTROL(def) \ +DRI_CONF_OPT_BEGIN_B(glx_disable_oml_sync_control, def) \ + DRI_CONF_DESC("Disable the GLX_OML_sync_control extension") \ +DRI_CONF_OPT_END + +#define DRI_CONF_DISABLE_SGI_VIDEO_SYNC(def) \ +DRI_CONF_OPT_BEGIN_B(glx_disable_sgi_video_sync, def) \ + DRI_CONF_DESC("Disable the GLX_SGI_video_sync extension") \ +DRI_CONF_OPT_END + + + +/** + * \brief Miscellaneous configuration options + */ +#define DRI_CONF_SECTION_MISCELLANEOUS \ +DRI_CONF_SECTION_BEGIN \ + DRI_CONF_DESC("Miscellaneous") + +#define DRI_CONF_ALWAYS_HAVE_DEPTH_BUFFER(def) \ +DRI_CONF_OPT_BEGIN_B(always_have_depth_buffer, def) \ + DRI_CONF_DESC("Create all visuals with a depth buffer") \ +DRI_CONF_OPT_END + +#define DRI_CONF_GLSL_ZERO_INIT(def) \ +DRI_CONF_OPT_BEGIN_B(glsl_zero_init, def) \ + DRI_CONF_DESC("Force uninitialized variables to default to zero") \ +DRI_CONF_OPT_END + +#define DRI_CONF_VS_POSITION_ALWAYS_INVARIANT(def) \ +DRI_CONF_OPT_BEGIN_B(vs_position_always_invariant, def) \ + DRI_CONF_DESC("Force the vertex shader's gl_Position output to be considered 'invariant'") \ +DRI_CONF_OPT_END + +#define DRI_CONF_ALLOW_RGB10_CONFIGS(def) \ +DRI_CONF_OPT_BEGIN_B(allow_rgb10_configs, def) \ +DRI_CONF_DESC("Allow exposure of visuals and fbconfigs with rgb10a2 formats") \ +DRI_CONF_OPT_END + +#define DRI_CONF_ALLOW_RGB565_CONFIGS(def) \ +DRI_CONF_OPT_BEGIN_B(allow_rgb565_configs, def) \ +DRI_CONF_DESC("Allow exposure of visuals and fbconfigs with rgb565 formats") \ +DRI_CONF_OPT_END + +#define DRI_CONF_ALLOW_FP16_CONFIGS(def) \ +DRI_CONF_OPT_BEGIN_B(allow_fp16_configs, def) \ +DRI_CONF_DESC("Allow exposure of visuals and fbconfigs with fp16 formats") \ +DRI_CONF_OPT_END + +#define DRI_CONF_FORCE_INTEGER_TEX_NEAREST(def) \ +DRI_CONF_OPT_BEGIN_B(force_integer_tex_nearest, def) \ + DRI_CONF_DESC("Force integer textures to use nearest filtering") \ +DRI_CONF_OPT_END + +/** + * \brief Initialization configuration options + */ +#define DRI_CONF_SECTION_INITIALIZATION \ +DRI_CONF_SECTION_BEGIN \ + DRI_CONF_DESC("Initialization") + +#define DRI_CONF_DEVICE_ID_PATH_TAG(def) \ +DRI_CONF_OPT_BEGIN(device_id, string, def) \ + DRI_CONF_DESC("Define the graphic device to use if possible") \ +DRI_CONF_OPT_END + +#define DRI_CONF_DRI_DRIVER(def) \ +DRI_CONF_OPT_BEGIN(dri_driver, string, def) \ + DRI_CONF_DESC("Override the DRI driver to load") \ +DRI_CONF_OPT_END + +/** + * \brief Gallium-Nine specific configuration options + */ + +#define DRI_CONF_SECTION_NINE \ +DRI_CONF_SECTION_BEGIN \ + DRI_CONF_DESC("Gallium Nine") + +#define DRI_CONF_NINE_THROTTLE(def) \ +DRI_CONF_OPT_BEGIN(throttle_value, int, def) \ + DRI_CONF_DESC("Define the throttling value. -1 for no throttling, -2 for default (usually 2), 0 for glfinish behaviour") \ +DRI_CONF_OPT_END + +#define DRI_CONF_NINE_THREADSUBMIT(def) \ +DRI_CONF_OPT_BEGIN_B(thread_submit, def) \ + DRI_CONF_DESC("Use an additional thread to submit buffers.") \ +DRI_CONF_OPT_END + +#define DRI_CONF_NINE_OVERRIDEVENDOR(def) \ +DRI_CONF_OPT_BEGIN(override_vendorid, int, def) \ + DRI_CONF_DESC("Define the vendor_id to report. This allows faking another hardware vendor.") \ +DRI_CONF_OPT_END + +#define DRI_CONF_NINE_ALLOWDISCARDDELAYEDRELEASE(def) \ +DRI_CONF_OPT_BEGIN_B(discard_delayed_release, def) \ + DRI_CONF_DESC("Whether to allow the display server to release buffers with a delay when using d3d's presentation mode DISCARD. Default to true. Set to false if suffering from lag (thread_submit=true can also help in this situation).") \ +DRI_CONF_OPT_END + +#define DRI_CONF_NINE_TEARFREEDISCARD(def) \ +DRI_CONF_OPT_BEGIN_B(tearfree_discard, def) \ + DRI_CONF_DESC("Whether to make d3d's presentation mode DISCARD (games usually use that mode) Tear Free. If rendering above screen refresh, some frames will get skipped. false by default.") \ +DRI_CONF_OPT_END + +#define DRI_CONF_NINE_CSMT(def) \ +DRI_CONF_OPT_BEGIN(csmt_force, int, def) \ + DRI_CONF_DESC("If set to 1, force gallium nine CSMT. If set to 0, disable it. By default (-1) CSMT is enabled on known thread-safe drivers.") \ +DRI_CONF_OPT_END + +#define DRI_CONF_NINE_DYNAMICTEXTUREWORKAROUND(def) \ +DRI_CONF_OPT_BEGIN_B(dynamic_texture_workaround, def) \ + DRI_CONF_DESC("If set to true, use a ram intermediate buffer for dynamic textures. Increases ram usage, which can cause out of memory issues, but can fix glitches for some games.") \ +DRI_CONF_OPT_END + +#define DRI_CONF_NINE_SHADERINLINECONSTANTS(def) \ +DRI_CONF_OPT_BEGIN_B(shader_inline_constants, def) \ + DRI_CONF_DESC("If set to true, recompile shaders with integer or boolean constants when the values are known. Can cause stutter, but can increase slightly performance.") \ +DRI_CONF_OPT_END + +/** + * \brief radeonsi specific configuration options + */ + +#define DRI_CONF_RADEONSI_ASSUME_NO_Z_FIGHTS(def) \ +DRI_CONF_OPT_BEGIN_B(radeonsi_assume_no_z_fights, def) \ + DRI_CONF_DESC("Assume no Z fights (enables aggressive out-of-order rasterization to improve performance; may cause rendering errors)") \ +DRI_CONF_OPT_END + +#define DRI_CONF_RADEONSI_COMMUTATIVE_BLEND_ADD(def) \ +DRI_CONF_OPT_BEGIN_B(radeonsi_commutative_blend_add, def) \ + DRI_CONF_DESC("Commutative additive blending optimizations (may cause rendering errors)") \ +DRI_CONF_OPT_END + +#define DRI_CONF_RADEONSI_ZERO_ALL_VRAM_ALLOCS(def) \ +DRI_CONF_OPT_BEGIN_B(radeonsi_zerovram, def) \ + DRI_CONF_DESC("Zero all vram allocations") \ +DRI_CONF_OPT_END + +#define DRI_CONF_V3D_NONMSAA_TEXTURE_SIZE_LIMIT(def) \ +DRI_CONF_OPT_BEGIN_B(v3d_nonmsaa_texture_size_limit, def) \ + DRI_CONF_DESC("Report the non-MSAA-only texture size limit") \ +DRI_CONF_OPT_END + +/** + * \brief virgl specific configuration options + */ + +#define DRI_CONF_GLES_EMULATE_BGRA(def) \ +DRI_CONF_OPT_BEGIN_B(gles_emulate_bgra, def) \ + DRI_CONF_DESC("On GLES emulate BGRA formats by using a swizzled RGBA format") \ +DRI_CONF_OPT_END + +#define DRI_CONF_GLES_APPLY_BGRA_DEST_SWIZZLE(def) \ +DRI_CONF_OPT_BEGIN_B(gles_apply_bgra_dest_swizzle, def) \ + DRI_CONF_DESC("When the BGRA formats are emulated by using swizzled RGBA formats on GLES apply the swizzle when writing") \ +DRI_CONF_OPT_END + +#define DRI_CONF_GLES_SAMPLES_PASSED_VALUE(def, minimum, maximum) \ +DRI_CONF_OPT_BEGIN_V(gles_samples_passed_value, def, minimum, maximum) \ + DRI_CONF_DESC("GL_SAMPLES_PASSED value when emulated by GL_ANY_SAMPLES_PASSED") \ +DRI_CONF_OPT_END + +/** + * \brief RADV specific configuration options + */ + +#define DRI_CONF_RADV_REPORT_LLVM9_VERSION_STRING(def) \ +DRI_CONF_OPT_BEGIN_B(radv_report_llvm9_version_string, def) \ + DRI_CONF_DESC("Report LLVM 9.0.1 for games that apply shader workarounds if missing (for ACO only)") \ +DRI_CONF_OPT_END + +#define DRI_CONF_RADV_ENABLE_MRT_OUTPUT_NAN_FIXUP(def) \ +DRI_CONF_OPT_BEGIN_B(radv_enable_mrt_output_nan_fixup, def) \ + DRI_CONF_DESC("Replace NaN outputs from fragment shaders with zeroes for floating point render target") \ +DRI_CONF_OPT_END + +#define DRI_CONF_RADV_NO_DYNAMIC_BOUNDS(def) \ +DRI_CONF_OPT_BEGIN_B(radv_no_dynamic_bounds, def) \ + DRI_CONF_DESC("Disabling bounds checking for dynamic buffer descriptors") \ +DRI_CONF_OPT_END + +#endif diff --git a/src/util/merge_driinfo.py b/src/util/merge_driinfo.py index 0e071e5d7bf..ff993923c58 100644 --- a/src/util/merge_driinfo.py +++ b/src/util/merge_driinfo.py @@ -230,7 +230,7 @@ def main(input_filenames): /* Use as: -#include "xmlpool.h" +#include "driconf.h" static const char driinfo_xml[] = #include "this_file" diff --git a/src/util/xmlpool.h b/src/util/xmlpool.h deleted file mode 100644 index 5875f46892a..00000000000 --- a/src/util/xmlpool.h +++ /dev/null @@ -1,501 +0,0 @@ -/* - * XML DRI client-side driver configuration - * Copyright (C) 2003 Felix Kuehling - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * FELIX KUEHLING, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, - * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR - * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE - * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - */ -/** - * \file xmlpool.h - * \brief Pool of common options - * \author Felix Kuehling - * - * This file defines macros that can be used to construct - * driConfigOptions in the drivers. - */ - -#ifndef __XMLPOOL_H -#define __XMLPOOL_H - -/* - * generic macros - */ - -/** \brief Begin __driConfigOptions */ -#define DRI_CONF_BEGIN \ -"" \ -"" \ -" " \ -" " \ -" " \ -" " \ -" " \ -" " \ -" " \ -"]>" \ -"\n" - -/** \brief End __driConfigOptions */ -#define DRI_CONF_END \ -"\n" - -/** \brief Begin a section of related options */ -#define DRI_CONF_SECTION_BEGIN \ -"
\n" - -/** \brief End a section of related options */ -#define DRI_CONF_SECTION_END \ -"
\n" - -/** \brief Begin an option definition */ -#define DRI_CONF_OPT_BEGIN(name,type,def) \ -"\n" - -/** \brief A verbal description (empty version) */ -#define DRI_CONF_DESC(text) \ -"\n" - -/** \brief Begining of a verbal description */ -#define DRI_CONF_DESC_BEGIN(text) \ -"\n" - -/** \brief End a description */ -#define DRI_CONF_DESC_END \ -"\n" - -/** \brief A verbal description of an enum value */ -#define DRI_CONF_ENUM(value,text) \ -"\n" - - -/** - * \brief Debugging options - */ -#define DRI_CONF_SECTION_DEBUG \ -DRI_CONF_SECTION_BEGIN \ - DRI_CONF_DESC("Debugging") - -#define DRI_CONF_ALWAYS_FLUSH_BATCH(def) \ -DRI_CONF_OPT_BEGIN_B(always_flush_batch, def) \ - DRI_CONF_DESC("Enable flushing batchbuffer after each draw call") \ -DRI_CONF_OPT_END - -#define DRI_CONF_ALWAYS_FLUSH_CACHE(def) \ -DRI_CONF_OPT_BEGIN_B(always_flush_cache, def) \ - DRI_CONF_DESC("Enable flushing GPU caches with each draw call") \ -DRI_CONF_OPT_END - -#define DRI_CONF_DISABLE_THROTTLING(def) \ -DRI_CONF_OPT_BEGIN_B(disable_throttling, def) \ - DRI_CONF_DESC("Disable throttling on first batch after flush") \ -DRI_CONF_OPT_END - -#define DRI_CONF_FORCE_GLSL_EXTENSIONS_WARN(def) \ -DRI_CONF_OPT_BEGIN_B(force_glsl_extensions_warn, def) \ - DRI_CONF_DESC("Force GLSL extension default behavior to 'warn'") \ -DRI_CONF_OPT_END - -#define DRI_CONF_DISABLE_BLEND_FUNC_EXTENDED(def) \ -DRI_CONF_OPT_BEGIN_B(disable_blend_func_extended, def) \ - DRI_CONF_DESC("Disable dual source blending") \ -DRI_CONF_OPT_END - -#define DRI_CONF_DISABLE_ARB_GPU_SHADER5(def) \ -DRI_CONF_OPT_BEGIN_B(disable_arb_gpu_shader5, def) \ - DRI_CONF_DESC("Disable GL_ARB_gpu_shader5") \ -DRI_CONF_OPT_END - -#define DRI_CONF_DUAL_COLOR_BLEND_BY_LOCATION(def) \ -DRI_CONF_OPT_BEGIN_B(dual_color_blend_by_location, def) \ - DRI_CONF_DESC("Identify dual color blending sources by location rather than index") \ -DRI_CONF_OPT_END - -#define DRI_CONF_DISABLE_GLSL_LINE_CONTINUATIONS(def) \ -DRI_CONF_OPT_BEGIN_B(disable_glsl_line_continuations, def) \ - DRI_CONF_DESC("Disable backslash-based line continuations in GLSL source") \ -DRI_CONF_OPT_END - -#define DRI_CONF_FORCE_GLSL_VERSION(def) \ -DRI_CONF_OPT_BEGIN_V(force_glsl_version, int, def, "0:999") \ - DRI_CONF_DESC("Force a default GLSL version for shaders that lack an explicit #version line") \ -DRI_CONF_OPT_END - -#define DRI_CONF_ALLOW_GLSL_EXTENSION_DIRECTIVE_MIDSHADER(def) \ -DRI_CONF_OPT_BEGIN_B(allow_glsl_extension_directive_midshader, def) \ - DRI_CONF_DESC("Allow GLSL #extension directives in the middle of shaders") \ -DRI_CONF_OPT_END - -#define DRI_CONF_ALLOW_GLSL_BUILTIN_CONST_EXPRESSION(def) \ -DRI_CONF_OPT_BEGIN_B(allow_glsl_builtin_const_expression, def) \ - DRI_CONF_DESC("Allow builtins as part of constant expressions") \ -DRI_CONF_OPT_END - -#define DRI_CONF_ALLOW_GLSL_RELAXED_ES(def) \ -DRI_CONF_OPT_BEGIN_B(allow_glsl_relaxed_es, def) \ - DRI_CONF_DESC("Allow some relaxation of GLSL ES shader restrictions") \ -DRI_CONF_OPT_END - -#define DRI_CONF_ALLOW_GLSL_BUILTIN_VARIABLE_REDECLARATION(def) \ -DRI_CONF_OPT_BEGIN_B(allow_glsl_builtin_variable_redeclaration, def) \ - DRI_CONF_DESC("Allow GLSL built-in variables to be redeclared verbatim") \ -DRI_CONF_OPT_END - -#define DRI_CONF_ALLOW_HIGHER_COMPAT_VERSION(def) \ -DRI_CONF_OPT_BEGIN_B(allow_higher_compat_version, def) \ - DRI_CONF_DESC("Allow a higher compat profile (version 3.1+) for apps that request it") \ -DRI_CONF_OPT_END - -#define DRI_CONF_FORCE_GLSL_ABS_SQRT(def) \ -DRI_CONF_OPT_BEGIN_B(force_glsl_abs_sqrt, def) \ - DRI_CONF_DESC("Force computing the absolute value for sqrt() and inversesqrt()") \ -DRI_CONF_OPT_END - -#define DRI_CONF_GLSL_CORRECT_DERIVATIVES_AFTER_DISCARD(def) \ -DRI_CONF_OPT_BEGIN_B(glsl_correct_derivatives_after_discard, def) \ - DRI_CONF_DESC("Implicit and explicit derivatives after a discard behave as if the discard didn't happen") \ -DRI_CONF_OPT_END - -#define DRI_CONF_ALLOW_GLSL_CROSS_STAGE_INTERPOLATION_MISMATCH(def) \ -DRI_CONF_OPT_BEGIN_B(allow_glsl_cross_stage_interpolation_mismatch, def) \ - DRI_CONF_DESC("Allow interpolation qualifier mismatch across shader stages") \ -DRI_CONF_OPT_END - -#define DRI_CONF_ALLOW_GLSL_LAYOUT_QUALIFIER_ON_FUNCTION_PARAMETERS(def) \ -DRI_CONF_OPT_BEGIN_B(allow_glsl_layout_qualifier_on_function_parameters, def) \ - DRI_CONF_DESC("Allow layout qualifiers on function parameters.") \ -DRI_CONF_OPT_END - -#define DRI_CONF_ALLOW_DRAW_OUT_OF_ORDER(def) \ -DRI_CONF_OPT_BEGIN_B(allow_draw_out_of_order, def) \ - DRI_CONF_DESC("Allow out-of-order draw optimizations. Set when Z fighting doesn't have to be accurate.") \ -DRI_CONF_OPT_END - -#define DRI_CONF_FORCE_GL_VENDOR(def) \ -DRI_CONF_OPT_BEGIN(force_gl_vendor, string, def) \ - DRI_CONF_DESC("Allow GPU vendor to be overridden.") \ -DRI_CONF_OPT_END - -#define DRI_CONF_FORCE_COMPAT_PROFILE(def) \ -DRI_CONF_OPT_BEGIN_B(force_compat_profile, def) \ - DRI_CONF_DESC("Force an OpenGL compatibility context") \ -DRI_CONF_OPT_END - -/** - * \brief Image quality-related options - */ -#define DRI_CONF_SECTION_QUALITY \ -DRI_CONF_SECTION_BEGIN \ - DRI_CONF_DESC("Image Quality") - -#define DRI_CONF_PRECISE_TRIG(def) \ -DRI_CONF_OPT_BEGIN_B(precise_trig, def) \ - DRI_CONF_DESC("Prefer accuracy over performance in trig functions") \ -DRI_CONF_OPT_END - -#define DRI_CONF_PP_CELSHADE(def) \ -DRI_CONF_OPT_BEGIN_V(pp_celshade,enum,def,"0:1") \ - DRI_CONF_DESC("A post-processing filter to cel-shade the output") \ -DRI_CONF_OPT_END - -#define DRI_CONF_PP_NORED(def) \ -DRI_CONF_OPT_BEGIN_V(pp_nored,enum,def,"0:1") \ - DRI_CONF_DESC("A post-processing filter to remove the red channel") \ -DRI_CONF_OPT_END - -#define DRI_CONF_PP_NOGREEN(def) \ -DRI_CONF_OPT_BEGIN_V(pp_nogreen,enum,def,"0:1") \ - DRI_CONF_DESC("A post-processing filter to remove the green channel") \ -DRI_CONF_OPT_END - -#define DRI_CONF_PP_NOBLUE(def) \ -DRI_CONF_OPT_BEGIN_V(pp_noblue,enum,def,"0:1") \ - DRI_CONF_DESC("A post-processing filter to remove the blue channel") \ -DRI_CONF_OPT_END - -#define DRI_CONF_PP_JIMENEZMLAA(def,min,max) \ -DRI_CONF_OPT_BEGIN_V(pp_jimenezmlaa,int,def, # min ":" # max ) \ - DRI_CONF_DESC("Morphological anti-aliasing based on Jimenez\\\' MLAA. 0 to disable, 8 for default quality") \ -DRI_CONF_OPT_END - -#define DRI_CONF_PP_JIMENEZMLAA_COLOR(def,min,max) \ -DRI_CONF_OPT_BEGIN_V(pp_jimenezmlaa_color,int,def, # min ":" # max ) \ - DRI_CONF_DESC("Morphological anti-aliasing based on Jimenez\\\' MLAA. 0 to disable, 8 for default quality. Color version, usable with 2d GL apps") \ -DRI_CONF_OPT_END - - - -/** - * \brief Performance-related options - */ -#define DRI_CONF_SECTION_PERFORMANCE \ -DRI_CONF_SECTION_BEGIN \ - DRI_CONF_DESC("Performance") - -#define DRI_CONF_VBLANK_NEVER 0 -#define DRI_CONF_VBLANK_DEF_INTERVAL_0 1 -#define DRI_CONF_VBLANK_DEF_INTERVAL_1 2 -#define DRI_CONF_VBLANK_ALWAYS_SYNC 3 -#define DRI_CONF_VBLANK_MODE(def) \ -DRI_CONF_OPT_BEGIN_V(vblank_mode,enum,def,"0:3") \ - DRI_CONF_DESC_BEGIN("Synchronization with vertical refresh (swap intervals)") \ - DRI_CONF_ENUM(0,"Never synchronize with vertical refresh, ignore application's choice") \ - DRI_CONF_ENUM(1,"Initial swap interval 0, obey application's choice") \ - DRI_CONF_ENUM(2,"Initial swap interval 1, obey application's choice") \ - DRI_CONF_ENUM(3,"Always synchronize with vertical refresh, application chooses the minimum swap interval") \ - DRI_CONF_DESC_END \ -DRI_CONF_OPT_END - -#define DRI_CONF_ADAPTIVE_SYNC(def) \ -DRI_CONF_OPT_BEGIN_B(adaptive_sync,def) \ - DRI_CONF_DESC("Adapt the monitor sync to the application performance (when possible)") \ -DRI_CONF_OPT_END - -#define DRI_CONF_VK_WSI_FORCE_BGRA8_UNORM_FIRST(def) \ -DRI_CONF_OPT_BEGIN_B(vk_wsi_force_bgra8_unorm_first, def) \ - DRI_CONF_DESC("Force vkGetPhysicalDeviceSurfaceFormatsKHR to return VK_FORMAT_B8G8R8A8_UNORM as the first format") \ -DRI_CONF_OPT_END - -#define DRI_CONF_VK_X11_OVERRIDE_MIN_IMAGE_COUNT(def) \ -DRI_CONF_OPT_BEGIN_V(vk_x11_override_min_image_count, int, def, "0:999") \ - DRI_CONF_DESC("Override the VkSurfaceCapabilitiesKHR::minImageCount (0 = no override)") \ -DRI_CONF_OPT_END - -#define DRI_CONF_VK_X11_STRICT_IMAGE_COUNT(def) \ -DRI_CONF_OPT_BEGIN_B(vk_x11_strict_image_count, def) \ - DRI_CONF_DESC("Force the X11 WSI to create exactly the number of image specified by the application in VkSwapchainCreateInfoKHR::minImageCount") \ -DRI_CONF_OPT_END - -#define DRI_CONF_MESA_GLTHREAD(def) \ -DRI_CONF_OPT_BEGIN_B(mesa_glthread, def) \ - DRI_CONF_DESC("Enable offloading GL driver work to a separate thread") \ -DRI_CONF_OPT_END - -#define DRI_CONF_MESA_NO_ERROR(def) \ -DRI_CONF_OPT_BEGIN_B(mesa_no_error, def) \ - DRI_CONF_DESC("Disable GL driver error checking") \ -DRI_CONF_OPT_END - -#define DRI_CONF_DISABLE_EXT_BUFFER_AGE(def) \ -DRI_CONF_OPT_BEGIN_B(glx_disable_ext_buffer_age, def) \ - DRI_CONF_DESC("Disable the GLX_EXT_buffer_age extension") \ -DRI_CONF_OPT_END - -#define DRI_CONF_DISABLE_OML_SYNC_CONTROL(def) \ -DRI_CONF_OPT_BEGIN_B(glx_disable_oml_sync_control, def) \ - DRI_CONF_DESC("Disable the GLX_OML_sync_control extension") \ -DRI_CONF_OPT_END - -#define DRI_CONF_DISABLE_SGI_VIDEO_SYNC(def) \ -DRI_CONF_OPT_BEGIN_B(glx_disable_sgi_video_sync, def) \ - DRI_CONF_DESC("Disable the GLX_SGI_video_sync extension") \ -DRI_CONF_OPT_END - - - -/** - * \brief Miscellaneous configuration options - */ -#define DRI_CONF_SECTION_MISCELLANEOUS \ -DRI_CONF_SECTION_BEGIN \ - DRI_CONF_DESC("Miscellaneous") - -#define DRI_CONF_ALWAYS_HAVE_DEPTH_BUFFER(def) \ -DRI_CONF_OPT_BEGIN_B(always_have_depth_buffer, def) \ - DRI_CONF_DESC("Create all visuals with a depth buffer") \ -DRI_CONF_OPT_END - -#define DRI_CONF_GLSL_ZERO_INIT(def) \ -DRI_CONF_OPT_BEGIN_B(glsl_zero_init, def) \ - DRI_CONF_DESC("Force uninitialized variables to default to zero") \ -DRI_CONF_OPT_END - -#define DRI_CONF_VS_POSITION_ALWAYS_INVARIANT(def) \ -DRI_CONF_OPT_BEGIN_B(vs_position_always_invariant, def) \ - DRI_CONF_DESC("Force the vertex shader's gl_Position output to be considered 'invariant'") \ -DRI_CONF_OPT_END - -#define DRI_CONF_ALLOW_RGB10_CONFIGS(def) \ -DRI_CONF_OPT_BEGIN_B(allow_rgb10_configs, def) \ -DRI_CONF_DESC("Allow exposure of visuals and fbconfigs with rgb10a2 formats") \ -DRI_CONF_OPT_END - -#define DRI_CONF_ALLOW_RGB565_CONFIGS(def) \ -DRI_CONF_OPT_BEGIN_B(allow_rgb565_configs, def) \ -DRI_CONF_DESC("Allow exposure of visuals and fbconfigs with rgb565 formats") \ -DRI_CONF_OPT_END - -#define DRI_CONF_ALLOW_FP16_CONFIGS(def) \ -DRI_CONF_OPT_BEGIN_B(allow_fp16_configs, def) \ -DRI_CONF_DESC("Allow exposure of visuals and fbconfigs with fp16 formats") \ -DRI_CONF_OPT_END - -#define DRI_CONF_FORCE_INTEGER_TEX_NEAREST(def) \ -DRI_CONF_OPT_BEGIN_B(force_integer_tex_nearest, def) \ - DRI_CONF_DESC("Force integer textures to use nearest filtering") \ -DRI_CONF_OPT_END - -/** - * \brief Initialization configuration options - */ -#define DRI_CONF_SECTION_INITIALIZATION \ -DRI_CONF_SECTION_BEGIN \ - DRI_CONF_DESC("Initialization") - -#define DRI_CONF_DEVICE_ID_PATH_TAG(def) \ -DRI_CONF_OPT_BEGIN(device_id, string, def) \ - DRI_CONF_DESC("Define the graphic device to use if possible") \ -DRI_CONF_OPT_END - -#define DRI_CONF_DRI_DRIVER(def) \ -DRI_CONF_OPT_BEGIN(dri_driver, string, def) \ - DRI_CONF_DESC("Override the DRI driver to load") \ -DRI_CONF_OPT_END - -/** - * \brief Gallium-Nine specific configuration options - */ - -#define DRI_CONF_SECTION_NINE \ -DRI_CONF_SECTION_BEGIN \ - DRI_CONF_DESC("Gallium Nine") - -#define DRI_CONF_NINE_THROTTLE(def) \ -DRI_CONF_OPT_BEGIN(throttle_value, int, def) \ - DRI_CONF_DESC("Define the throttling value. -1 for no throttling, -2 for default (usually 2), 0 for glfinish behaviour") \ -DRI_CONF_OPT_END - -#define DRI_CONF_NINE_THREADSUBMIT(def) \ -DRI_CONF_OPT_BEGIN_B(thread_submit, def) \ - DRI_CONF_DESC("Use an additional thread to submit buffers.") \ -DRI_CONF_OPT_END - -#define DRI_CONF_NINE_OVERRIDEVENDOR(def) \ -DRI_CONF_OPT_BEGIN(override_vendorid, int, def) \ - DRI_CONF_DESC("Define the vendor_id to report. This allows faking another hardware vendor.") \ -DRI_CONF_OPT_END - -#define DRI_CONF_NINE_ALLOWDISCARDDELAYEDRELEASE(def) \ -DRI_CONF_OPT_BEGIN_B(discard_delayed_release, def) \ - DRI_CONF_DESC("Whether to allow the display server to release buffers with a delay when using d3d's presentation mode DISCARD. Default to true. Set to false if suffering from lag (thread_submit=true can also help in this situation).") \ -DRI_CONF_OPT_END - -#define DRI_CONF_NINE_TEARFREEDISCARD(def) \ -DRI_CONF_OPT_BEGIN_B(tearfree_discard, def) \ - DRI_CONF_DESC("Whether to make d3d's presentation mode DISCARD (games usually use that mode) Tear Free. If rendering above screen refresh, some frames will get skipped. false by default.") \ -DRI_CONF_OPT_END - -#define DRI_CONF_NINE_CSMT(def) \ -DRI_CONF_OPT_BEGIN(csmt_force, int, def) \ - DRI_CONF_DESC("If set to 1, force gallium nine CSMT. If set to 0, disable it. By default (-1) CSMT is enabled on known thread-safe drivers.") \ -DRI_CONF_OPT_END - -#define DRI_CONF_NINE_DYNAMICTEXTUREWORKAROUND(def) \ -DRI_CONF_OPT_BEGIN_B(dynamic_texture_workaround, def) \ - DRI_CONF_DESC("If set to true, use a ram intermediate buffer for dynamic textures. Increases ram usage, which can cause out of memory issues, but can fix glitches for some games.") \ -DRI_CONF_OPT_END - -#define DRI_CONF_NINE_SHADERINLINECONSTANTS(def) \ -DRI_CONF_OPT_BEGIN_B(shader_inline_constants, def) \ - DRI_CONF_DESC("If set to true, recompile shaders with integer or boolean constants when the values are known. Can cause stutter, but can increase slightly performance.") \ -DRI_CONF_OPT_END - -/** - * \brief radeonsi specific configuration options - */ - -#define DRI_CONF_RADEONSI_ASSUME_NO_Z_FIGHTS(def) \ -DRI_CONF_OPT_BEGIN_B(radeonsi_assume_no_z_fights, def) \ - DRI_CONF_DESC("Assume no Z fights (enables aggressive out-of-order rasterization to improve performance; may cause rendering errors)") \ -DRI_CONF_OPT_END - -#define DRI_CONF_RADEONSI_COMMUTATIVE_BLEND_ADD(def) \ -DRI_CONF_OPT_BEGIN_B(radeonsi_commutative_blend_add, def) \ - DRI_CONF_DESC("Commutative additive blending optimizations (may cause rendering errors)") \ -DRI_CONF_OPT_END - -#define DRI_CONF_RADEONSI_ZERO_ALL_VRAM_ALLOCS(def) \ -DRI_CONF_OPT_BEGIN_B(radeonsi_zerovram, def) \ - DRI_CONF_DESC("Zero all vram allocations") \ -DRI_CONF_OPT_END - -#define DRI_CONF_V3D_NONMSAA_TEXTURE_SIZE_LIMIT(def) \ -DRI_CONF_OPT_BEGIN_B(v3d_nonmsaa_texture_size_limit, def) \ - DRI_CONF_DESC("Report the non-MSAA-only texture size limit") \ -DRI_CONF_OPT_END - -/** - * \brief virgl specific configuration options - */ - -#define DRI_CONF_GLES_EMULATE_BGRA(def) \ -DRI_CONF_OPT_BEGIN_B(gles_emulate_bgra, def) \ - DRI_CONF_DESC("On GLES emulate BGRA formats by using a swizzled RGBA format") \ -DRI_CONF_OPT_END - -#define DRI_CONF_GLES_APPLY_BGRA_DEST_SWIZZLE(def) \ -DRI_CONF_OPT_BEGIN_B(gles_apply_bgra_dest_swizzle, def) \ - DRI_CONF_DESC("When the BGRA formats are emulated by using swizzled RGBA formats on GLES apply the swizzle when writing") \ -DRI_CONF_OPT_END - -#define DRI_CONF_GLES_SAMPLES_PASSED_VALUE(def, minimum, maximum) \ -DRI_CONF_OPT_BEGIN_V(gles_samples_passed_value, def, minimum, maximum) \ - DRI_CONF_DESC("GL_SAMPLES_PASSED value when emulated by GL_ANY_SAMPLES_PASSED") \ -DRI_CONF_OPT_END - -/** - * \brief RADV specific configuration options - */ - -#define DRI_CONF_RADV_REPORT_LLVM9_VERSION_STRING(def) \ -DRI_CONF_OPT_BEGIN_B(radv_report_llvm9_version_string, def) \ - DRI_CONF_DESC("Report LLVM 9.0.1 for games that apply shader workarounds if missing (for ACO only)") \ -DRI_CONF_OPT_END - -#define DRI_CONF_RADV_ENABLE_MRT_OUTPUT_NAN_FIXUP(def) \ -DRI_CONF_OPT_BEGIN_B(radv_enable_mrt_output_nan_fixup, def) \ - DRI_CONF_DESC("Replace NaN outputs from fragment shaders with zeroes for floating point render target") \ -DRI_CONF_OPT_END - -#define DRI_CONF_RADV_NO_DYNAMIC_BOUNDS(def) \ -DRI_CONF_OPT_BEGIN_B(radv_no_dynamic_bounds, def) \ - DRI_CONF_DESC("Disabling bounds checking for dynamic buffer descriptors") \ -DRI_CONF_OPT_END - -#endif