libkwineffects: move files out to more fitting places

autotests/integration/screencasting_test.cpp

@@ -9,7 +9,7 @@
 #include "compositor.h"
 #include "core/output.h"
 #include "generic_scene_opengl_test.h"
-#include "libkwineffects/glplatform.h"
+#include "opengl/glplatform.h"
 #include "pointer_input.h"
 #include "scene/workspacescene.h"
 #include "wayland_server.h"

autotests/libkwineffects/CMakeLists.txt

@@ -14,7 +14,7 @@ kwineffects_unit_tests(
     timelinetest
 )
 
-add_executable(kwinglplatformtest kwinglplatformtest.cpp mock_gl.cpp ../../src/libkwineffects/glplatform.cpp ../../src/libkwineffects/openglcontext.cpp ../../src/libkwineffects/version.cpp)
+add_executable(kwinglplatformtest kwinglplatformtest.cpp mock_gl.cpp ../../src/opengl/glplatform.cpp ../../src/opengl/openglcontext.cpp ../../src/utils/version.cpp)
 add_test(NAME kwineffects-kwinglplatformtest COMMAND kwinglplatformtest)
 target_link_libraries(kwinglplatformtest Qt::Test Qt::Gui KF6::ConfigCore XCB::XCB)
 ecm_mark_as_test(kwinglplatformtest)

autotests/libkwineffects/kwinglplatformtest.cpp

@@ -6,8 +6,8 @@
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
-#include "libkwineffects/glplatform.h"
 #include "mock_gl.h"
+#include "opengl/glplatform.h"
 #include <QTest>
 
 #include <KConfig>

src/CMakeLists.txt

