From 27f90476b4d744b4a4c4545f7ac4f24445d11539 Mon Sep 17 00:00:00 2001 From: Xaver Hugl Date: Wed, 6 Sep 2023 23:42:11 +0200 Subject: [PATCH] libkwineffects: rename kwingl* files to gl* --- autotests/integration/screencasting_test.cpp | 2 +- autotests/libkwineffects/CMakeLists.txt | 2 +- autotests/libkwineffects/kwinglplatformtest.cpp | 2 +- src/backends/drm/drm_egl_backend.h | 2 +- src/backends/drm/drm_egl_layer_surface.h | 2 +- src/backends/virtual/virtual_egl_backend.cpp | 2 +- src/backends/wayland/wayland_egl_backend.cpp | 2 +- .../standalone/x11_standalone_egl_backend.cpp | 2 +- .../x11/standalone/x11_standalone_egl_backend.h | 4 ++-- .../standalone/x11_standalone_glx_backend.cpp | 4 ++-- .../x11/standalone/x11_standalone_glx_backend.h | 4 ++-- .../x11/windowed/x11_windowed_egl_backend.h | 2 +- src/composite.cpp | 4 ++-- src/debug_console.cpp | 4 ++-- src/effects.cpp | 2 +- src/libkwineffects/CMakeLists.txt | 16 ++++++++-------- src/libkwineffects/glframebuffer.cpp | 6 +++--- .../{kwinglplatform.cpp => glplatform.cpp} | 6 +++--- .../{kwinglplatform.h => glplatform.h} | 4 ++-- src/libkwineffects/glshader.cpp | 4 ++-- src/libkwineffects/glshadermanager.cpp | 2 +- .../{kwingltexture.cpp => gltexture.cpp} | 8 ++++---- .../{kwingltexture.h => gltexture.h} | 0 .../{kwingltexture_p.h => gltexture_p.h} | 2 +- .../{kwinglutils.cpp => glutils.cpp} | 6 +++--- src/libkwineffects/{kwinglutils.h => glutils.h} | 4 ++-- .../{kwinglutils_funcs.cpp => glutils_funcs.cpp} | 4 ++-- .../{kwinglutils_funcs.h => glutils_funcs.h} | 0 src/libkwineffects/glvertexbuffer.cpp | 4 ++-- src/libkwineffects/kwinanimationeffect.cpp | 2 +- src/libkwineffects/kwinoffscreeneffect.cpp | 4 ++-- src/libkwineffects/kwinoffscreenquickview.cpp | 2 +- src/libkwineffects/rendertarget.cpp | 2 +- src/main.cpp | 4 ++-- src/options.cpp | 2 +- .../scenes/opengl/abstract_egl_backend.cpp | 4 ++-- .../opengl/basiceglsurfacetexture_wayland.cpp | 2 +- src/platformsupport/scenes/opengl/eglcontext.cpp | 2 +- src/platformsupport/scenes/opengl/eglcontext.h | 2 +- src/platformsupport/scenes/opengl/egldisplay.cpp | 2 +- .../scenes/opengl/eglswapchain.cpp | 2 +- .../scenes/opengl/glrendertimequery.cpp | 2 +- .../scenes/opengl/kwineglimagetexture.cpp | 2 +- .../scenes/opengl/kwineglimagetexture.h | 2 +- .../scenes/opengl/openglbackend.cpp | 2 +- .../scenes/opengl/openglsurfacetexture.cpp | 2 +- src/plugins/backgroundcontrast/contrast.h | 4 ++-- .../backgroundcontrast/contrastshader.cpp | 2 +- src/plugins/backgroundcontrast/contrastshader.h | 2 +- src/plugins/blendchanges/blendchanges.cpp | 2 +- src/plugins/blur/blur.cpp | 2 +- src/plugins/blur/blur.h | 2 +- src/plugins/colorpicker/colorpicker.cpp | 4 ++-- src/plugins/invert/invert.cpp | 4 ++-- src/plugins/magnifier/magnifier.cpp | 2 +- src/plugins/mouseclick/mouseclick.h | 2 +- src/plugins/mousemark/mousemark.cpp | 2 +- src/plugins/mousemark/mousemark.h | 2 +- src/plugins/qpa/eglplatformcontext.cpp | 2 +- .../screencast/outputscreencastsource.cpp | 4 ++-- .../screencast/regionscreencastsource.cpp | 4 ++-- src/plugins/screencast/regionscreencastsource.h | 4 ++-- .../screencast/screencastdmabuftexture.cpp | 2 +- src/plugins/screencast/screencastmanager.cpp | 2 +- src/plugins/screencast/screencaststream.cpp | 4 ++-- src/plugins/screencast/screencastutils.h | 6 +++--- .../screencast/windowscreencastsource.cpp | 4 ++-- src/plugins/screenedge/screenedgeeffect.cpp | 4 ++-- src/plugins/screenshot/screenshot.cpp | 4 ++-- src/plugins/screentransform/screentransform.cpp | 2 +- src/plugins/showpaint/showpaint.cpp | 2 +- src/plugins/snaphelper/snaphelper.cpp | 2 +- src/plugins/startupfeedback/startupfeedback.cpp | 2 +- src/plugins/touchpoints/touchpoints.cpp | 2 +- src/plugins/trackmouse/trackmouse.cpp | 2 +- src/plugins/zoom/zoom.cpp | 2 +- src/scene/cursordelegate_opengl.cpp | 4 ++-- src/scene/imageitem.cpp | 2 +- src/scene/itemrenderer_opengl.h | 2 +- src/scene/workspacescene_opengl.cpp | 2 +- src/scene/workspacescene_opengl.h | 2 +- src/scripting/scriptedeffect.cpp | 2 +- src/scripting/windowthumbnailitem.cpp | 4 ++-- src/workspace.cpp | 2 +- src/x11syncmanager.cpp | 2 +- src/x11syncmanager.h | 2 +- 86 files changed, 127 insertions(+), 127 deletions(-) rename src/libkwineffects/{kwinglplatform.cpp => glplatform.cpp} (99%) rename src/libkwineffects/{kwinglplatform.h => glplatform.h} (99%) rename src/libkwineffects/{kwingltexture.cpp => gltexture.cpp} (99%) rename src/libkwineffects/{kwingltexture.h => gltexture.h} (100%) rename src/libkwineffects/{kwingltexture_p.h => gltexture_p.h} (97%) rename src/libkwineffects/{kwinglutils.cpp => glutils.cpp} (98%) rename src/libkwineffects/{kwinglutils.h => glutils.h} (94%) rename src/libkwineffects/{kwinglutils_funcs.cpp => glutils_funcs.cpp} (97%) rename src/libkwineffects/{kwinglutils_funcs.h => glutils_funcs.h} (100%) diff --git a/autotests/integration/screencasting_test.cpp b/autotests/integration/screencasting_test.cpp index fae65b9ad7..429e10f5e5 100644 --- a/autotests/integration/screencasting_test.cpp +++ b/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" diff --git a/autotests/libkwineffects/CMakeLists.txt b/autotests/libkwineffects/CMakeLists.txt index bbf2fad948..e91ef57923 100644 --- a/autotests/libkwineffects/CMakeLists.txt +++ b/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) diff --git a/autotests/libkwineffects/kwinglplatformtest.cpp b/autotests/libkwineffects/kwinglplatformtest.cpp index 98bf006512..7c295ac761 100644 --- a/autotests/libkwineffects/kwinglplatformtest.cpp +++ b/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 diff --git a/src/backends/drm/drm_egl_backend.h b/src/backends/drm/drm_egl_backend.h index de5b7dd39d..5dacb929ea 100644 --- a/src/backends/drm/drm_egl_backend.h +++ b/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 #include diff --git a/src/backends/drm/drm_egl_layer_surface.h b/src/backends/drm/drm_egl_layer_surface.h index 7b96fe3ede..61d2048e0e 100644 --- a/src/backends/drm/drm_egl_layer_surface.h +++ b/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; diff --git a/src/backends/virtual/virtual_egl_backend.cpp b/src/backends/virtual/virtual_egl_backend.cpp index a1ff7c9116..88ce395cf2 100644 --- a/src/backends/virtual/virtual_egl_backend.cpp +++ b/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" diff --git a/src/backends/wayland/wayland_egl_backend.cpp b/src/backends/wayland/wayland_egl_backend.cpp index d8c70aa835..c6d0db3897 100644 --- a/src/backends/wayland/wayland_egl_backend.cpp +++ b/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" diff --git a/src/backends/x11/standalone/x11_standalone_egl_backend.cpp b/src/backends/x11/standalone/x11_standalone_egl_backend.cpp index ede8a2d13e..1c33cce931 100644 --- a/src/backends/x11/standalone/x11_standalone_egl_backend.cpp +++ b/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" diff --git a/src/backends/x11/standalone/x11_standalone_egl_backend.h b/src/backends/x11/standalone/x11_standalone_egl_backend.h index f95d5a2cb8..57708f77e2 100644 --- a/src/backends/x11/standalone/x11_standalone_egl_backend.h +++ b/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; diff --git a/src/backends/x11/standalone/x11_standalone_glx_backend.cpp b/src/backends/x11/standalone/x11_standalone_glx_backend.cpp index 6ec1e72ec2..dbc778aeec 100644 --- a/src/backends/x11/standalone/x11_standalone_glx_backend.cpp +++ b/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 diff --git a/src/backends/x11/standalone/x11_standalone_glx_backend.h b/src/backends/x11/standalone/x11_standalone_glx_backend.h index 3558d51e57..b8a58e7c77 100644 --- a/src/backends/x11/standalone/x11_standalone_glx_backend.h +++ b/src/backends/x11/standalone/x11_standalone_glx_backend.h @@ -17,8 +17,8 @@ #include #include -#include "libkwineffects/kwingltexture.h" -#include "libkwineffects/kwingltexture_p.h" +#include "libkwineffects/gltexture.h" +#include "libkwineffects/gltexture_p.h" #include #include diff --git a/src/backends/x11/windowed/x11_windowed_egl_backend.h b/src/backends/x11/windowed/x11_windowed_egl_backend.h index 347838efdc..e0e7da2b5d 100644 --- a/src/backends/x11/windowed/x11_windowed_egl_backend.h +++ b/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 diff --git a/src/composite.cpp b/src/composite.cpp index 46ca0060e0..ac781c6405 100644 --- a/src/composite.cpp +++ b/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 #include diff --git a/src/debug_console.cpp b/src/debug_console.cpp index d472b54902..27c7cefafa 100644 --- a/src/debug_console.cpp +++ b/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" diff --git a/src/effects.cpp b/src/effects.cpp index 085b2294a8..13a0ee2e6f 100644 --- a/src/effects.cpp +++ b/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" diff --git a/src/libkwineffects/CMakeLists.txt b/src/libkwineffects/CMakeLists.txt index 3a5443e88a..4bac5f8308 100644 --- a/src/libkwineffects/CMakeLists.txt +++ b/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 diff --git a/src/libkwineffects/glframebuffer.cpp b/src/libkwineffects/glframebuffer.cpp index c683d41dcb..4a4ab6461b 100644 --- a/src/libkwineffects/glframebuffer.cpp +++ b/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" diff --git a/src/libkwineffects/kwinglplatform.cpp b/src/libkwineffects/glplatform.cpp similarity index 99% rename from src/libkwineffects/kwinglplatform.cpp rename to src/libkwineffects/glplatform.cpp index 16766dbdf9..4432856c97 100644 --- a/src/libkwineffects/kwinglplatform.cpp +++ b/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 @@ -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; } diff --git a/src/libkwineffects/kwinglplatform.h b/src/libkwineffects/glplatform.h similarity index 99% rename from src/libkwineffects/kwinglplatform.h rename to src/libkwineffects/glplatform.h index da0430d83c..ee16d459e7 100644 --- a/src/libkwineffects/kwinglplatform.h +++ b/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 #include @@ -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 **/ diff --git a/src/libkwineffects/glshader.cpp b/src/libkwineffects/glshader.cpp index cbea2d078f..c517200e6d 100644 --- a/src/libkwineffects/glshader.cpp +++ b/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 diff --git a/src/libkwineffects/glshadermanager.cpp b/src/libkwineffects/glshadermanager.cpp index acf20436f6..d249a7f34d 100644 --- a/src/libkwineffects/glshadermanager.cpp +++ b/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 diff --git a/src/libkwineffects/kwingltexture.cpp b/src/libkwineffects/gltexture.cpp similarity index 99% rename from src/libkwineffects/kwingltexture.cpp rename to src/libkwineffects/gltexture.cpp index 5c832abb4c..c3fd4686c1 100644 --- a/src/libkwineffects/kwingltexture.cpp +++ b/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 diff --git a/src/libkwineffects/kwingltexture.h b/src/libkwineffects/gltexture.h similarity index 100% rename from src/libkwineffects/kwingltexture.h rename to src/libkwineffects/gltexture.h diff --git a/src/libkwineffects/kwingltexture_p.h b/src/libkwineffects/gltexture_p.h similarity index 97% rename from src/libkwineffects/kwingltexture_p.h rename to src/libkwineffects/gltexture_p.h index 1dcc8ac5ed..9c89bb1a38 100644 --- a/src/libkwineffects/kwingltexture_p.h +++ b/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 diff --git a/src/libkwineffects/kwinglutils.cpp b/src/libkwineffects/glutils.cpp similarity index 98% rename from src/libkwineffects/kwinglutils.cpp rename to src/libkwineffects/glutils.cpp index 3c40806eb8..f7dc464bbf 100644 --- a/src/libkwineffects/kwinglutils.cpp +++ b/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 diff --git a/src/libkwineffects/kwinglutils.h b/src/libkwineffects/glutils.h similarity index 94% rename from src/libkwineffects/kwinglutils.h rename to src/libkwineffects/glutils.h index c3a17c3771..ae00e968d4 100644 --- a/src/libkwineffects/kwinglutils.h +++ b/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 #include diff --git a/src/libkwineffects/kwinglutils_funcs.cpp b/src/libkwineffects/glutils_funcs.cpp similarity index 97% rename from src/libkwineffects/kwinglutils_funcs.cpp rename to src/libkwineffects/glutils_funcs.cpp index 5d5cdda5be..7226390a2a 100644 --- a/src/libkwineffects/kwinglutils_funcs.cpp +++ b/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 diff --git a/src/libkwineffects/kwinglutils_funcs.h b/src/libkwineffects/glutils_funcs.h similarity index 100% rename from src/libkwineffects/kwinglutils_funcs.h rename to src/libkwineffects/glutils_funcs.h diff --git a/src/libkwineffects/glvertexbuffer.cpp b/src/libkwineffects/glvertexbuffer.cpp index b2c6a35f1d..558b4e7634 100644 --- a/src/libkwineffects/glvertexbuffer.cpp +++ b/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 diff --git a/src/libkwineffects/kwinanimationeffect.cpp b/src/libkwineffects/kwinanimationeffect.cpp index 658bc08006..517447df3b 100644 --- a/src/libkwineffects/kwinanimationeffect.cpp +++ b/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 #include diff --git a/src/libkwineffects/kwinoffscreeneffect.cpp b/src/libkwineffects/kwinoffscreeneffect.cpp index 81204edb43..8444ad08a0 100644 --- a/src/libkwineffects/kwinoffscreeneffect.cpp +++ b/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" diff --git a/src/libkwineffects/kwinoffscreenquickview.cpp b/src/libkwineffects/kwinoffscreenquickview.cpp index ed5942bbfb..47f6f04551 100644 --- a/src/libkwineffects/kwinoffscreenquickview.cpp +++ b/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 diff --git a/src/libkwineffects/rendertarget.cpp b/src/libkwineffects/rendertarget.cpp index 8bd8147309..ed45af69f4 100644 --- a/src/libkwineffects/rendertarget.cpp +++ b/src/libkwineffects/rendertarget.cpp @@ -5,7 +5,7 @@ */ #include "libkwineffects/rendertarget.h" -#include "libkwineffects/kwinglutils.h" +#include "libkwineffects/glutils.h" namespace KWin { diff --git a/src/main.cpp b/src/main.cpp index b0fb2fff23..72ec09f057 100644 --- a/src/main.cpp +++ b/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" diff --git a/src/options.cpp b/src/options.cpp index 3fd905c80e..897a7ddc76 100644 --- a/src/options.cpp +++ b/src/options.cpp @@ -19,7 +19,7 @@ #include -#include "libkwineffects/kwinglplatform.h" +#include "libkwineffects/glplatform.h" #include "settings.h" #include "workspace.h" #include diff --git a/src/platformsupport/scenes/opengl/abstract_egl_backend.cpp b/src/platformsupport/scenes/opengl/abstract_egl_backend.cpp index 899373b79f..09b574933d 100644 --- a/src/platformsupport/scenes/opengl/abstract_egl_backend.cpp +++ b/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 // Qt diff --git a/src/platformsupport/scenes/opengl/basiceglsurfacetexture_wayland.cpp b/src/platformsupport/scenes/opengl/basiceglsurfacetexture_wayland.cpp index 6b0d63214d..548d1523d9 100644 --- a/src/platformsupport/scenes/opengl/basiceglsurfacetexture_wayland.cpp +++ b/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" diff --git a/src/platformsupport/scenes/opengl/eglcontext.cpp b/src/platformsupport/scenes/opengl/eglcontext.cpp index 49446ea60a..dc182715b1 100644 --- a/src/platformsupport/scenes/opengl/eglcontext.cpp +++ b/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" diff --git a/src/platformsupport/scenes/opengl/eglcontext.h b/src/platformsupport/scenes/opengl/eglcontext.h index 50b9b36d63..38eba711a4 100644 --- a/src/platformsupport/scenes/opengl/eglcontext.h +++ b/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 diff --git a/src/platformsupport/scenes/opengl/egldisplay.cpp b/src/platformsupport/scenes/opengl/egldisplay.cpp index 9b7bf314db..94e2caaed3 100644 --- a/src/platformsupport/scenes/opengl/egldisplay.cpp +++ b/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 diff --git a/src/platformsupport/scenes/opengl/eglswapchain.cpp b/src/platformsupport/scenes/opengl/eglswapchain.cpp index 1d9c98e86a..1f1d499a2e 100644 --- a/src/platformsupport/scenes/opengl/eglswapchain.cpp +++ b/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" diff --git a/src/platformsupport/scenes/opengl/glrendertimequery.cpp b/src/platformsupport/scenes/opengl/glrendertimequery.cpp index 4f3c3a04e2..13c9f58ea6 100644 --- a/src/platformsupport/scenes/opengl/glrendertimequery.cpp +++ b/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 { diff --git a/src/platformsupport/scenes/opengl/kwineglimagetexture.cpp b/src/platformsupport/scenes/opengl/kwineglimagetexture.cpp index 27cae539d9..cf43696fcf 100644 --- a/src/platformsupport/scenes/opengl/kwineglimagetexture.cpp +++ b/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 #include diff --git a/src/platformsupport/scenes/opengl/kwineglimagetexture.h b/src/platformsupport/scenes/opengl/kwineglimagetexture.h index 74fc8b6088..5c63435d13 100644 --- a/src/platformsupport/scenes/opengl/kwineglimagetexture.h +++ b/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; diff --git a/src/platformsupport/scenes/opengl/openglbackend.cpp b/src/platformsupport/scenes/opengl/openglbackend.cpp index 55f4d6d2db..ed3617d40f 100644 --- a/src/platformsupport/scenes/opengl/openglbackend.cpp +++ b/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" diff --git a/src/platformsupport/scenes/opengl/openglsurfacetexture.cpp b/src/platformsupport/scenes/opengl/openglsurfacetexture.cpp index 2d0fec804f..73944a920c 100644 --- a/src/platformsupport/scenes/opengl/openglsurfacetexture.cpp +++ b/src/platformsupport/scenes/opengl/openglsurfacetexture.cpp @@ -5,7 +5,7 @@ */ #include "openglsurfacetexture.h" -#include "libkwineffects/kwingltexture.h" +#include "libkwineffects/gltexture.h" namespace KWin { diff --git a/src/plugins/backgroundcontrast/contrast.h b/src/plugins/backgroundcontrast/contrast.h index cdce32e017..0299bba34a 100644 --- a/src/plugins/backgroundcontrast/contrast.h +++ b/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 #include diff --git a/src/plugins/backgroundcontrast/contrastshader.cpp b/src/plugins/backgroundcontrast/contrastshader.cpp index 9c6ca8ed5a..1aaa3a3323 100644 --- a/src/plugins/backgroundcontrast/contrastshader.cpp +++ b/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 #include diff --git a/src/plugins/backgroundcontrast/contrastshader.h b/src/plugins/backgroundcontrast/contrastshader.h index 491d7f1921..f75f3ab8c5 100644 --- a/src/plugins/backgroundcontrast/contrastshader.h +++ b/src/plugins/backgroundcontrast/contrastshader.h @@ -7,7 +7,7 @@ #pragma once -#include "libkwineffects/kwinglutils.h" +#include "libkwineffects/glutils.h" class QMatrix4x4; diff --git a/src/plugins/blendchanges/blendchanges.cpp b/src/plugins/blendchanges/blendchanges.cpp index 16a4364428..0feb515d34 100644 --- a/src/plugins/blendchanges/blendchanges.cpp +++ b/src/plugins/blendchanges/blendchanges.cpp @@ -8,7 +8,7 @@ */ // own #include "blendchanges.h" -#include "libkwineffects/kwinglutils.h" +#include "libkwineffects/glutils.h" #include #include diff --git a/src/plugins/blur/blur.cpp b/src/plugins/blur/blur.cpp index cb97410deb..4a1554be84 100644 --- a/src/plugins/blur/blur.cpp +++ b/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" diff --git a/src/plugins/blur/blur.h b/src/plugins/blur/blur.h index 74290363c6..99ae653cde 100644 --- a/src/plugins/blur/blur.h +++ b/src/plugins/blur/blur.h @@ -7,8 +7,8 @@ #pragma once +#include "libkwineffects/glutils.h" #include "libkwineffects/kwineffects.h" -#include "libkwineffects/kwinglutils.h" #include diff --git a/src/plugins/colorpicker/colorpicker.cpp b/src/plugins/colorpicker/colorpicker.cpp index c7118dfb76..90be531842 100644 --- a/src/plugins/colorpicker/colorpicker.cpp +++ b/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 diff --git a/src/plugins/invert/invert.cpp b/src/plugins/invert/invert.cpp index a82ea97d39..7b1aa335af 100644 --- a/src/plugins/invert/invert.cpp +++ b/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 #include #include diff --git a/src/plugins/magnifier/magnifier.cpp b/src/plugins/magnifier/magnifier.cpp index 80a8a073a6..798a4167dc 100644 --- a/src/plugins/magnifier/magnifier.cpp +++ b/src/plugins/magnifier/magnifier.cpp @@ -17,7 +17,7 @@ #include #include -#include "libkwineffects/kwinglutils.h" +#include "libkwineffects/glutils.h" #include "libkwineffects/renderviewport.h" #include diff --git a/src/plugins/mouseclick/mouseclick.h b/src/plugins/mouseclick/mouseclick.h index 6b0fd02ef8..2bede5038d 100644 --- a/src/plugins/mouseclick/mouseclick.h +++ b/src/plugins/mouseclick/mouseclick.h @@ -9,8 +9,8 @@ #pragma once +#include "libkwineffects/glutils.h" #include "libkwineffects/kwineffects.h" -#include "libkwineffects/kwinglutils.h" #include #include #include diff --git a/src/plugins/mousemark/mousemark.cpp b/src/plugins/mousemark/mousemark.cpp index 3b95012772..e882b68f70 100644 --- a/src/plugins/mousemark/mousemark.cpp +++ b/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 diff --git a/src/plugins/mousemark/mousemark.h b/src/plugins/mousemark/mousemark.h index ebc345de58..4753bfa9ed 100644 --- a/src/plugins/mousemark/mousemark.h +++ b/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 { diff --git a/src/plugins/qpa/eglplatformcontext.cpp b/src/plugins/qpa/eglplatformcontext.cpp index c6bea72a7f..0d8b89439d 100644 --- a/src/plugins/qpa/eglplatformcontext.cpp +++ b/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" diff --git a/src/plugins/screencast/outputscreencastsource.cpp b/src/plugins/screencast/outputscreencastsource.cpp index b363c8bced..6c312546b3 100644 --- a/src/plugins/screencast/outputscreencastsource.cpp +++ b/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 diff --git a/src/plugins/screencast/regionscreencastsource.cpp b/src/plugins/screencast/regionscreencastsource.cpp index 52da31b731..38fc577499 100644 --- a/src/plugins/screencast/regionscreencastsource.cpp +++ b/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 #include #include diff --git a/src/plugins/screencast/regionscreencastsource.h b/src/plugins/screencast/regionscreencastsource.h index dba0118c1e..0e85bb0b21 100644 --- a/src/plugins/screencast/regionscreencastsource.h +++ b/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 namespace KWin diff --git a/src/plugins/screencast/screencastdmabuftexture.cpp b/src/plugins/screencast/screencastdmabuftexture.cpp index ac0a9db994..1fb4d10c34 100644 --- a/src/plugins/screencast/screencastdmabuftexture.cpp +++ b/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 { diff --git a/src/plugins/screencast/screencastmanager.cpp b/src/plugins/screencast/screencastmanager.cpp index 562368e184..d243238bb3 100644 --- a/src/plugins/screencast/screencastmanager.cpp +++ b/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" diff --git a/src/plugins/screencast/screencaststream.cpp b/src/plugins/screencast/screencaststream.cpp index f354a152d9..457afbf290 100644 --- a/src/plugins/screencast/screencaststream.cpp +++ b/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" diff --git a/src/plugins/screencast/screencastutils.h b/src/plugins/screencast/screencastutils.h index 8c9359aa58..5cc887c41a 100644 --- a/src/plugins/screencast/screencastutils.h +++ b/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 #include diff --git a/src/plugins/screencast/windowscreencastsource.cpp b/src/plugins/screencast/windowscreencastsource.cpp index 4d40a2bc21..3f874dbfa1 100644 --- a/src/plugins/screencast/windowscreencastsource.cpp +++ b/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" diff --git a/src/plugins/screenedge/screenedgeeffect.cpp b/src/plugins/screenedge/screenedgeeffect.cpp index 76d5359973..b1b0819e52 100644 --- a/src/plugins/screenedge/screenedgeeffect.cpp +++ b/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 diff --git a/src/plugins/screenshot/screenshot.cpp b/src/plugins/screenshot/screenshot.cpp index ec3629258c..e246108fcf 100644 --- a/src/plugins/screenshot/screenshot.cpp +++ b/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" diff --git a/src/plugins/screentransform/screentransform.cpp b/src/plugins/screentransform/screentransform.cpp index d673293826..bc13d70362 100644 --- a/src/plugins/screentransform/screentransform.cpp +++ b/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" diff --git a/src/plugins/showpaint/showpaint.cpp b/src/plugins/showpaint/showpaint.cpp index f06be9ded4..c04070b7fa 100644 --- a/src/plugins/showpaint/showpaint.cpp +++ b/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 diff --git a/src/plugins/snaphelper/snaphelper.cpp b/src/plugins/snaphelper/snaphelper.cpp index 711b3f085a..8f0c34befa 100644 --- a/src/plugins/snaphelper/snaphelper.cpp +++ b/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" diff --git a/src/plugins/startupfeedback/startupfeedback.cpp b/src/plugins/startupfeedback/startupfeedback.cpp index 422c64e8b1..7f2075dce0 100644 --- a/src/plugins/startupfeedback/startupfeedback.cpp +++ b/src/plugins/startupfeedback/startupfeedback.cpp @@ -24,7 +24,7 @@ #include #include // KWin -#include "libkwineffects/kwinglutils.h" +#include "libkwineffects/glutils.h" #include "libkwineffects/rendertarget.h" #include "libkwineffects/renderviewport.h" diff --git a/src/plugins/touchpoints/touchpoints.cpp b/src/plugins/touchpoints/touchpoints.cpp index d8a0247930..758e45df0f 100644 --- a/src/plugins/touchpoints/touchpoints.cpp +++ b/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 diff --git a/src/plugins/trackmouse/trackmouse.cpp b/src/plugins/trackmouse/trackmouse.cpp index c335fc097a..dbf6fe156b 100644 --- a/src/plugins/trackmouse/trackmouse.cpp +++ b/src/plugins/trackmouse/trackmouse.cpp @@ -19,8 +19,8 @@ #include #include +#include "libkwineffects/glutils.h" #include "libkwineffects/kwinconfig.h" -#include "libkwineffects/kwinglutils.h" #include "libkwineffects/rendertarget.h" #include "libkwineffects/renderviewport.h" diff --git a/src/plugins/zoom/zoom.cpp b/src/plugins/zoom/zoom.cpp index 6516eb3263..af8112eee4 100644 --- a/src/plugins/zoom/zoom.cpp +++ b/src/plugins/zoom/zoom.cpp @@ -24,7 +24,7 @@ #include #include -#include "libkwineffects/kwinglutils.h" +#include "libkwineffects/glutils.h" #include "libkwineffects/rendertarget.h" #include "libkwineffects/renderviewport.h" diff --git a/src/scene/cursordelegate_opengl.cpp b/src/scene/cursordelegate_opengl.cpp index 5700321df7..9a163e030d 100644 --- a/src/scene/cursordelegate_opengl.cpp +++ b/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" diff --git a/src/scene/imageitem.cpp b/src/scene/imageitem.cpp index 66c5d884af..b4a6ce2117 100644 --- a/src/scene/imageitem.cpp +++ b/src/scene/imageitem.cpp @@ -6,7 +6,7 @@ #include "scene/imageitem.h" -#include "libkwineffects/kwingltexture.h" +#include "libkwineffects/gltexture.h" namespace KWin { diff --git a/src/scene/itemrenderer_opengl.h b/src/scene/itemrenderer_opengl.h index 2de3786343..7a4e2a9c0d 100644 --- a/src/scene/itemrenderer_opengl.h +++ b/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 diff --git a/src/scene/workspacescene_opengl.cpp b/src/scene/workspacescene_opengl.cpp index 419e0d9783..1d44144965 100644 --- a/src/scene/workspacescene_opengl.cpp +++ b/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" diff --git a/src/scene/workspacescene_opengl.h b/src/scene/workspacescene_opengl.h index 5bd9a80f63..600c05a7ab 100644 --- a/src/scene/workspacescene_opengl.h +++ b/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 { diff --git a/src/scripting/scriptedeffect.cpp b/src/scripting/scriptedeffect.cpp index 95b5c1febf..e768ddd88d 100644 --- a/src/scripting/scriptedeffect.cpp +++ b/src/scripting/scriptedeffect.cpp @@ -17,7 +17,7 @@ #include "screenedge.h" #include "workspace.h" // KDE -#include "libkwineffects/kwinglutils.h" +#include "libkwineffects/glutils.h" #include #include #include diff --git a/src/scripting/windowthumbnailitem.cpp b/src/scripting/windowthumbnailitem.cpp index b7234c4283..4405fa8d4d 100644 --- a/src/scripting/windowthumbnailitem.cpp +++ b/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 #include diff --git a/src/workspace.cpp b/src/workspace.cpp index 327eebf96f..bc5122d42b 100644 --- a/src/workspace.cpp +++ b/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 diff --git a/src/x11syncmanager.cpp b/src/x11syncmanager.cpp index 69857d2397..0857d9f78a 100644 --- a/src/x11syncmanager.cpp +++ b/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 { diff --git a/src/x11syncmanager.h b/src/x11syncmanager.h index a194b651e7..f261e480eb 100644 --- a/src/x11syncmanager.h +++ b/src/x11syncmanager.h @@ -6,7 +6,7 @@ #pragma once -#include "libkwineffects/kwinglutils.h" +#include "libkwineffects/glutils.h" #include #include