Move GLVertex2D to glvertexbuffer.h

src/libkwineffects/effects.h

@@ -13,6 +13,7 @@
 #pragma once
 
 #include "libkwineffects/effect.h"
+#include "opengl/glvertexbuffer.h"
 
 #include <QEasingCurve>
 #include <QIcon>
@@ -2066,18 +2067,6 @@ private:
     Group *m_group;
 };
 
-struct GLVertex2D
-{
-    QVector2D position;
-    QVector2D texcoord;
-};
-
-struct GLVertex3D
-{
-    QVector3D position;
-    QVector2D texcoord;
-};
-
 /**
  * @short Vertex class
  *

src/libkwineffects/offscreenquickview.cpp

@@ -8,6 +8,7 @@
 */
 
 #include "libkwineffects/offscreenquickview.h"
+#include "libkwineffects/effects.h"
 
 #include "logging_p.h"
 #include "opengl/glutils.h"

src/opengl/glvertexbuffer.cpp

@@ -14,7 +14,6 @@
 #include "glshader.h"
 #include "glshadermanager.h"
 #include "glutils.h"
-#include "libkwineffects/effects.h"
 #include "utils/common.h"
 
 #include <QVector4D>

src/opengl/glvertexbuffer.h

@@ -9,10 +9,12 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 #pragma once
-#include "libkwineffects/effects.h"
+#include "kwin_export.h"
 
 #include <QColor>
 #include <QRegion>
+#include <QVector2D>
+
 #include <epoxy/gl.h>
 #include <optional>
 #include <ranges>
@@ -27,6 +29,18 @@ enum VertexAttributeType {
     VertexAttributeCount = 2,
 };
 
+struct GLVertex2D
+{
+    QVector2D position;
+    QVector2D texcoord;
+};
+
+struct GLVertex3D
+{
+    QVector3D position;
+    QVector2D texcoord;
+};
+
 /**
  * Describes the format of a vertex attribute stored in a buffer object.
  *

src/plugins/backgroundcontrast/contrast.cpp

@@ -12,6 +12,7 @@
 
 #include "core/rendertarget.h"
 #include "core/renderviewport.h"
+#include "libkwineffects/effects.h"
 #include "utils/xcbutils.h"
 #include "wayland/contrast.h"
 #include "wayland/display.h"

src/plugins/blur/blur.cpp

@@ -12,6 +12,7 @@
 
 #include "core/rendertarget.h"
 #include "core/renderviewport.h"
+#include "libkwineffects/effects.h"
 #include "opengl/glplatform.h"
 #include "utils/xcbutils.h"
 #include "wayland/blur.h"

src/plugins/colorpicker/colorpicker.cpp

@@ -9,6 +9,7 @@
 #include "colorpicker.h"
 #include "core/rendertarget.h"
 #include "core/renderviewport.h"
+#include "libkwineffects/effects.h"
 #include "opengl/glutils.h"
 #include "opengl/glutils_funcs.h"
 #include <KLocalizedString>

src/plugins/mouseclick/mouseclick.cpp

@@ -13,6 +13,7 @@
 
 #include "core/rendertarget.h"
 #include "core/renderviewport.h"
+#include "libkwineffects/effects.h"
 
 #include <QAction>
 

src/plugins/mousemark/mousemark.cpp

@@ -17,6 +17,7 @@
 
 #include "core/rendertarget.h"
 #include "core/renderviewport.h"
+#include "libkwineffects/effects.h"
 #include "opengl/glplatform.h"
 #include <KGlobalAccel>
 #include <KLocalizedString>

src/plugins/screenedge/screenedgeeffect.cpp

@@ -10,6 +10,7 @@
 // KWin
 #include "core/rendertarget.h"
 #include "core/renderviewport.h"
+#include "libkwineffects/effects.h"
 #include "opengl/gltexture.h"
 #include "opengl/glutils.h"
 // KDE

src/plugins/screenshot/screenshot.cpp

@@ -14,6 +14,7 @@
 #include "core/output.h"
 #include "core/rendertarget.h"
 #include "core/renderviewport.h"
+#include "libkwineffects/effects.h"
 #include "opengl/glplatform.h"
 #include "opengl/glutils.h"
 

src/plugins/screentransform/screentransform.cpp

@@ -10,6 +10,7 @@
 #include "screentransform.h"
 #include "core/rendertarget.h"
 #include "core/renderviewport.h"
+#include "libkwineffects/effects.h"
 #include "opengl/glutils.h"
 
 #include <QDebug>

src/plugins/showpaint/showpaint.cpp

@@ -11,6 +11,7 @@
 #include "showpaint.h"
 
 #include "core/renderviewport.h"
+#include "libkwineffects/effects.h"
 #include "opengl/glutils.h"
 
 #include <KGlobalAccel>

src/plugins/snaphelper/snaphelper.cpp

@@ -12,6 +12,7 @@
 
 #include "core/rendertarget.h"
 #include "core/renderviewport.h"
+#include "libkwineffects/effects.h"
 #include "opengl/glutils.h"
 
 #include <QPainter>

src/plugins/startupfeedback/startupfeedback.cpp

@@ -26,6 +26,7 @@
 // KWin
 #include "core/rendertarget.h"
 #include "core/renderviewport.h"
+#include "libkwineffects/effects.h"
 #include "opengl/glutils.h"
 
 // based on StartupId in KRunner by Lubos Lunak

src/plugins/touchpoints/touchpoints.cpp

@@ -12,6 +12,7 @@
 
 #include "core/rendertarget.h"
 #include "core/renderviewport.h"
+#include "libkwineffects/effects.h"
 #include "opengl/glutils.h"
 #include <QAction>
 

src/plugins/trackmouse/trackmouse.cpp

@@ -21,6 +21,7 @@
 
 #include "core/rendertarget.h"
 #include "core/renderviewport.h"
+#include "libkwineffects/effects.h"
 #include "opengl/glutils.h"
 
 #include <KGlobalAccel>

src/plugins/zoom/zoom.cpp

@@ -26,6 +26,7 @@
 
 #include "core/rendertarget.h"
 #include "core/renderviewport.h"
+#include "libkwineffects/effects.h"
 #include "opengl/glutils.h"
 
 namespace KWin