wayland-dma-buf: Fix 'kms-modifiers' experimental setting

The setting was ignored in favor of whatever the backend
returned.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1953>
This commit is contained in:
Robert Mader 2021-05-12 23:45:07 +02:00 committed by Marge Bot
parent 9252b7c6b4
commit a96caf6def

View File

@ -609,6 +609,10 @@ should_send_modifiers (MetaBackend *backend)
{ {
MetaSettings *settings = meta_backend_get_settings (backend); MetaSettings *settings = meta_backend_get_settings (backend);
if (meta_settings_is_experimental_feature_enabled (
settings, META_EXPERIMENTAL_FEATURE_KMS_MODIFIERS))
return TRUE;
#ifdef HAVE_NATIVE_BACKEND #ifdef HAVE_NATIVE_BACKEND
if (META_IS_BACKEND_NATIVE (backend)) if (META_IS_BACKEND_NATIVE (backend))
{ {
@ -618,8 +622,7 @@ should_send_modifiers (MetaBackend *backend)
} }
#endif #endif
return meta_settings_is_experimental_feature_enabled ( return FALSE;
settings, META_EXPERIMENTAL_FEATURE_KMS_MODIFIERS);
} }
static void static void