diff --git a/src/libkwineffects/effects.h b/src/libkwineffects/effects.h index d9e93551ba..fa09e21913 100644 --- a/src/libkwineffects/effects.h +++ b/src/libkwineffects/effects.h @@ -13,6 +13,7 @@ #pragma once #include "libkwineffects/effect.h" +#include "opengl/glvertexbuffer.h" #include #include @@ -2066,18 +2067,6 @@ private: Group *m_group; }; -struct GLVertex2D -{ - QVector2D position; - QVector2D texcoord; -}; - -struct GLVertex3D -{ - QVector3D position; - QVector2D texcoord; -}; - /** * @short Vertex class * diff --git a/src/libkwineffects/offscreenquickview.cpp b/src/libkwineffects/offscreenquickview.cpp index 0999b23101..186f79d077 100644 --- a/src/libkwineffects/offscreenquickview.cpp +++ b/src/libkwineffects/offscreenquickview.cpp @@ -8,6 +8,7 @@ */ #include "libkwineffects/offscreenquickview.h" +#include "libkwineffects/effects.h" #include "logging_p.h" #include "opengl/glutils.h" diff --git a/src/opengl/glvertexbuffer.cpp b/src/opengl/glvertexbuffer.cpp index b16677ccef..5c4f67a7bf 100644 --- a/src/opengl/glvertexbuffer.cpp +++ b/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 diff --git a/src/opengl/glvertexbuffer.h b/src/opengl/glvertexbuffer.h index a1318299f2..5698298166 100644 --- a/src/opengl/glvertexbuffer.h +++ b/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 #include +#include + #include #include #include @@ -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. * diff --git a/src/plugins/backgroundcontrast/contrast.cpp b/src/plugins/backgroundcontrast/contrast.cpp index 5947f799df..0916e53d9b 100644 --- a/src/plugins/backgroundcontrast/contrast.cpp +++ b/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" diff --git a/src/plugins/blur/blur.cpp b/src/plugins/blur/blur.cpp index b554cbf488..ebeb52f4fc 100644 --- a/src/plugins/blur/blur.cpp +++ b/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" diff --git a/src/plugins/colorpicker/colorpicker.cpp b/src/plugins/colorpicker/colorpicker.cpp index f129a4bba4..8ba282935e 100644 --- a/src/plugins/colorpicker/colorpicker.cpp +++ b/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 diff --git a/src/plugins/mouseclick/mouseclick.cpp b/src/plugins/mouseclick/mouseclick.cpp index 2ace4b1ec1..8132fc0c27 100644 --- a/src/plugins/mouseclick/mouseclick.cpp +++ b/src/plugins/mouseclick/mouseclick.cpp @@ -13,6 +13,7 @@ #include "core/rendertarget.h" #include "core/renderviewport.h" +#include "libkwineffects/effects.h" #include diff --git a/src/plugins/mousemark/mousemark.cpp b/src/plugins/mousemark/mousemark.cpp index 12776603d0..3a1dc9bb26 100644 --- a/src/plugins/mousemark/mousemark.cpp +++ b/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 #include diff --git a/src/plugins/screenedge/screenedgeeffect.cpp b/src/plugins/screenedge/screenedgeeffect.cpp index cf97732a99..79ba305373 100644 --- a/src/plugins/screenedge/screenedgeeffect.cpp +++ b/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 diff --git a/src/plugins/screenshot/screenshot.cpp b/src/plugins/screenshot/screenshot.cpp index b615d12cdc..909ef11a42 100644 --- a/src/plugins/screenshot/screenshot.cpp +++ b/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" diff --git a/src/plugins/screentransform/screentransform.cpp b/src/plugins/screentransform/screentransform.cpp index 2aa067d740..bbeec61c92 100644 --- a/src/plugins/screentransform/screentransform.cpp +++ b/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 diff --git a/src/plugins/showpaint/showpaint.cpp b/src/plugins/showpaint/showpaint.cpp index f2830b2e77..be65fd78b4 100644 --- a/src/plugins/showpaint/showpaint.cpp +++ b/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 diff --git a/src/plugins/snaphelper/snaphelper.cpp b/src/plugins/snaphelper/snaphelper.cpp index ed033475c7..0d119bd7ce 100644 --- a/src/plugins/snaphelper/snaphelper.cpp +++ b/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 diff --git a/src/plugins/startupfeedback/startupfeedback.cpp b/src/plugins/startupfeedback/startupfeedback.cpp index 82ce653770..835a4043bd 100644 --- a/src/plugins/startupfeedback/startupfeedback.cpp +++ b/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 diff --git a/src/plugins/touchpoints/touchpoints.cpp b/src/plugins/touchpoints/touchpoints.cpp index 1622c85bf7..8f87664bcb 100644 --- a/src/plugins/touchpoints/touchpoints.cpp +++ b/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 diff --git a/src/plugins/trackmouse/trackmouse.cpp b/src/plugins/trackmouse/trackmouse.cpp index ce3f52dee2..eeaf5e635f 100644 --- a/src/plugins/trackmouse/trackmouse.cpp +++ b/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 diff --git a/src/plugins/zoom/zoom.cpp b/src/plugins/zoom/zoom.cpp index 8db703e37b..43cc7eda9b 100644 --- a/src/plugins/zoom/zoom.cpp +++ b/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