@@ -45,6 +45,7 @@ target_sources(kwin PRIVATE
     core/colorlut.cpp
     core/colorlut3d.cpp
     core/colorpipelinestage.cpp
+    core/colorspace.cpp
     core/colortransformation.cpp
     core/gbmgraphicsbufferallocator.cpp
     core/graphicsbuffer.cpp
@@ -63,6 +64,8 @@ target_sources(kwin PRIVATE
     core/renderlayer.cpp
     core/renderlayerdelegate.cpp
     core/renderloop.cpp
+    core/rendertarget.cpp
+    core/renderviewport.cpp
     core/session.cpp
     core/session_consolekit.cpp
     core/session_logind.cpp
@@ -106,29 +109,14 @@ target_sources(kwin PRIVATE
     layershellv1integration.cpp
     layershellv1window.cpp
     libkwineffects/anidata.cpp
-    libkwineffects/colorspace.cpp
     libkwineffects/effectframe.cpp
     libkwineffects/effecttogglablestate.cpp
-    libkwineffects/glframebuffer.cpp
-    libkwineffects/gllut.cpp
-    libkwineffects/gllut3D.cpp
-    libkwineffects/glplatform.cpp
-    libkwineffects/glshader.cpp
-    libkwineffects/glshadermanager.cpp
-    libkwineffects/gltexture.cpp
-    libkwineffects/glutils.cpp
-    libkwineffects/glutils_funcs.cpp
-    libkwineffects/glvertexbuffer.cpp
     libkwineffects/kwinanimationeffect.cpp
     libkwineffects/kwineffects.cpp
     libkwineffects/kwinoffscreeneffect.cpp
     libkwineffects/kwinoffscreenquickview.cpp
     libkwineffects/kwinquickeffect.cpp
     libkwineffects/logging.cpp
-    libkwineffects/openglcontext.cpp
-    libkwineffects/rendertarget.cpp
-    libkwineffects/renderviewport.cpp
-    libkwineffects/version.cpp
     lidswitchtracker.cpp
     main.cpp
     modifier_only_shortcuts.cpp
@@ -136,6 +124,17 @@ target_sources(kwin PRIVATE
     moving_client_x11_filter.cpp
     netinfo.cpp
     onscreennotification.cpp
+    opengl/glframebuffer.cpp
+    opengl/gllut.cpp
+    opengl/gllut3D.cpp
+    opengl/glplatform.cpp
+    opengl/glshader.cpp
+    opengl/glshadermanager.cpp
+    opengl/gltexture.cpp
+    opengl/glutils.cpp
+    opengl/glutils_funcs.cpp
+    opengl/glvertexbuffer.cpp
+    opengl/openglcontext.cpp
     options.cpp
     osd.cpp
     outline.cpp
@@ -200,6 +199,7 @@ target_sources(kwin PRIVATE
     tiles/tilemanager.cpp
     touch_input.cpp
     useractions.cpp
+    utils/version.cpp
     virtualdesktops.cpp
     virtualdesktopsdbustypes.cpp
     virtualkeyboard_dbus.cpp
@@ -422,8 +422,11 @@ install(FILES
     DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwin COMPONENT Devel)
 
 install(FILES
+    core/colorspace.h
     core/output.h
     core/renderloop.h
+    core/rendertarget.h
+    core/renderviewport.h
     DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwin/core COMPONENT Devel)
 
 install(FILES
@@ -431,27 +434,29 @@ install(FILES
     DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwin/utils COMPONENT Devel)
 
 install(FILES
-    libkwineffects/colorspace.h
-    libkwineffects/glframebuffer.h
-    libkwineffects/gllut.h
-    libkwineffects/gllut3D.h
-    libkwineffects/glplatform.h
-    libkwineffects/glshader.h
-    libkwineffects/glshadermanager.h
-    libkwineffects/gltexture.h
-    libkwineffects/glutils.h
-    libkwineffects/glutils_funcs.h
-    libkwineffects/glvertexbuffer.h
     libkwineffects/kwinanimationeffect.h
     libkwineffects/kwineffects.h
     libkwineffects/kwinglobals.h
     libkwineffects/kwinoffscreeneffect.h
     libkwineffects/kwinoffscreenquickview.h
     libkwineffects/kwinquickeffect.h
-    libkwineffects/rendertarget.h
-    libkwineffects/renderviewport.h
     DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwin/libkwineffects COMPONENT Devel)
 
+install(FILES
+    opengl/glframebuffer.h
+    opengl/gllut.h
+    opengl/gllut3D.h
+    opengl/glplatform.h
+    opengl/glshader.h
+    opengl/glshadermanager.h
+    opengl/gltexture.h
+    opengl/glutils.h
+    opengl/glutils_funcs.h
+    opengl/glvertexbuffer.h
+    opengl/openglcontext.h
+    DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwin/opengl COMPONENT Devel
+)
+
 set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KWin")
 
 install(FILES  "${CMAKE_CURRENT_BINARY_DIR}/KWinConfig.cmake"

src/backends/drm/drm_egl_backend.h

@@ -10,7 +10,7 @@
 #include "drm_render_backend.h"
 #include "platformsupport/scenes/opengl/abstract_egl_backend.h"
 
-#include "libkwineffects/glutils.h"
+#include "opengl/glutils.h"
 
 #include <QHash>
 #include <QPointer>

src/backends/drm/drm_egl_layer_surface.cpp

@@ -16,7 +16,7 @@
 #include "drm_gpu.h"
 #include "drm_logging.h"
 #include "icc_shader.h"
-#include "libkwineffects/gllut.h"
+#include "opengl/gllut.h"
 #include "platformsupport/scenes/opengl/eglnativefence.h"
 #include "platformsupport/scenes/opengl/eglswapchain.h"
 #include "platformsupport/scenes/opengl/glrendertimequery.h"

src/backends/drm/drm_egl_layer_surface.h

@@ -17,7 +17,7 @@
 
 #include "core/outputlayer.h"
 #include "drm_plane.h"
-#include "libkwineffects/gltexture.h"
+#include "opengl/gltexture.h"
 #include "utils/damagejournal.h"
 
 struct gbm_bo;

src/backends/drm/drm_pipeline.h

@@ -17,12 +17,12 @@
 #include <xf86drmMode.h>
 
 #include "core/colorlut.h"
+#include "core/colorspace.h"
 #include "core/output.h"
 #include "core/renderloop_p.h"
 #include "drm_blob.h"
 #include "drm_connector.h"
 #include "drm_plane.h"
-#include "libkwineffects/colorspace.h"
 
 namespace KWin
 {

src/backends/drm/icc_shader.cpp

@@ -7,11 +7,11 @@
 #include "core/colorlut3d.h"
 #include "core/colortransformation.h"
 #include "core/iccprofile.h"
-#include "libkwineffects/gllut.h"
-#include "libkwineffects/gllut3D.h"
-#include "libkwineffects/glshader.h"
-#include "libkwineffects/glshadermanager.h"
-#include "libkwineffects/gltexture.h"
+#include "opengl/gllut.h"
+#include "opengl/gllut3D.h"
+#include "opengl/glshader.h"
+#include "opengl/glshadermanager.h"
+#include "opengl/gltexture.h"
 
 namespace KWin
 {

src/backends/virtual/virtual_egl_backend.cpp

@@ -8,7 +8,7 @@
 */
 #include "virtual_egl_backend.h"
 #include "core/gbmgraphicsbufferallocator.h"
-#include "libkwineffects/glutils.h"
+#include "opengl/glutils.h"
 #include "platformsupport/scenes/opengl/basiceglsurfacetexture_wayland.h"
 #include "platformsupport/scenes/opengl/eglswapchain.h"
 #include "platformsupport/scenes/opengl/glrendertimequery.h"

src/backends/wayland/wayland_egl_backend.cpp

@@ -10,7 +10,7 @@
 
 #include "wayland_egl_backend.h"
 #include "core/gbmgraphicsbufferallocator.h"
-#include "libkwineffects/glutils.h"
+#include "opengl/glutils.h"
 #include "platformsupport/scenes/opengl/basiceglsurfacetexture_wayland.h"
 #include "platformsupport/scenes/opengl/eglswapchain.h"
 #include "platformsupport/scenes/opengl/glrendertimequery.h"

src/backends/x11/standalone/glxcontext.h

@@ -7,7 +7,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 #pragma once
-#include "libkwineffects/openglcontext.h"
+#include "opengl/openglcontext.h"
 #include "x11_standalone_glx_backend.h"
 
 #include <epoxy/glx.h>

src/backends/x11/standalone/x11_standalone_egl_backend.cpp

@@ -11,7 +11,7 @@
 #include "core/outputlayer.h"
 #include "core/overlaywindow.h"
 #include "core/renderloop_p.h"
-#include "libkwineffects/glplatform.h"
+#include "opengl/glplatform.h"
 #include "options.h"
 #include "platformsupport/scenes/opengl/glrendertimequery.h"
 #include "scene/surfaceitem_x11.h"

src/backends/x11/standalone/x11_standalone_egl_backend.h

@@ -12,8 +12,8 @@
 #include "platformsupport/scenes/opengl/openglsurfacetexture_x11.h"
 #include "utils/damagejournal.h"
 
-#include "libkwineffects/gltexture.h"
-#include "libkwineffects/gltexture_p.h"
+#include "opengl/gltexture.h"
+#include "opengl/gltexture_p.h"
 
 typedef struct _XDisplay Display;
 

src/backends/x11/standalone/x11_standalone_glx_backend.cpp

@@ -34,9 +34,9 @@
 #include "utils/xcbutils.h"
 #include "workspace.h"
 // kwin libs
-#include "libkwineffects/glplatform.h"
-#include "libkwineffects/glutils.h"
 #include "libkwineffects/kwinoffscreenquickview.h"
+#include "opengl/glplatform.h"
+#include "opengl/glutils.h"
 // Qt
 #include <QDebug>
 #include <QOpenGLContext>

src/backends/x11/standalone/x11_standalone_glx_backend.h

@@ -18,8 +18,8 @@
 #include <fixx11h.h>
 #include <xcb/glx.h>
 
-#include "libkwineffects/gltexture.h"
-#include "libkwineffects/gltexture_p.h"
+#include "opengl/gltexture.h"
+#include "opengl/gltexture_p.h"
 
 #include <QHash>
 #include <memory>

src/backends/x11/windowed/x11_windowed_egl_backend.h

@@ -9,7 +9,7 @@
 #pragma once
 
 #include "core/outputlayer.h"
-#include "libkwineffects/glutils.h"
+#include "opengl/glutils.h"
 #include "platformsupport/scenes/opengl/abstract_egl_backend.h"
 
 namespace KWin

src/compositor_wayland.cpp

@@ -12,8 +12,8 @@
 #include "core/outputbackend.h"
 #include "core/renderbackend.h"
 #include "core/renderlayer.h"
-#include "libkwineffects/glplatform.h"
 #include "main.h"
+#include "opengl/glplatform.h"
 #include "platformsupport/scenes/opengl/openglbackend.h"
 #include "platformsupport/scenes/qpainter/qpainterbackend.h"
 #include "scene/cursordelegate_opengl.h"

src/compositor_x11.cpp

@@ -12,7 +12,7 @@
 #include "core/overlaywindow.h"
 #include "core/renderbackend.h"
 #include "core/renderlayer.h"
-#include "libkwineffects/glplatform.h"
+#include "opengl/glplatform.h"
 #include "options.h"
 #include "platformsupport/scenes/opengl/openglbackend.h"
 #include "scene/surfaceitem_x11.h"

src/core/iccprofile.h

@@ -5,8 +5,8 @@
 */
 #pragma once
 
+#include "core/colorspace.h"
 #include "kwin_export.h"
-#include "libkwineffects/colorspace.h"
 
 #include <QMatrix4x4>
 #include <QString>

src/core/outputlayer.h

@@ -6,8 +6,8 @@
 
 #pragma once
 
+#include "core/rendertarget.h"
 #include "kwin_export.h"
-#include "libkwineffects/rendertarget.h"
 
 #include <QObject>
 #include <QRegion>

src/core/renderbackend.h

@@ -6,8 +6,8 @@
 
 #pragma once
 
+#include "core/rendertarget.h"
 #include "libkwineffects/kwinglobals.h"
-#include "libkwineffects/rendertarget.h"
 
 #include <QObject>
 

src/core/rendertarget.cpp

@@ -4,8 +4,8 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "libkwineffects/rendertarget.h"
-#include "libkwineffects/glutils.h"
+#include "core/rendertarget.h"
+#include "opengl/glutils.h"
 
 namespace KWin
 {

src/core/rendertarget.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "libkwineffects/colorspace.h"
+#include "core/colorspace.h"
 
 #include <QImage>
 #include <QMatrix4x4>

src/core/renderviewport.cpp

@@ -3,8 +3,8 @@
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
-#include "libkwineffects/renderviewport.h"
-#include "libkwineffects/rendertarget.h"
+#include "core/renderviewport.h"
+#include "core/rendertarget.h"
 
 namespace KWin
 {

src/debug_console.cpp

@@ -13,9 +13,9 @@
 #include "input_event.h"
 #include "internalwindow.h"
 #include "keyboard_input.h"
-#include "libkwineffects/glplatform.h"
-#include "libkwineffects/glutils.h"
 #include "main.h"
+#include "opengl/glplatform.h"
+#include "opengl/glutils.h"
 #include "platformsupport/scenes/opengl/openglbackend.h"
 #include "utils/filedescriptor.h"
 #include "utils/subsurfacemonitor.h"

src/effects.cpp

@@ -38,13 +38,13 @@
 #include "screenlockerwatcher.h"
 #endif
 #include "compositor.h"
+#include "core/rendertarget.h"
+#include "core/renderviewport.h"
 #include "decorations/decorationbridge.h"
 #include "inputmethod.h"
 #include "inputpanelv1window.h"
-#include "libkwineffects/glutils.h"
 #include "libkwineffects/kwinoffscreenquickview.h"
-#include "libkwineffects/rendertarget.h"
-#include "libkwineffects/renderviewport.h"
+#include "opengl/glutils.h"
 #include "scene/windowitem.h"
 #include "utils/xcbutils.h"
 #include "virtualdesktops.h"

src/libkwineffects/kwinanimationeffect.cpp

@@ -10,7 +10,7 @@
 
 #include "libkwineffects/kwinanimationeffect.h"
 #include "libkwineffects/anidata_p.h"
-#include "libkwineffects/glutils.h"
+#include "opengl/glutils.h"
 
 #include <QDateTime>
 #include <QTimer>

src/libkwineffects/kwinoffscreeneffect.cpp

@@ -6,10 +6,10 @@
 
 #include "libkwineffects/kwinoffscreeneffect.h"
 #include "core/output.h"
-#include "libkwineffects/gltexture.h"
-#include "libkwineffects/glutils.h"
-#include "libkwineffects/rendertarget.h"
-#include "libkwineffects/renderviewport.h"
+#include "core/rendertarget.h"
+#include "core/renderviewport.h"
+#include "opengl/gltexture.h"
+#include "opengl/glutils.h"
 
 namespace KWin
 {

src/libkwineffects/kwinoffscreenquickview.cpp

@@ -9,8 +9,8 @@
 
 #include "libkwineffects/kwinoffscreenquickview.h"
 
-#include "libkwineffects/glutils.h"
 #include "logging_p.h"
+#include "opengl/glutils.h"
 
 #include <QGuiApplication>
 #include <QQmlComponent>

src/libkwineffects/logging.cpp

@@ -8,4 +8,3 @@
 */
 #include "logging_p.h"
 Q_LOGGING_CATEGORY(LIBKWINEFFECTS, "libkwineffects", QtWarningMsg)
-Q_LOGGING_CATEGORY(LIBKWINGLUTILS, "libkwinglutils", QtWarningMsg)

src/libkwineffects/logging_p.h

@@ -12,4 +12,3 @@
 #include <QLoggingCategory>
 
 Q_DECLARE_LOGGING_CATEGORY(LIBKWINEFFECTS)
-Q_DECLARE_LOGGING_CATEGORY(LIBKWINGLUTILS)

src/main.cpp

@@ -15,15 +15,15 @@
 #include "colors/colormanager.h"
 #include "compositor.h"
 #include "core/outputbackend.h"
+#include "core/rendertarget.h"
 #include "core/session.h"
 #include "cursor.h"
 #include "cursorsource.h"
 #include "effects.h"
 #include "input.h"
 #include "inputmethod.h"
-#include "libkwineffects/gltexture.h"
-#include "libkwineffects/glutils.h"
-#include "libkwineffects/rendertarget.h"
+#include "opengl/gltexture.h"
+#include "opengl/glutils.h"
 #include "options.h"
 #include "outline.h"
 #include "pluginmanager.h"

src/opengl/glframebuffer.cpp

@@ -9,12 +9,12 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 #include "glframebuffer.h"
+#include "core/rendertarget.h"
+#include "core/renderviewport.h"
 #include "glplatform.h"
 #include "gltexture.h"
 #include "glutils.h"
-#include "logging_p.h"
-#include "rendertarget.h"
-#include "renderviewport.h"
+#include "utils/common.h"
 
 namespace KWin
 {
@@ -110,7 +110,7 @@ GLFramebuffer::GLFramebuffer(GLTexture *colorAttachment, Attachment attachment)
     , m_colorAttachment(colorAttachment)
 {
     if (!s_supported) {
-        qCCritical(LIBKWINGLUTILS) << "Framebuffer objects aren't supported!";
+        qCCritical(KWIN_OPENGL) << "Framebuffer objects aren't supported!";
         return;
     }
 
@@ -132,7 +132,7 @@ GLFramebuffer::GLFramebuffer(GLTexture *colorAttachment, Attachment attachment)
 
     if (status != GL_FRAMEBUFFER_COMPLETE) {
         // We have an incomplete framebuffer, consider it invalid
-        qCCritical(LIBKWINGLUTILS) << "Invalid framebuffer status: " << formatFramebufferStatus(status);
+        qCCritical(KWIN_OPENGL) << "Invalid framebuffer status: " << formatFramebufferStatus(status);
         glDeleteFramebuffers(1, &m_handle);
         return;
     }
@@ -165,7 +165,7 @@ GLFramebuffer::~GLFramebuffer()
 bool GLFramebuffer::bind()
 {
     if (!valid()) {
-        qCCritical(LIBKWINGLUTILS) << "Can't enable invalid framebuffer object!";
+        qCCritical(KWIN_OPENGL) << "Can't enable invalid framebuffer object!";
         return false;
     }
 

src/opengl/glplatform.cpp

@@ -7,11 +7,11 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "libkwineffects/glplatform.h"
+#include "opengl/glplatform.h"
 // include kwinglutils_funcs.h to avoid the redeclaration issues
 // between qopengl.h and epoxy/gl.h
-#include "libkwineffects/glutils_funcs.h"
 #include "libkwineffects/kwinxcb.h"
+#include "opengl/glutils_funcs.h"
 #include <epoxy/gl.h>
 
 #include <QDebug>

src/opengl/glshader.cpp

@@ -11,7 +11,7 @@
 #include "glshader.h"
 #include "glplatform.h"
 #include "glutils.h"
-#include "logging_p.h"
+#include "utils/common.h"
 
 #include <QFile>
 
@@ -46,14 +46,14 @@ bool GLShader::loadFromFiles(const QString &vertexFile, const QString &fragmentF
 {
     QFile vf(vertexFile);
     if (!vf.open(QIODevice::ReadOnly)) {
-        qCCritical(LIBKWINGLUTILS) << "Couldn't open" << vertexFile << "for reading!";
+        qCCritical(KWIN_OPENGL) << "Couldn't open" << vertexFile << "for reading!";
         return false;
     }
     const QByteArray vertexSource = vf.readAll();
 
     QFile ff(fragmentFile);
     if (!ff.open(QIODevice::ReadOnly)) {
-        qCCritical(LIBKWINGLUTILS) << "Couldn't open" << fragmentFile << "for reading!";
+        qCCritical(KWIN_OPENGL) << "Couldn't open" << fragmentFile << "for reading!";
         return false;
     }
     const QByteArray fragmentSource = ff.readAll();
@@ -80,12 +80,12 @@ bool GLShader::link()
     glGetProgramiv(m_program, GL_LINK_STATUS, &status);
 
     if (status == 0) {
-        qCCritical(LIBKWINGLUTILS) << "Failed to link shader:"
-                                   << "\n"
-                                   << log;
+        qCCritical(KWIN_OPENGL) << "Failed to link shader:"
+                                << "\n"
+                                << log;
         m_valid = false;
     } else if (length > 0) {
-        qCDebug(LIBKWINGLUTILS) << "Shader link log:" << log;
+        qCDebug(KWIN_OPENGL) << "Shader link log:" << log;
     }
 
     return m_valid;
@@ -130,11 +130,11 @@ bool GLShader::compile(GLuint program, GLenum shaderType, const QByteArray &sour
 
     if (status == 0) {
         const char *typeName = (shaderType == GL_VERTEX_SHADER ? "vertex" : "fragment");
-        qCCritical(LIBKWINGLUTILS) << "Failed to compile" << typeName << "shader:"
-                                   << "\n"
-                                   << log;
+        qCCritical(KWIN_OPENGL) << "Failed to compile" << typeName << "shader:"
+                                << "\n"
+                                << log;
     } else if (length > 0) {
-        qCDebug(LIBKWINGLUTILS) << "Shader compile log:" << log;
+        qCDebug(KWIN_OPENGL) << "Shader compile log:" << log;
     }
 
     if (status != 0) {

src/opengl/glshader.h

@@ -9,7 +9,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 #pragma once
-#include "colorspace.h"
+#include "core/colorspace.h"
 
 #include <QColor>
 #include <QMatrix3x3>

src/opengl/glshadermanager.cpp

@@ -12,7 +12,7 @@
 #include "glplatform.h"
 #include "glshader.h"
 #include "glvertexbuffer.h"
-#include "logging_p.h"
+#include "utils/common.h"
 
 #include <QFile>
 #include <QTextStream>
@@ -272,11 +272,11 @@ std::unique_ptr<GLShader> ShaderManager::generateCustomShader(ShaderTraits trait
     const QByteArray fragment = fragmentSource.isEmpty() ? generateFragmentSource(traits) : fragmentSource;
 
 #if 0
-    qCDebug(LIBKWINGLUTILS) << "**************";
-    qCDebug(LIBKWINGLUTILS) << vertex;
-    qCDebug(LIBKWINGLUTILS) << "**************";
-    qCDebug(LIBKWINGLUTILS) << fragment;
-    qCDebug(LIBKWINGLUTILS) << "**************";
+    qCDebug(KWIN_OPENGL) << "**************";
+    qCDebug(KWIN_OPENGL) << vertex;
+    qCDebug(KWIN_OPENGL) << "**************";
+    qCDebug(KWIN_OPENGL) << fragment;
+    qCDebug(KWIN_OPENGL) << "**************";
 #endif
 
     std::unique_ptr<GLShader> shader{new GLShader(GLShader::ExplicitLinking)};
@@ -305,7 +305,7 @@ static QString resolveShaderFilePath(const QString &filePath)
     } else if (filePath.endsWith(QStringLiteral(".vert"))) {
         extension = QStringLiteral(".vert");
     } else {
-        qCWarning(LIBKWINGLUTILS) << filePath << "must end either with .vert or .frag";
+        qCWarning(KWIN_OPENGL) << filePath << "must end either with .vert or .frag";
         return QString();
     }
 
@@ -320,7 +320,7 @@ std::unique_ptr<GLShader> ShaderManager::generateShaderFromFile(ShaderTraits tra
         if (file.open(QIODevice::ReadOnly)) {
             return file.readAll();
         }
-        qCCritical(LIBKWINGLUTILS) << "Failed to read shader " << filePath;
+        qCCritical(KWIN_OPENGL) << "Failed to read shader " << filePath;
         return QByteArray();
     };
     QByteArray vertexSource;

src/opengl/gltexture.cpp

@@ -10,11 +10,11 @@
 */
 
 #include "gltexture_p.h"
-#include "libkwineffects/glplatform.h"
-#include "libkwineffects/glutils.h"
-#include "libkwineffects/glutils_funcs.h"
 #include "libkwineffects/kwineffects.h"
-#include "logging_p.h"
+#include "opengl/glplatform.h"
+#include "opengl/glutils.h"
+#include "opengl/glutils_funcs.h"
+#include "utils/common.h"
 
 #include <QImage>
 #include <QPixmap>
@@ -615,7 +615,7 @@ std::unique_ptr<GLTexture> GLTexture::allocate(GLenum internalFormat, const QSiz
     GLuint texture = 0;
     glGenTextures(1, &texture);
     if (texture == 0) {
-        qCWarning(LIBKWINGLUTILS, "generating OpenGL texture handle failed");
+        qCWarning(KWIN_OPENGL, "generating OpenGL texture handle failed");
         return nullptr;
     }
     glBindTexture(GL_TEXTURE_2D, texture);
@@ -651,7 +651,7 @@ std::unique_ptr<GLTexture> GLTexture::upload(const QImage &image)
     GLuint texture = 0;
     glGenTextures(1, &texture);
     if (texture == 0) {
-        qCWarning(LIBKWINGLUTILS, "generating OpenGL texture handle failed");
+        qCWarning(KWIN_OPENGL, "generating OpenGL texture handle failed");
         return nullptr;
     }
     glBindTexture(GL_TEXTURE_2D, texture);

src/opengl/gltexture_p.h

@@ -11,7 +11,7 @@
 
 #pragma once
 
-#include "libkwineffects/glutils.h"
+#include "opengl/glutils.h"
 
 #include <QImage>
 #include <QMatrix4x4>

src/opengl/glutils.cpp

@@ -9,10 +9,10 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "libkwineffects/glutils.h"
+#include "opengl/glutils.h"
 #include "glplatform.h"
 #include "gltexture_p.h"
-#include "logging_p.h"
+#include "utils/common.h"
 
 namespace KWin
 {
@@ -60,7 +60,7 @@ static void initDebugOutput()
         switch (type) {
         case GL_DEBUG_TYPE_ERROR:
         case GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR:
-            qCWarning(LIBKWINGLUTILS, "%#x: %.*s", id, length, message);
+            qCWarning(KWIN_OPENGL, "%#x: %.*s", id, length, message);
             break;
 
         case GL_DEBUG_TYPE_OTHER:
@@ -68,7 +68,7 @@ static void initDebugOutput()
         case GL_DEBUG_TYPE_PORTABILITY:
         case GL_DEBUG_TYPE_PERFORMANCE:
         default:
-            qCDebug(LIBKWINGLUTILS, "%#x: %.*s", id, length, message);
+            qCDebug(KWIN_OPENGL, "%#x: %.*s", id, length, message);
             break;
         }
     };
@@ -171,16 +171,16 @@ bool checkGLError(const char *txt)
 {
     GLenum err = glGetError();
     if (err == GL_CONTEXT_LOST) {
-        qCWarning(LIBKWINGLUTILS) << "GL error: context lost";
+        qCWarning(KWIN_OPENGL) << "GL error: context lost";
         return true;
     }
     bool hasError = false;
     while (err != GL_NO_ERROR) {
-        qCWarning(LIBKWINGLUTILS) << "GL error (" << txt << "): " << formatGLError(err);
+        qCWarning(KWIN_OPENGL) << "GL error (" << txt << "): " << formatGLError(err);
         hasError = true;
         err = glGetError();
         if (err == GL_CONTEXT_LOST) {
-            qCWarning(LIBKWINGLUTILS) << "GL error: context lost";
+            qCWarning(KWIN_OPENGL) << "GL error: context lost";
             break;
         }
     }

src/opengl/glutils.h

@@ -10,13 +10,13 @@
 */
 #pragma once
 
-#include "libkwineffects/colorspace.h"
-#include "libkwineffects/glframebuffer.h"
-#include "libkwineffects/glshader.h"
-#include "libkwineffects/glshadermanager.h"
-#include "libkwineffects/gltexture.h"
-#include "libkwineffects/glutils_funcs.h"
-#include "libkwineffects/glvertexbuffer.h"
+#include "core/colorspace.h"
+#include "opengl/glframebuffer.h"
+#include "opengl/glshader.h"
+#include "opengl/glshadermanager.h"
+#include "opengl/gltexture.h"
+#include "opengl/glutils_funcs.h"
+#include "opengl/glvertexbuffer.h"
 
 #include <QByteArray>
 #include <QList>

src/opengl/glutils_funcs.cpp

@@ -7,8 +7,8 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "libkwineffects/glplatform.h"
-#include "libkwineffects/glutils.h"
+#include "opengl/glplatform.h"
+#include "opengl/glutils.h"
 
 // Resolves given function, using getProcAddress
 // Useful when functionality is defined in an extension with a different name

src/opengl/glvertexbuffer.cpp

@@ -14,8 +14,8 @@
 #include "glshader.h"
 #include "glshadermanager.h"
 #include "glutils.h"
-#include "kwineffects.h"
-#include "logging_p.h"
+#include "libkwineffects/kwineffects.h"
+#include "utils/common.h"
 
 #include <QVector4D>
 #include <bitset>
@@ -301,11 +301,11 @@ bool GLVertexBufferPrivate::awaitFence(intptr_t end)
     const BufferFence &fence = fences.front();
 
     if (!fence.signaled()) {
-        qCDebug(LIBKWINGLUTILS) << "Stalling on VBO fence";
+        qCDebug(KWIN_OPENGL) << "Stalling on VBO fence";
         const GLenum ret = glClientWaitSync(fence.sync, GL_SYNC_FLUSH_COMMANDS_BIT, 1000000000);
 
         if (ret == GL_TIMEOUT_EXPIRED || ret == GL_WAIT_FAILED) {
-            qCCritical(LIBKWINGLUTILS) << "Wait failed";
+            qCCritical(KWIN_OPENGL) << "Wait failed";
             return false;
         }
     }

src/opengl/glvertexbuffer.h

@@ -9,7 +9,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 #pragma once
-#include "kwineffects.h"
+#include "libkwineffects/kwineffects.h"
 
 #include <QColor>
 #include <QRegion>

src/opengl/openglcontext.h

@@ -8,7 +8,7 @@
 */
 #pragma once
 #include "kwin_export.h"
-#include "version.h"
+#include "utils/version.h"
 
 #include <stdint.h>
 #include <string_view>

src/platformsupport/scenes/opengl/abstract_egl_backend.cpp

@@ -16,8 +16,8 @@
 #include "wayland_server.h"
 // kwin libs
 #include "kwineglimagetexture.h"
-#include "libkwineffects/glplatform.h"
-#include "libkwineffects/glutils.h"
+#include "opengl/glplatform.h"
+#include "opengl/glutils.h"
 #include "utils/drm_format_helper.h"
 #include <kwineglutils_p.h>
 // Qt

src/platformsupport/scenes/opengl/basiceglsurfacetexture_wayland.cpp

@@ -6,7 +6,7 @@
 
 #include "platformsupport/scenes/opengl/basiceglsurfacetexture_wayland.h"
 #include "core/graphicsbufferview.h"
-#include "libkwineffects/gltexture.h"
+#include "opengl/gltexture.h"
 #include "platformsupport/scenes/opengl/abstract_egl_backend.h"
 #include "utils/common.h"
 

src/platformsupport/scenes/opengl/eglcontext.cpp

@@ -11,7 +11,7 @@
 #include "egldisplay.h"
 #include "kwineglimagetexture.h"
 #include "kwineglutils_p.h"
-#include "libkwineffects/glutils.h"
+#include "opengl/glutils.h"
 #include "utils/common.h"
 #include "utils/drm_format_helper.h"
 #include "utils/egl_context_attribute_builder.h"

src/platformsupport/scenes/opengl/eglcontext.h

@@ -8,8 +8,8 @@
 */
 #pragma once
 
-#include "libkwineffects/gltexture.h"
-#include "libkwineffects/openglcontext.h"
+#include "opengl/gltexture.h"
+#include "opengl/openglcontext.h"
 
 #include <QByteArray>
 #include <QList>

src/platformsupport/scenes/opengl/egldisplay.cpp

@@ -10,7 +10,7 @@
 #include "core/graphicsbuffer.h"
 #include "kwineglimagetexture.h"
 #include "kwineglutils_p.h"
-#include "libkwineffects/glutils.h"
+#include "opengl/glutils.h"
 #include "utils/common.h"
 
 #include <QOpenGLContext>

src/platformsupport/scenes/opengl/eglswapchain.cpp

@@ -10,7 +10,7 @@
 #include "platformsupport/scenes/opengl/eglswapchain.h"
 #include "core/graphicsbuffer.h"
 #include "core/graphicsbufferallocator.h"
-#include "libkwineffects/glutils.h"
+#include "opengl/glutils.h"
 #include "platformsupport/scenes/opengl/eglcontext.h"
 #include "utils/common.h"
 

src/platformsupport/scenes/opengl/glrendertimequery.cpp

@@ -7,7 +7,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 #include "glrendertimequery.h"
-#include "libkwineffects/glplatform.h"
+#include "opengl/glplatform.h"
 
 namespace KWin
 {

src/platformsupport/scenes/opengl/kwineglimagetexture.cpp

@@ -9,7 +9,7 @@
 
 #include "kwineglimagetexture.h"
 #include "egldisplay.h"
-#include "libkwineffects/gltexture_p.h"
+#include "opengl/gltexture_p.h"
 
 #include <QDebug>
 #include <epoxy/egl.h>

src/platformsupport/scenes/opengl/kwineglimagetexture.h

@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "libkwineffects/gltexture.h"
+#include "opengl/gltexture.h"
 
 typedef void *EGLImageKHR;
 typedef void *EGLClientBuffer;

src/platformsupport/scenes/opengl/openglbackend.cpp

@@ -8,7 +8,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 #include "platformsupport/scenes/opengl/openglbackend.h"
-#include "libkwineffects/glutils_funcs.h"
+#include "opengl/glutils_funcs.h"
 
 #include "utils/common.h"
 

src/platformsupport/scenes/opengl/openglsurfacetexture.cpp

@@ -5,7 +5,7 @@
 */
 
 #include "openglsurfacetexture.h"
-#include "libkwineffects/gltexture.h"
+#include "opengl/gltexture.h"
 
 namespace KWin
 {

src/plugins/backgroundcontrast/contrast.cpp

@@ -10,8 +10,8 @@
 #include "contrastshader.h"
 // KConfigSkeleton
 
-#include "libkwineffects/rendertarget.h"
-#include "libkwineffects/renderviewport.h"
+#include "core/rendertarget.h"
+#include "core/renderviewport.h"
 #include "utils/xcbutils.h"
 #include "wayland/contrast.h"
 #include "wayland/display.h"

src/plugins/backgroundcontrast/contrast.h

@@ -7,9 +7,9 @@
 
 #pragma once
 
-#include "libkwineffects/glplatform.h"
-#include "libkwineffects/glutils.h"
 #include "libkwineffects/kwineffects.h"
+#include "opengl/glplatform.h"
+#include "opengl/glutils.h"
 
 #include <QList>
 #include <QVector2D>

src/plugins/backgroundcontrast/contrastshader.cpp

@@ -7,8 +7,8 @@
 
 #include "contrastshader.h"
 
-#include "libkwineffects/glplatform.h"
 #include "libkwineffects/kwineffects.h"
+#include "opengl/glplatform.h"
 
 #include <QByteArray>
 #include <QMatrix4x4>

src/plugins/backgroundcontrast/contrastshader.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "libkwineffects/glutils.h"
+#include "opengl/glutils.h"
 
 class QMatrix4x4;
 

src/plugins/blendchanges/blendchanges.cpp

@@ -8,7 +8,7 @@
 */
 // own
 #include "blendchanges.h"
-#include "libkwineffects/glutils.h"
+#include "opengl/glutils.h"
 
 #include <QDBusConnection>
 #include <QTimer>

src/plugins/blur/blur.cpp

@@ -10,9 +10,9 @@
 // KConfigSkeleton
 #include "blurconfig.h"
 
-#include "libkwineffects/glplatform.h"
-#include "libkwineffects/rendertarget.h"
-#include "libkwineffects/renderviewport.h"
+#include "core/rendertarget.h"
+#include "core/renderviewport.h"
+#include "opengl/glplatform.h"
 #include "utils/xcbutils.h"
 #include "wayland/blur.h"
 #include "wayland/display.h"

src/plugins/blur/blur.h

@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include "libkwineffects/glutils.h"
 #include "libkwineffects/kwineffects.h"
+#include "opengl/glutils.h"
 
 #include <QList>
 

src/plugins/colorblindnesscorrection/colorblindnesscorrection.cpp

@@ -8,8 +8,8 @@
 
 #include <KSharedConfig>
 
-#include "libkwineffects/glshader.h"
 #include "libkwineffects/kwineffects.h"
+#include "opengl/glshader.h"
 
 #include "colorblindnesscorrection_settings.h"
 

src/plugins/colorblindnesscorrection/colorblindnesscorrection.h

@@ -8,8 +8,8 @@
 
 #include <unordered_set>
 
-#include "libkwineffects/glshadermanager.h"
 #include "libkwineffects/kwinoffscreeneffect.h"
+#include "opengl/glshadermanager.h"
 
 namespace KWin
 {

src/plugins/colorpicker/colorpicker.cpp

@@ -7,10 +7,10 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 #include "colorpicker.h"
-#include "libkwineffects/glutils.h"
-#include "libkwineffects/glutils_funcs.h"
-#include "libkwineffects/rendertarget.h"
-#include "libkwineffects/renderviewport.h"
+#include "core/rendertarget.h"
+#include "core/renderviewport.h"
+#include "opengl/glutils.h"
+#include "opengl/glutils_funcs.h"
 #include <KLocalizedString>
 #include <QDBusConnection>
 #include <QDBusMetaType>

src/plugins/glide/glide.cpp

@@ -16,8 +16,8 @@
 // KConfigSkeleton
 #include "glideconfig.h"
 
-#include "libkwineffects/rendertarget.h"
-#include "libkwineffects/renderviewport.h"
+#include "core/rendertarget.h"
+#include "core/renderviewport.h"
 
 // Qt
 #include <QMatrix4x4>

src/plugins/invert/invert.cpp

@@ -10,8 +10,8 @@
 
 #include "invert.h"
 
-#include "libkwineffects/glplatform.h"
-#include "libkwineffects/glutils.h"
+#include "opengl/glplatform.h"
+#include "opengl/glutils.h"
 #include <KGlobalAccel>
 #include <KLocalizedString>
 #include <QAction>

src/plugins/magnifier/magnifier.cpp

@@ -16,8 +16,8 @@
 #include <QAction>
 #include <kstandardaction.h>
 
-#include "libkwineffects/glutils.h"
-#include "libkwineffects/renderviewport.h"
+#include "core/renderviewport.h"
+#include "opengl/glutils.h"
 #include <KGlobalAccel>
 
 namespace KWin

src/plugins/mouseclick/mouseclick.cpp

@@ -11,8 +11,8 @@
 // KConfigSkeleton
 #include "mouseclickconfig.h"
 
-#include "libkwineffects/rendertarget.h"
-#include "libkwineffects/renderviewport.h"
+#include "core/rendertarget.h"
+#include "core/renderviewport.h"
 
 #include <QAction>
 

src/plugins/mouseclick/mouseclick.h

@@ -10,8 +10,8 @@
 #pragma once
 
 #include "libkwineffects/effectframe.h"
-#include "libkwineffects/glutils.h"
 #include "libkwineffects/kwineffects.h"
+#include "opengl/glutils.h"
 #include <KLocalizedString>
 #include <QFont>
 #include <QHash>

src/plugins/mousemark/mousemark.cpp

@@ -15,9 +15,9 @@
 // KConfigSkeleton
 #include "mousemarkconfig.h"
 
-#include "libkwineffects/glplatform.h"
-#include "libkwineffects/rendertarget.h"
-#include "libkwineffects/renderviewport.h"
+#include "core/rendertarget.h"
+#include "core/renderviewport.h"
+#include "opengl/glplatform.h"
 #include <KGlobalAccel>
 #include <KLocalizedString>
 #include <QAction>

src/plugins/mousemark/mousemark.h

@@ -10,8 +10,8 @@
 
 #pragma once
 
-#include "libkwineffects/glutils.h"
 #include "libkwineffects/kwineffects.h"
+#include "opengl/glutils.h"
 
 namespace KWin
 {

src/plugins/qpa/eglplatformcontext.cpp

@@ -12,8 +12,8 @@
 #include "core/outputbackend.h"
 #include "eglhelpers.h"
 #include "internalwindow.h"
-#include "libkwineffects/glutils.h"
 #include "offscreensurface.h"
+#include "opengl/glutils.h"
 #include "platformsupport/scenes/opengl/eglcontext.h"
 #include "platformsupport/scenes/opengl/egldisplay.h"
 #include "swapchain.h"

src/plugins/screencast/outputscreencastsource.cpp

@@ -10,8 +10,8 @@
 #include "compositor.h"
 #include "core/output.h"
 #include "core/renderloop.h"
-#include "libkwineffects/gltexture.h"
-#include "libkwineffects/glutils.h"
+#include "opengl/gltexture.h"
+#include "opengl/glutils.h"
 #include "scene/workspacescene.h"
 
 namespace KWin

src/plugins/screencast/regionscreencastsource.cpp

@@ -7,8 +7,8 @@
 #include "regionscreencastsource.h"
 #include "screencastutils.h"
 
-#include "libkwineffects/gltexture.h"
-#include "libkwineffects/glutils.h"
+#include "opengl/gltexture.h"
+#include "opengl/glutils.h"
 #include <compositor.h>
 #include <core/output.h>
 #include <drm_fourcc.h>

src/plugins/screencast/regionscreencastsource.h

@@ -8,8 +8,8 @@
 
 #include "screencastsource.h"
 
-#include "libkwineffects/gltexture.h"
-#include "libkwineffects/glutils.h"
+#include "opengl/gltexture.h"
+#include "opengl/glutils.h"
 #include <QImage>
 
 namespace KWin

src/plugins/screencast/screencastdmabuftexture.cpp

@@ -6,7 +6,7 @@
 
 #include "plugins/screencast/screencastdmabuftexture.h"
 #include "core/graphicsbuffer.h"
-#include "libkwineffects/glutils.h"
+#include "opengl/glutils.h"
 
 namespace KWin
 {

src/plugins/screencast/screencastmanager.cpp

@@ -11,7 +11,7 @@
 #include "core/output.h"
 #include "core/outputbackend.h"
 #include "effects.h"
-#include "libkwineffects/gltexture.h"
+#include "opengl/gltexture.h"
 #include "outputscreencastsource.h"
 #include "regionscreencastsource.h"
 #include "scene/workspacescene.h"

src/plugins/screencast/screencaststream.cpp

@@ -13,9 +13,9 @@
 #include "core/renderbackend.h"
 #include "cursor.h"
 #include "kwinscreencast_logging.h"
-#include "libkwineffects/gltexture.h"
-#include "libkwineffects/glutils.h"
 #include "main.h"
+#include "opengl/gltexture.h"
+#include "opengl/glutils.h"
 #include "pipewirecore.h"
 #include "platformsupport/scenes/opengl/abstract_egl_backend.h"
 #include "platformsupport/scenes/opengl/eglnativefence.h"

src/plugins/screencast/screencastutils.h

@@ -6,9 +6,9 @@
 
 #pragma once
 
-#include "libkwineffects/glplatform.h"
-#include "libkwineffects/gltexture.h"
-#include "libkwineffects/glutils.h"
+#include "opengl/glplatform.h"
+#include "opengl/gltexture.h"
+#include "opengl/glutils.h"
 #include <spa/buffer/buffer.h>
 #include <spa/param/video/raw.h>
 

src/plugins/screencast/windowscreencastsource.cpp

@@ -10,12 +10,12 @@
 #include "compositor.h"
 #include "core/output.h"
 #include "core/renderloop.h"
+#include "core/rendertarget.h"
+#include "core/renderviewport.h"
 #include "effects.h"
-#include "libkwineffects/gltexture.h"
-#include "libkwineffects/glutils.h"
 #include "libkwineffects/kwineffects.h"
-#include "libkwineffects/rendertarget.h"
-#include "libkwineffects/renderviewport.h"
+#include "opengl/gltexture.h"
+#include "opengl/glutils.h"
 #include "scene/itemrenderer.h"
 #include "scene/windowitem.h"
 #include "scene/workspacescene.h"

src/plugins/screenedge/screenedgeeffect.cpp

@@ -8,10 +8,10 @@
 */
 #include "screenedgeeffect.h"
 // KWin
-#include "libkwineffects/gltexture.h"
-#include "libkwineffects/glutils.h"
-#include "libkwineffects/rendertarget.h"
-#include "libkwineffects/renderviewport.h"
+#include "core/rendertarget.h"
+#include "core/renderviewport.h"
+#include "opengl/gltexture.h"
+#include "opengl/glutils.h"
 // KDE
 #include <KConfigGroup>
 #include <KSharedConfig>

src/plugins/screenshot/screenshot.cpp

@@ -12,10 +12,10 @@
 #include "screenshotdbusinterface2.h"
 
 #include "core/output.h"
-#include "libkwineffects/glplatform.h"
-#include "libkwineffects/glutils.h"
-#include "libkwineffects/rendertarget.h"
-#include "libkwineffects/renderviewport.h"
+#include "core/rendertarget.h"
+#include "core/renderviewport.h"
+#include "opengl/glplatform.h"
+#include "opengl/glutils.h"
 
 #include <QPainter>
 

src/plugins/screentransform/screentransform.cpp

@@ -8,9 +8,9 @@
 */
 // own
 #include "screentransform.h"
-#include "libkwineffects/glutils.h"
-#include "libkwineffects/rendertarget.h"
-#include "libkwineffects/renderviewport.h"
+#include "core/rendertarget.h"
+#include "core/renderviewport.h"
+#include "opengl/glutils.h"
 
 #include <QDebug>
 

src/plugins/sheet/sheet.cpp

@@ -15,7 +15,7 @@
 // KConfigSkeleton
 #include "sheetconfig.h"
 
-#include "libkwineffects/renderviewport.h"
+#include "core/renderviewport.h"
 
 // Qt
 #include <QMatrix4x4>