libkwineffects: rename kwingl* files to gl*

autotests/integration/screencasting_test.cpp

@@ -9,7 +9,7 @@
 #include "composite.h"
 #include "core/output.h"
 #include "generic_scene_opengl_test.h"
-#include "libkwineffects/kwinglplatform.h"
+#include "libkwineffects/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/kwinglplatform.cpp ../../src/libkwineffects/openglcontext.cpp)
+add_executable(kwinglplatformtest kwinglplatformtest.cpp mock_gl.cpp ../../src/libkwineffects/glplatform.cpp ../../src/libkwineffects/openglcontext.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,7 +6,7 @@
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
-#include "libkwineffects/kwinglplatform.h"
+#include "libkwineffects/glplatform.h"
 #include "mock_gl.h"
 #include <QTest>
 

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/kwinglutils.h"
+#include "libkwineffects/glutils.h"
 
 #include <QHash>
 #include <QPointer>

src/backends/drm/drm_egl_layer_surface.h

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

src/backends/virtual/virtual_egl_backend.cpp

@@ -8,7 +8,7 @@
 */
 #include "virtual_egl_backend.h"
 #include "core/gbmgraphicsbufferallocator.h"
-#include "libkwineffects/kwinglutils.h"
+#include "libkwineffects/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/kwinglutils.h"
+#include "libkwineffects/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/x11_standalone_egl_backend.cpp

@@ -11,7 +11,7 @@
 #include "core/outputlayer.h"
 #include "core/overlaywindow.h"
 #include "core/renderloop_p.h"
-#include "libkwineffects/kwinglplatform.h"
+#include "libkwineffects/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

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

src/backends/x11/standalone/x11_standalone_glx_backend.cpp

@@ -33,8 +33,8 @@
 #include "utils/xcbutils.h"
 #include "workspace.h"
 // kwin libs
-#include "libkwineffects/kwinglplatform.h"
-#include "libkwineffects/kwinglutils.h"
+#include "libkwineffects/glplatform.h"
+#include "libkwineffects/glutils.h"
 #include "libkwineffects/kwinoffscreenquickview.h"
 // Qt
 #include <QDebug>

src/backends/x11/standalone/x11_standalone_glx_backend.h

@@ -17,8 +17,8 @@
 #include <fixx11h.h>
 #include <xcb/glx.h>
 
-#include "libkwineffects/kwingltexture.h"
-#include "libkwineffects/kwingltexture_p.h"
+#include "libkwineffects/gltexture.h"
+#include "libkwineffects/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/kwinglutils.h"
+#include "libkwineffects/glutils.h"
 #include "platformsupport/scenes/opengl/abstract_egl_backend.h"
 
 namespace KWin

src/composite.cpp

@@ -39,8 +39,8 @@
 #include "x11syncmanager.h"
 #include "x11window.h"
 
-#include "libkwineffects/kwinglplatform.h"
-#include "libkwineffects/kwingltexture.h"
+#include "libkwineffects/glplatform.h"
+#include "libkwineffects/gltexture.h"
 
 #include <KCrash>
 #include <KGlobalAccel>

src/debug_console.cpp

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

src/effects.cpp

@@ -41,7 +41,7 @@
 #include "decorations/decorationbridge.h"
 #include "inputmethod.h"
 #include "inputpanelv1window.h"
-#include "libkwineffects/kwinglutils.h"
+#include "libkwineffects/glutils.h"
 #include "libkwineffects/rendertarget.h"
 #include "libkwineffects/renderviewport.h"
 #include "scene/windowitem.h"

src/libkwineffects/CMakeLists.txt

@@ -45,13 +45,13 @@ install(TARGETS kwineffects EXPORT KWinEffectsTargets ${KDE_INSTALL_TARGETS_DEFA
 set(kwin_GLUTILSLIB_SRCS
     colorspace.cpp
     glframebuffer.cpp
+    glplatform.cpp
     glshader.cpp
     glshadermanager.cpp
+    gltexture.cpp
+    glutils.cpp
+    glutils_funcs.cpp
     glvertexbuffer.cpp
-    kwinglplatform.cpp
-    kwingltexture.cpp
-    kwinglutils.cpp
-    kwinglutils_funcs.cpp
     logging.cpp
     openglcontext.cpp
     rendertarget.cpp
@@ -75,16 +75,16 @@ install(FILES
     ${CMAKE_CURRENT_BINARY_DIR}/kwinglutils_export.h
     colorspace.h
     glframebuffer.h
+    glplatform.h
     glshader.h
     glshadermanager.h
+    gltexture.h
+    glutils.h
+    glutils_funcs.h
     glvertexbuffer.h
     kwinanimationeffect.h
     kwineffects.h
     kwinglobals.h
-    kwinglplatform.h
-    kwingltexture.h
-    kwinglutils.h
-    kwinglutils_funcs.h
     kwinoffscreeneffect.h
     kwinoffscreenquickview.h
     kwinquickeffect.h

src/libkwineffects/glframebuffer.cpp

@@ -9,9 +9,9 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 #include "glframebuffer.h"
-#include "kwinglplatform.h"
-#include "kwingltexture.h"
-#include "kwinglutils.h"
+#include "glplatform.h"
+#include "gltexture.h"
+#include "glutils.h"
 #include "logging_p.h"
 #include "rendertarget.h"
 #include "renderviewport.h"

src/libkwineffects/glplatform.cpp

@@ -7,10 +7,10 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "libkwineffects/kwinglplatform.h"
+#include "libkwineffects/glplatform.h"
 // include kwinglutils_funcs.h to avoid the redeclaration issues
 // between qopengl.h and epoxy/gl.h
-#include "libkwineffects/kwinglutils_funcs.h"
+#include "libkwineffects/glutils_funcs.h"
 #include "libkwineffects/kwinxcb.h"
 #include <epoxy/gl.h>
 
@@ -504,7 +504,7 @@ static ChipClass detectQualcommClass(QByteArrayView chipClass)
 
 static ChipClass detectPanfrostClass(QByteArrayView chipClass)
 {
-// Keep the list of supported Mali chipset up to date with https://docs.mesa3d.org/drivers/panfrost.html
+    // Keep the list of supported Mali chipset up to date with https://docs.mesa3d.org/drivers/panfrost.html
     if (chipClass.contains("T720") || chipClass.contains("T760")) {
         return MaliT7XX;
     }

src/libkwineffects/glplatform.h

@@ -9,9 +9,9 @@
 
 #pragma once
 
-#include "openglcontext.h"
 #include "libkwineffects/kwinglobals.h"
 #include "libkwineffects/kwinglutils_export.h"
+#include "openglcontext.h"
 
 #include <QByteArray>
 #include <QSet>
@@ -340,7 +340,7 @@ public:
      **/
     bool isPanfrost() const;
 
-     /**
+    /**
      * @returns @c true if the GPU is a Mali GPU supported by the Lima driver (Mali 400, 450)
      * @since 5.27.1
      **/

src/libkwineffects/glshader.cpp

@@ -9,8 +9,8 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 #include "glshader.h"
-#include "kwinglplatform.h"
-#include "kwinglutils.h"
+#include "glplatform.h"
+#include "glutils.h"
 #include "logging_p.h"
 
 #include <QFile>

src/libkwineffects/glshadermanager.cpp

@@ -9,9 +9,9 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 #include "glshadermanager.h"
+#include "glplatform.h"
 #include "glshader.h"
 #include "glvertexbuffer.h"
-#include "kwinglplatform.h"
 #include "logging_p.h"
 
 #include <QFile>

src/libkwineffects/gltexture.cpp

@@ -9,12 +9,12 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "kwingltexture_p.h"
+#include "gltexture_p.h"
+#include "libkwineffects/glplatform.h"
+#include "libkwineffects/glutils.h"
+#include "libkwineffects/glutils_funcs.h"
 #include "libkwineffects/kwinconfig.h" // KWIN_HAVE_OPENGL
 #include "libkwineffects/kwineffects.h"
-#include "libkwineffects/kwinglplatform.h"
-#include "libkwineffects/kwinglutils.h"
-#include "libkwineffects/kwinglutils_funcs.h"
 #include "logging_p.h"
 
 #include <QImage>

src/libkwineffects/gltexture_p.h

@@ -11,8 +11,8 @@
 
 #pragma once
 
+#include "libkwineffects/glutils.h"
 #include "libkwineffects/kwinconfig.h" // KWIN_HAVE_OPENGL
-#include "libkwineffects/kwinglutils.h"
 #include "libkwineffects/kwinglutils_export.h"
 
 #include <QImage>

src/libkwineffects/glutils.cpp

@@ -9,9 +9,9 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "libkwineffects/kwinglutils.h"
-#include "kwinglplatform.h"
-#include "kwingltexture_p.h"
+#include "libkwineffects/glutils.h"
+#include "glplatform.h"
+#include "gltexture_p.h"
 #include "logging_p.h"
 
 namespace KWin

src/libkwineffects/glutils.h

@@ -14,10 +14,10 @@
 #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 "libkwineffects/kwingltexture.h"
 #include "libkwineffects/kwinglutils_export.h"
-#include "libkwineffects/kwinglutils_funcs.h"
 
 #include <QByteArray>
 #include <QList>

src/libkwineffects/glutils_funcs.cpp

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

src/libkwineffects/glvertexbuffer.cpp

@@ -10,11 +10,11 @@
 */
 #include "glvertexbuffer.h"
 #include "glframebuffer.h"
+#include "glplatform.h"
 #include "glshader.h"
 #include "glshadermanager.h"
+#include "glutils.h"
 #include "kwineffects.h"
-#include "kwinglplatform.h"
-#include "kwinglutils.h"
 #include "logging_p.h"
 
 #include <QVector4D>

src/libkwineffects/kwinanimationeffect.cpp

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

src/libkwineffects/kwinoffscreeneffect.cpp

@@ -5,8 +5,8 @@
 */
 
 #include "libkwineffects/kwinoffscreeneffect.h"
-#include "libkwineffects/kwingltexture.h"
-#include "libkwineffects/kwinglutils.h"
+#include "libkwineffects/gltexture.h"
+#include "libkwineffects/glutils.h"
 #include "libkwineffects/rendertarget.h"
 #include "libkwineffects/renderviewport.h"
 

src/libkwineffects/kwinoffscreenquickview.cpp

@@ -9,7 +9,7 @@
 
 #include "libkwineffects/kwinoffscreenquickview.h"
 
-#include "libkwineffects/kwinglutils.h"
+#include "libkwineffects/glutils.h"
 #include "logging_p.h"
 
 #include <QGuiApplication>

src/libkwineffects/rendertarget.cpp

@@ -5,7 +5,7 @@
 */
 
 #include "libkwineffects/rendertarget.h"
-#include "libkwineffects/kwinglutils.h"
+#include "libkwineffects/glutils.h"
 
 namespace KWin
 {

src/main.cpp

@@ -21,8 +21,8 @@
 #include "effects.h"
 #include "input.h"
 #include "inputmethod.h"
-#include "libkwineffects/kwingltexture.h"
-#include "libkwineffects/kwinglutils.h"
+#include "libkwineffects/gltexture.h"
+#include "libkwineffects/glutils.h"
 #include "libkwineffects/rendertarget.h"
 #include "options.h"
 #include "outline.h"

src/options.cpp

@@ -19,7 +19,7 @@
 
 #include <QProcess>
 
-#include "libkwineffects/kwinglplatform.h"
+#include "libkwineffects/glplatform.h"
 #include "settings.h"
 #include "workspace.h"
 #include <QOpenGLContext>

src/platformsupport/scenes/opengl/abstract_egl_backend.cpp

@@ -16,8 +16,8 @@
 #include "wayland_server.h"
 // kwin libs
 #include "kwineglimagetexture.h"
-#include "libkwineffects/kwinglplatform.h"
-#include "libkwineffects/kwinglutils.h"
+#include "libkwineffects/glplatform.h"
+#include "libkwineffects/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/kwingltexture.h"
+#include "libkwineffects/gltexture.h"
 #include "platformsupport/scenes/opengl/abstract_egl_backend.h"
 #include "utils/common.h"
 

src/platformsupport/scenes/opengl/eglcontext.cpp

@@ -9,9 +9,9 @@
 #include "eglcontext.h"
 #include "core/graphicsbuffer.h"
 #include "egldisplay.h"
+#include "glutils.h"
 #include "kwineglimagetexture.h"
 #include "kwineglutils_p.h"
-#include "kwinglutils.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 "gltexture.h"
 #include "kwin_export.h"
-#include "kwingltexture.h"
 #include "openglcontext.h"
 
 #include <QByteArray>

src/platformsupport/scenes/opengl/egldisplay.cpp

@@ -10,7 +10,7 @@
 #include "core/graphicsbuffer.h"
 #include "kwineglimagetexture.h"
 #include "kwineglutils_p.h"
-#include "libkwineffects/kwinglutils.h"
+#include "libkwineffects/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/kwinglutils.h"
+#include "libkwineffects/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/kwinglplatform.h"
+#include "libkwineffects/glplatform.h"
 
 namespace KWin
 {

src/platformsupport/scenes/opengl/kwineglimagetexture.cpp

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

src/platformsupport/scenes/opengl/kwineglimagetexture.h

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

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/kwinglutils_funcs.h"
+#include "libkwineffects/glutils_funcs.h"
 
 #include "utils/common.h"
 

src/platformsupport/scenes/opengl/openglsurfacetexture.cpp

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

src/plugins/backgroundcontrast/contrast.h

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

src/plugins/backgroundcontrast/contrastshader.cpp

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

src/plugins/backgroundcontrast/contrastshader.h

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

src/plugins/blendchanges/blendchanges.cpp

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

src/plugins/blur/blur.cpp

@@ -10,7 +10,7 @@
 // KConfigSkeleton
 #include "blurconfig.h"
 
-#include "libkwineffects/kwinglplatform.h"
+#include "libkwineffects/glplatform.h"
 #include "libkwineffects/rendertarget.h"
 #include "libkwineffects/renderviewport.h"
 #include "utils/xcbutils.h"

src/plugins/blur/blur.h

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

src/plugins/colorpicker/colorpicker.cpp

@@ -7,8 +7,8 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 #include "colorpicker.h"
-#include "libkwineffects/kwinglutils.h"
-#include "libkwineffects/kwinglutils_funcs.h"
+#include "libkwineffects/glutils.h"
+#include "libkwineffects/glutils_funcs.h"
 #include "libkwineffects/rendertarget.h"
 #include "libkwineffects/renderviewport.h"
 #include <KLocalizedString>

src/plugins/invert/invert.cpp

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

src/plugins/magnifier/magnifier.cpp

@@ -17,7 +17,7 @@
 #include <QAction>
 #include <kstandardaction.h>
 
-#include "libkwineffects/kwinglutils.h"
+#include "libkwineffects/glutils.h"
 #include "libkwineffects/renderviewport.h"
 #include <KGlobalAccel>
 

src/plugins/mouseclick/mouseclick.h

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

src/plugins/mousemark/mousemark.cpp

@@ -15,8 +15,8 @@
 // KConfigSkeleton
 #include "mousemarkconfig.h"
 
+#include "libkwineffects/glplatform.h"
 #include "libkwineffects/kwinconfig.h"
-#include "libkwineffects/kwinglplatform.h"
 #include "libkwineffects/rendertarget.h"
 #include "libkwineffects/renderviewport.h"
 #include <KGlobalAccel>

src/plugins/mousemark/mousemark.h

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

src/plugins/qpa/eglplatformcontext.cpp

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

src/plugins/screencast/outputscreencastsource.cpp

@@ -10,8 +10,8 @@
 #include "composite.h"
 #include "core/output.h"
 #include "core/renderloop.h"
-#include "libkwineffects/kwingltexture.h"
-#include "libkwineffects/kwinglutils.h"
+#include "libkwineffects/gltexture.h"
+#include "libkwineffects/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/kwingltexture.h"
-#include "libkwineffects/kwinglutils.h"
+#include "libkwineffects/gltexture.h"
+#include "libkwineffects/glutils.h"
 #include <composite.h>
 #include <core/output.h>
 #include <drm_fourcc.h>

src/plugins/screencast/regionscreencastsource.h

@@ -8,8 +8,8 @@
 
 #include "screencastsource.h"
 
-#include "libkwineffects/kwingltexture.h"
-#include "libkwineffects/kwinglutils.h"
+#include "libkwineffects/gltexture.h"
+#include "libkwineffects/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/kwinglutils.h"
+#include "libkwineffects/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/kwingltexture.h"
+#include "libkwineffects/gltexture.h"
 #include "outputscreencastsource.h"
 #include "regionscreencastsource.h"
 #include "scene/workspacescene.h"

src/plugins/screencast/screencaststream.cpp

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

src/plugins/screencast/screencastutils.h

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

src/plugins/screencast/windowscreencastsource.cpp

@@ -11,9 +11,9 @@
 #include "core/output.h"
 #include "core/renderloop.h"
 #include "effects.h"
+#include "libkwineffects/gltexture.h"
+#include "libkwineffects/glutils.h"
 #include "libkwineffects/kwineffects.h"
-#include "libkwineffects/kwingltexture.h"
-#include "libkwineffects/kwinglutils.h"
 #include "libkwineffects/rendertarget.h"
 #include "libkwineffects/renderviewport.h"
 #include "scene/itemrenderer.h"

src/plugins/screenedge/screenedgeeffect.cpp

@@ -8,8 +8,8 @@
 */
 #include "screenedgeeffect.h"
 // KWin
-#include "libkwineffects/kwingltexture.h"
-#include "libkwineffects/kwinglutils.h"
+#include "libkwineffects/gltexture.h"
+#include "libkwineffects/glutils.h"
 #include "libkwineffects/rendertarget.h"
 #include "libkwineffects/renderviewport.h"
 // KDE

src/plugins/screenshot/screenshot.cpp

@@ -11,8 +11,8 @@
 #include "screenshot.h"
 #include "screenshotdbusinterface2.h"
 
-#include "libkwineffects/kwinglplatform.h"
-#include "libkwineffects/kwinglutils.h"
+#include "libkwineffects/glplatform.h"
+#include "libkwineffects/glutils.h"
 #include "libkwineffects/rendertarget.h"
 #include "libkwineffects/renderviewport.h"
 

src/plugins/screentransform/screentransform.cpp

@@ -8,7 +8,7 @@
 */
 // own
 #include "screentransform.h"
-#include "libkwineffects/kwinglutils.h"
+#include "libkwineffects/glutils.h"
 #include "libkwineffects/rendertarget.h"
 #include "libkwineffects/renderviewport.h"
 

src/plugins/showpaint/showpaint.cpp

@@ -10,7 +10,7 @@
 
 #include "showpaint.h"
 
-#include "libkwineffects/kwinglutils.h"
+#include "libkwineffects/glutils.h"
 #include "libkwineffects/renderviewport.h"
 
 #include <KGlobalAccel>

src/plugins/snaphelper/snaphelper.cpp

@@ -10,7 +10,7 @@
 
 #include "snaphelper.h"
 
-#include "libkwineffects/kwinglutils.h"
+#include "libkwineffects/glutils.h"
 #include "libkwineffects/rendertarget.h"
 #include "libkwineffects/renderviewport.h"
 

src/plugins/startupfeedback/startupfeedback.cpp

@@ -24,7 +24,7 @@
 #include <KSharedConfig>
 #include <KWindowSystem>
 // KWin
-#include "libkwineffects/kwinglutils.h"
+#include "libkwineffects/glutils.h"
 #include "libkwineffects/rendertarget.h"
 #include "libkwineffects/renderviewport.h"
 

src/plugins/touchpoints/touchpoints.cpp

@@ -10,7 +10,7 @@
 
 #include "touchpoints.h"
 
-#include "libkwineffects/kwinglutils.h"
+#include "libkwineffects/glutils.h"
 #include "libkwineffects/rendertarget.h"
 #include "libkwineffects/renderviewport.h"
 #include <QAction>

src/plugins/trackmouse/trackmouse.cpp

@@ -19,8 +19,8 @@
 #include <QPainter>
 #include <QTime>
 
+#include "libkwineffects/glutils.h"
 #include "libkwineffects/kwinconfig.h"
-#include "libkwineffects/kwinglutils.h"
 #include "libkwineffects/rendertarget.h"
 #include "libkwineffects/renderviewport.h"
 

src/plugins/zoom/zoom.cpp

@@ -24,7 +24,7 @@
 #include <QVector2D>
 #include <kstandardaction.h>
 
-#include "libkwineffects/kwinglutils.h"
+#include "libkwineffects/glutils.h"
 #include "libkwineffects/rendertarget.h"
 #include "libkwineffects/renderviewport.h"
 

src/scene/cursordelegate_opengl.cpp

@@ -9,8 +9,8 @@
 #include "core/output.h"
 #include "core/renderlayer.h"
 #include "cursor.h"
-#include "libkwineffects/kwingltexture.h"
-#include "libkwineffects/kwinglutils.h"
+#include "libkwineffects/gltexture.h"
+#include "libkwineffects/glutils.h"
 #include "libkwineffects/rendertarget.h"
 #include "libkwineffects/renderviewport.h"
 #include "scene/cursorscene.h"

src/scene/imageitem.cpp

@@ -6,7 +6,7 @@
 
 #include "scene/imageitem.h"
 
-#include "libkwineffects/kwingltexture.h"
+#include "libkwineffects/gltexture.h"
 
 namespace KWin
 {

src/scene/itemrenderer_opengl.h

@@ -6,8 +6,8 @@
 
 #pragma once
 
+#include "libkwineffects/glutils.h"
 #include "libkwineffects/kwineffects.h"
-#include "libkwineffects/kwinglutils.h"
 #include "scene/itemrenderer.h"
 
 namespace KWin

src/scene/workspacescene_opengl.cpp

@@ -13,7 +13,7 @@
 */
 #include "workspacescene_opengl.h"
 
-#include "libkwineffects/kwinglplatform.h"
+#include "libkwineffects/glplatform.h"
 
 #include "composite.h"
 #include "core/output.h"

src/scene/workspacescene_opengl.h

@@ -16,7 +16,7 @@
 #include "scene/shadowitem.h"
 #include "scene/workspacescene.h"
 
-#include "libkwineffects/kwinglutils.h"
+#include "libkwineffects/glutils.h"
 
 namespace KWin
 {

src/scripting/scriptedeffect.cpp

@@ -17,7 +17,7 @@
 #include "screenedge.h"
 #include "workspace.h"
 // KDE
-#include "libkwineffects/kwinglutils.h"
+#include "libkwineffects/glutils.h"
 #include <KConfigGroup>
 #include <KGlobalAccel>
 #include <KPluginMetaData>

src/scripting/windowthumbnailitem.cpp

@@ -20,8 +20,8 @@
 #include "window.h"
 #include "workspace.h"
 
-#include "libkwineffects/kwingltexture.h"
-#include "libkwineffects/kwinglutils.h"
+#include "libkwineffects/gltexture.h"
+#include "libkwineffects/glutils.h"
 
 #include <QQuickWindow>
 #include <QRunnable>

src/workspace.cpp

@@ -12,7 +12,7 @@
 // own
 #include "workspace.h"
 // kwin libs
-#include "libkwineffects/kwinglplatform.h"
+#include "libkwineffects/glplatform.h"
 // kwin
 #include "core/output.h"
 #if KWIN_BUILD_ACTIVITIES

src/x11syncmanager.cpp

@@ -14,7 +14,7 @@
 #include "scene/workspacescene.h"
 #include "utils/common.h"
 
-#include "libkwineffects/kwinglplatform.h"
+#include "libkwineffects/glplatform.h"
 
 namespace KWin
 {

src/x11syncmanager.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwinglutils.h"
+#include "libkwineffects/glutils.h"
 
 #include <xcb/sync.h>
 #include <xcb/xcb.h>