From c308a262be786a1ad38139785a406a6b1098466c Mon Sep 17 00:00:00 2001
From: Xaver Hugl <xaver.hugl@gmail.com>
Date: Sun, 30 Oct 2022 03:03:04 +0100
Subject: [PATCH] kcmkwin/compositing: remove tearing prevention and scaling
 options

The option are confusing and noone should ever need to touch them.

BUG: 450279
---
 src/kcmkwin/kwincompositing/compositing.ui    | 81 +------------------
 .../kwincompositing_setting.kcfg              | 18 -----
 src/kcmkwin/kwincompositing/main.cpp          | 30 -------
 3 files changed, 1 insertion(+), 128 deletions(-)

diff --git a/src/kcmkwin/kwincompositing/compositing.ui b/src/kcmkwin/kwincompositing/compositing.ui
index 5c8b71ee98..2810f6676d 100644
--- a/src/kcmkwin/kwincompositing/compositing.ui
+++ b/src/kcmkwin/kwincompositing/compositing.ui
@@ -35,29 +35,6 @@ you can reset this protection but be aware that this might result in an immediat
        </property>
       </widget>
      </item>
-     <item>
-      <widget class="KMessageWidget" name="scaleWarning">
-       <property name="visible">
-        <bool>false</bool>
-       </property>
-       <property name="text">
-        <string>Scale method &quot;Accurate&quot; is not supported by all hardware and can cause performance regressions and rendering artifacts.</string>
-       </property>
-       <property name="wordWrap">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="KMessageWidget" name="tearingWarning">
-       <property name="visible">
-        <bool>false</bool>
-       </property>
-       <property name="wordWrap">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
      <item>
       <widget class="KMessageWidget" name="windowThumbnailWarning">
        <property name="visible">
@@ -168,70 +145,14 @@ you can reset this protection but be aware that this might result in an immediat
      </layout>
     </widget>
    </item>
-   <item row="6" column="0">
-    <widget class="QLabel" name="scaleMethodLabel">
-     <property name="text">
-      <string>Scale method:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="6" column="1">
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QComboBox" name="kcfg_glTextureFilter">
-       <item>
-        <property name="text">
-         <string>Smooth</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Accurate</string>
-        </property>
-       </item>
-      </widget>
-     </item>
-    </layout>
-   </item>
    <item row="13" column="0">
-    <widget class="QLabel" name="label_5">
-     <property name="text">
-      <string>Tearing prevention (&quot;vsync&quot;):</string>
-     </property>
-    </widget>
-   </item>
-   <item row="13" column="1">
-    <widget class="QComboBox" name="kcfg_glPreferBufferSwap">
-     <item>
-      <property name="text">
-       <string>Automatic</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Only when cheap</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Full screen repaints</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Re-use screen content</string>
-      </property>
-     </item>
-    </widget>
-   </item>
-   <item row="14" column="0">
     <widget class="QLabel" name="label_HiddenPreviews">
      <property name="text">
       <string>Keep window thumbnails:</string>
      </property>
     </widget>
    </item>
-   <item row="14" column="1">
+   <item row="13" column="1">
     <widget class="QComboBox" name="kcfg_HiddenPreviews">
      <item>
       <property name="text">
diff --git a/src/kcmkwin/kwincompositing/kwincompositing_setting.kcfg b/src/kcmkwin/kwincompositing/kwincompositing_setting.kcfg
index 9b869793ae..e024582fa0 100644
--- a/src/kcmkwin/kwincompositing/kwincompositing_setting.kcfg
+++ b/src/kcmkwin/kwincompositing/kwincompositing_setting.kcfg
@@ -22,14 +22,6 @@
            </choices>
        </entry>
 
-       <entry name="glTextureFilter" key="GLTextureFilter" type="Enum">
-           <default>Accurate</default>
-           <choices>
-               <choice name="Smooth" value="1"/>
-               <choice name="Accurate" value="2"/>
-           </choices>
-       </entry>
-
        <entry name="Enabled" type="Bool">
         <default>true</default>
        </entry>
@@ -38,16 +30,6 @@
            <default>0</default>
        </entry>
 
-       <entry name="glPreferBufferSwap" key="GLPreferBufferSwap" type="Enum">
-           <default>AutoSwapStrategy</default>
-           <choices>
-               <choice name="AutoSwapStrategy" value="a" />
-               <choice name="ExtendDamage" value="e" />
-               <choice name="PaintFullScreen" value="p" />
-               <choice name="CopyFrontBuffer" value="c" />
-           </choices>
-       </entry>
-
        <entry name="WindowsBlockCompositing" type="Bool">
            <default>true</default>
        </entry>
diff --git a/src/kcmkwin/kwincompositing/main.cpp b/src/kcmkwin/kwincompositing/main.cpp
index 15ec3fdb07..80c03c0225 100644
--- a/src/kcmkwin/kwincompositing/main.cpp
+++ b/src/kcmkwin/kwincompositing/main.cpp
@@ -80,8 +80,6 @@ KWinCompositingKCM::KWinCompositingKCM(QWidget *parent, const QVariantList &args
     connect(reenableGlAction, &QAction::triggered, this, &KWinCompositingKCM::reenableGl);
     connect(reenableGlAction, &QAction::triggered, m_form.glCrashedWarning, &KMessageWidget::animatedHide);
     m_form.glCrashedWarning->addAction(reenableGlAction);
-    m_form.scaleWarning->setIcon(QIcon::fromTheme(QStringLiteral("dialog-warning")));
-    m_form.tearingWarning->setIcon(QIcon::fromTheme(QStringLiteral("dialog-warning")));
     m_form.windowThumbnailWarning->setIcon(QIcon::fromTheme(QStringLiteral("dialog-warning")));
 
     m_form.kcfg_Enabled->setVisible(!compositingRequired());
@@ -119,34 +117,6 @@ void KWinCompositingKCM::init()
         m_form.animationSpeedControls->hide();
     }
 
-    // gl scale filter
-    connect(m_form.kcfg_glTextureFilter, currentIndexChangedSignal, this, [this](int index) {
-        if (index == 2) {
-            m_form.scaleWarning->animatedShow();
-        } else {
-            m_form.scaleWarning->animatedHide();
-        }
-    });
-
-    // tearing prevention
-    connect(m_form.kcfg_glPreferBufferSwap, currentIndexChangedSignal, this, [this](int index) {
-        if (index == 1) {
-            // only when cheap - tearing
-            m_form.tearingWarning->setText(i18n("\"Only when cheap\" only prevents tearing for full screen changes like a video."));
-            m_form.tearingWarning->animatedShow();
-        } else if (index == 2) {
-            // full screen repaints
-            m_form.tearingWarning->setText(i18n("\"Full screen repaints\" can cause performance problems."));
-            m_form.tearingWarning->animatedShow();
-        } else if (index == 3) {
-            // re-use screen content
-            m_form.tearingWarning->setText(i18n("\"Re-use screen content\" causes severe performance problems on MESA drivers."));
-            m_form.tearingWarning->animatedShow();
-        } else {
-            m_form.tearingWarning->animatedHide();
-        }
-    });
-
     // windowThumbnail
     connect(m_form.kcfg_HiddenPreviews, currentIndexChangedSignal, this, [this](int index) {
         if (index == 2) {