diff options
author | Eric Anholt <eric@anholt.net> | 2020-09-29 09:28:18 -0700 |
---|---|---|
committer | Marge Bot <eric+marge@anholt.net> | 2020-10-02 23:59:52 +0000 |
commit | 6f3352b6a7648e50f19edffe056d25211375b247 (patch) | |
tree | c88356cb51fbabdcc17e0e7934b38647e55dd43f /src/mesa/drivers | |
parent | 8a05d6ffc65d0fd0e0a52fe84a174d4ca63e5521 (diff) |
driconf: Stop quoting true/false in boolean option definitions.
Now that we're not trying to evade preprocessor macro expansion in
preprocessor string concatenation, we can use plain old bools in option
setup.
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6916>
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_screen.c | 18 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/intel_screen.c | 44 | ||||
-rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_screen.c | 8 |
3 files changed, 35 insertions, 35 deletions
diff --git a/src/mesa/drivers/dri/i915/intel_screen.c b/src/mesa/drivers/dri/i915/intel_screen.c index 45b339265a4..296f24eadd0 100644 --- a/src/mesa/drivers/dri/i915/intel_screen.c +++ b/src/mesa/drivers/dri/i915/intel_screen.c @@ -53,23 +53,23 @@ static const driOptionDescription i915_driconf[] = { DRI_CONF_ENUM(0, "Disable buffer object reuse") DRI_CONF_ENUM(1, "Enable reuse of all sizes of buffer objects")) - DRI_CONF_OPT_B(fragment_shader, "true", + DRI_CONF_OPT_B(fragment_shader, true, "Enable limited ARB_fragment_shader support on 915/945.") DRI_CONF_SECTION_END DRI_CONF_SECTION_QUALITY DRI_CONF_SECTION_END DRI_CONF_SECTION_DEBUG - DRI_CONF_ALWAYS_FLUSH_BATCH("false") - DRI_CONF_ALWAYS_FLUSH_CACHE("false") - DRI_CONF_DISABLE_THROTTLING("false") - DRI_CONF_FORCE_GLSL_EXTENSIONS_WARN("false") - DRI_CONF_DISABLE_GLSL_LINE_CONTINUATIONS("false") - DRI_CONF_DISABLE_BLEND_FUNC_EXTENDED("false") + DRI_CONF_ALWAYS_FLUSH_BATCH(false) + DRI_CONF_ALWAYS_FLUSH_CACHE(false) + DRI_CONF_DISABLE_THROTTLING(false) + DRI_CONF_FORCE_GLSL_EXTENSIONS_WARN(false) + DRI_CONF_DISABLE_GLSL_LINE_CONTINUATIONS(false) + DRI_CONF_DISABLE_BLEND_FUNC_EXTENDED(false) - DRI_CONF_OPT_B(stub_occlusion_query, "false", "Enable stub ARB_occlusion_query support on 915/945.") + DRI_CONF_OPT_B(stub_occlusion_query, false, "Enable stub ARB_occlusion_query support on 915/945.") - DRI_CONF_OPT_B(shader_precompile, "true", "Perform code generation at shader link time.") + DRI_CONF_OPT_B(shader_precompile, true, "Perform code generation at shader link time.") DRI_CONF_SECTION_END }; diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index 8e556d20835..1fb4330ae05 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -58,12 +58,12 @@ static const driOptionDescription brw_driconf[] = { "Buffer object reuse", DRI_CONF_ENUM(0, "Disable buffer object reuse") DRI_CONF_ENUM(1, "Enable reuse of all sizes of buffer objects")) - DRI_CONF_MESA_NO_ERROR("false") - DRI_CONF_MESA_GLTHREAD("false") + DRI_CONF_MESA_NO_ERROR(false) + DRI_CONF_MESA_GLTHREAD(false) DRI_CONF_SECTION_END DRI_CONF_SECTION_QUALITY - DRI_CONF_PRECISE_TRIG("false") + DRI_CONF_PRECISE_TRIG(false) DRI_CONF_OPT_I(clamp_max_samples, -1, 0, 0, "Clamp the value of GL_MAX_SAMPLES to the " @@ -71,31 +71,31 @@ static const driOptionDescription brw_driconf[] = { DRI_CONF_SECTION_END DRI_CONF_SECTION_DEBUG - DRI_CONF_ALWAYS_FLUSH_BATCH("false") - DRI_CONF_ALWAYS_FLUSH_CACHE("false") - DRI_CONF_DISABLE_THROTTLING("false") - DRI_CONF_FORCE_GLSL_EXTENSIONS_WARN("false") + DRI_CONF_ALWAYS_FLUSH_BATCH(false) + DRI_CONF_ALWAYS_FLUSH_CACHE(false) + DRI_CONF_DISABLE_THROTTLING(false) + DRI_CONF_FORCE_GLSL_EXTENSIONS_WARN(false) DRI_CONF_FORCE_GLSL_VERSION(0) - DRI_CONF_DISABLE_GLSL_LINE_CONTINUATIONS("false") - DRI_CONF_DISABLE_BLEND_FUNC_EXTENDED("false") - DRI_CONF_DUAL_COLOR_BLEND_BY_LOCATION("false") - DRI_CONF_ALLOW_GLSL_EXTENSION_DIRECTIVE_MIDSHADER("false") - DRI_CONF_ALLOW_GLSL_BUILTIN_VARIABLE_REDECLARATION("false") - DRI_CONF_ALLOW_GLSL_CROSS_STAGE_INTERPOLATION_MISMATCH("false") - DRI_CONF_ALLOW_HIGHER_COMPAT_VERSION("false") - DRI_CONF_FORCE_COMPAT_PROFILE("false") - DRI_CONF_FORCE_GLSL_ABS_SQRT("false") + DRI_CONF_DISABLE_GLSL_LINE_CONTINUATIONS(false) + DRI_CONF_DISABLE_BLEND_FUNC_EXTENDED(false) + DRI_CONF_DUAL_COLOR_BLEND_BY_LOCATION(false) + DRI_CONF_ALLOW_GLSL_EXTENSION_DIRECTIVE_MIDSHADER(false) + DRI_CONF_ALLOW_GLSL_BUILTIN_VARIABLE_REDECLARATION(false) + DRI_CONF_ALLOW_GLSL_CROSS_STAGE_INTERPOLATION_MISMATCH(false) + DRI_CONF_ALLOW_HIGHER_COMPAT_VERSION(false) + DRI_CONF_FORCE_COMPAT_PROFILE(false) + DRI_CONF_FORCE_GLSL_ABS_SQRT(false) DRI_CONF_FORCE_GL_VENDOR() - DRI_CONF_OPT_B(shader_precompile, "true", "Perform code generation at shader link time.") + DRI_CONF_OPT_B(shader_precompile, true, "Perform code generation at shader link time.") DRI_CONF_SECTION_END DRI_CONF_SECTION_MISCELLANEOUS - DRI_CONF_GLSL_ZERO_INIT("false") - DRI_CONF_VS_POSITION_ALWAYS_INVARIANT("false") - DRI_CONF_ALLOW_RGB10_CONFIGS("false") - DRI_CONF_ALLOW_RGB565_CONFIGS("true") - DRI_CONF_ALLOW_FP16_CONFIGS("false") + DRI_CONF_GLSL_ZERO_INIT(false) + DRI_CONF_VS_POSITION_ALWAYS_INVARIANT(false) + DRI_CONF_ALLOW_RGB10_CONFIGS(false) + DRI_CONF_ALLOW_RGB565_CONFIGS(true) + DRI_CONF_ALLOW_FP16_CONFIGS(false) DRI_CONF_SECTION_END }; diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c index e4c8c322ece..f61fe399c09 100644 --- a/src/mesa/drivers/dri/radeon/radeon_screen.c +++ b/src/mesa/drivers/dri/radeon/radeon_screen.c @@ -96,13 +96,13 @@ static const driOptionDescription radeon_driconf[] = { DRI_CONF_TCL_MODE(DRI_CONF_TCL_CODEGEN) DRI_CONF_FTHROTTLE_MODE(DRI_CONF_FTHROTTLE_IRQS) DRI_CONF_MAX_TEXTURE_UNITS(3,2,3) - DRI_CONF_HYPERZ("false") + DRI_CONF_HYPERZ(false) DRI_CONF_COMMAND_BUFFER_SIZE(8, 8, 32) DRI_CONF_SECTION_END DRI_CONF_SECTION_QUALITY DRI_CONF_TEXTURE_DEPTH(DRI_CONF_TEXTURE_DEPTH_FB) DRI_CONF_DEF_MAX_ANISOTROPY(1.0, 1.0, 16.0) - DRI_CONF_NO_NEG_LOD_BIAS("false") + DRI_CONF_NO_NEG_LOD_BIAS(false) DRI_CONF_COLOR_REDUCTION(DRI_CONF_COLOR_REDUCTION_DITHER) DRI_CONF_ROUND_MODE(DRI_CONF_ROUND_TRUNC) DRI_CONF_DITHER_MODE(DRI_CONF_DITHER_XERRORDIFF) @@ -115,13 +115,13 @@ static const driOptionDescription radeon_driconf[] = { DRI_CONF_TCL_MODE(DRI_CONF_TCL_CODEGEN) DRI_CONF_FTHROTTLE_MODE(DRI_CONF_FTHROTTLE_IRQS) DRI_CONF_MAX_TEXTURE_UNITS(6,2,6) - DRI_CONF_HYPERZ("false") + DRI_CONF_HYPERZ(false) DRI_CONF_COMMAND_BUFFER_SIZE(8, 8, 32) DRI_CONF_SECTION_END DRI_CONF_SECTION_QUALITY DRI_CONF_TEXTURE_DEPTH(DRI_CONF_TEXTURE_DEPTH_FB) DRI_CONF_DEF_MAX_ANISOTROPY(1.0, 1.0, 16.0) - DRI_CONF_NO_NEG_LOD_BIAS("false") + DRI_CONF_NO_NEG_LOD_BIAS(false) DRI_CONF_COLOR_REDUCTION(DRI_CONF_COLOR_REDUCTION_DITHER) DRI_CONF_ROUND_MODE(DRI_CONF_ROUND_TRUNC) DRI_CONF_DITHER_MODE(DRI_CONF_DITHER_XERRORDIFF) |