Module: Mesa Branch: master Commit: e891f039da6889b3fb65db5c466dbfe08666fd93 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e891f039da6889b3fb65db5c466dbfe08666fd93
Author: Axel Davy <[email protected]> Date: Sun Feb 7 20:28:34 2021 +0100 st/nine: Simplify checks for driconf options Remove the useless driCheckOption calls. They always succeed. As a result the intended behaviour for thread_submit was not working (different default depending on the gpu used). Add a comment to fix that in the future. Signed-off-by: Axel Davy <[email protected]> Acked-by: Timur Kristóf <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9177> --- src/gallium/targets/d3dadapter9/drm.c | 44 +++++++---------------------------- 1 file changed, 8 insertions(+), 36 deletions(-) diff --git a/src/gallium/targets/d3dadapter9/drm.c b/src/gallium/targets/d3dadapter9/drm.c index b5f5fb4c1e1..a8a77129b0a 100644 --- a/src/gallium/targets/d3dadapter9/drm.c +++ b/src/gallium/targets/d3dadapter9/drm.c @@ -262,49 +262,21 @@ drm_create_adapter( int fd, } } - if (driCheckOption(&userInitOptions, "vblank_mode", DRI_ENUM)) - ctx->base.vblank_mode = driQueryOptioni(&userInitOptions, "vblank_mode"); - else - ctx->base.vblank_mode = 1; - - if (driCheckOption(&userInitOptions, "thread_submit", DRI_BOOL)) - ctx->base.thread_submit = driQueryOptionb(&userInitOptions, "thread_submit"); - else - ctx->base.thread_submit = different_device; - - if (driCheckOption(&userInitOptions, "override_vendorid", DRI_INT)) { - override_vendorid = driQueryOptioni(&userInitOptions, "override_vendorid"); - } - - if (driCheckOption(&userInitOptions, "discard_delayed_release", DRI_BOOL)) - ctx->base.discard_delayed_release = driQueryOptionb(&userInitOptions, "discard_delayed_release"); - else - ctx->base.discard_delayed_release = TRUE; + ctx->base.vblank_mode = driQueryOptioni(&userInitOptions, "vblank_mode"); + ctx->base.thread_submit = driQueryOptionb(&userInitOptions, "thread_submit"); /* TODO: default to TRUE if different_device */ + override_vendorid = driQueryOptioni(&userInitOptions, "override_vendorid"); - if (driCheckOption(&userInitOptions, "tearfree_discard", DRI_BOOL)) - ctx->base.tearfree_discard = driQueryOptionb(&userInitOptions, "tearfree_discard"); - else - ctx->base.tearfree_discard = FALSE; + ctx->base.discard_delayed_release = driQueryOptionb(&userInitOptions, "discard_delayed_release"); + ctx->base.tearfree_discard = driQueryOptionb(&userInitOptions, "tearfree_discard"); if (ctx->base.tearfree_discard && !ctx->base.discard_delayed_release) { ERR("tearfree_discard requires discard_delayed_release\n"); ctx->base.tearfree_discard = FALSE; } - if (driCheckOption(&userInitOptions, "csmt_force", DRI_INT)) - ctx->base.csmt_force = driQueryOptioni(&userInitOptions, "csmt_force"); - else - ctx->base.csmt_force = -1; - - if (driCheckOption(&userInitOptions, "dynamic_texture_workaround", DRI_BOOL)) - ctx->base.dynamic_texture_workaround = driQueryOptionb(&userInitOptions, "dynamic_texture_workaround"); - else - ctx->base.dynamic_texture_workaround = FALSE; - - if (driCheckOption(&userInitOptions, "shader_inline_constants", DRI_BOOL)) - ctx->base.shader_inline_constants = driQueryOptionb(&userInitOptions, "shader_inline_constants"); - else - ctx->base.shader_inline_constants = FALSE; + ctx->base.csmt_force = driQueryOptioni(&userInitOptions, "csmt_force"); + ctx->base.dynamic_texture_workaround = driQueryOptionb(&userInitOptions, "dynamic_texture_workaround"); + ctx->base.shader_inline_constants = driQueryOptionb(&userInitOptions, "shader_inline_constants"); driDestroyOptionCache(&userInitOptions); driDestroyOptionInfo(&defaultInitOptions); _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
