From ee146d33b9e24cdb85f1d06dfafafa485e178fd4 Mon Sep 17 00:00:00 2001 From: Xaver Hugl Date: Tue, 14 Nov 2023 14:53:24 +0100 Subject: [PATCH] libkwineffects: move files out to more fitting places --- autotests/integration/screencasting_test.cpp | 2 +- autotests/libkwineffects/CMakeLists.txt | 2 +- .../libkwineffects/kwinglplatformtest.cpp | 2 +- src/CMakeLists.txt | 61 ++++++++++--------- src/backends/drm/drm_egl_backend.h | 2 +- src/backends/drm/drm_egl_layer_surface.cpp | 2 +- src/backends/drm/drm_egl_layer_surface.h | 2 +- src/backends/drm/drm_pipeline.h | 2 +- src/backends/drm/icc_shader.cpp | 10 +-- src/backends/virtual/virtual_egl_backend.cpp | 2 +- src/backends/wayland/wayland_egl_backend.cpp | 2 +- src/backends/x11/standalone/glxcontext.h | 2 +- .../standalone/x11_standalone_egl_backend.cpp | 2 +- .../standalone/x11_standalone_egl_backend.h | 4 +- .../standalone/x11_standalone_glx_backend.cpp | 4 +- .../standalone/x11_standalone_glx_backend.h | 4 +- .../x11/windowed/x11_windowed_egl_backend.h | 2 +- src/compositor_wayland.cpp | 2 +- src/compositor_x11.cpp | 2 +- src/{libkwineffects => core}/colorspace.cpp | 0 src/{libkwineffects => core}/colorspace.h | 0 src/core/iccprofile.h | 2 +- src/core/outputlayer.h | 2 +- src/core/renderbackend.h | 2 +- src/{libkwineffects => core}/rendertarget.cpp | 4 +- src/{libkwineffects => core}/rendertarget.h | 2 +- .../renderviewport.cpp | 4 +- src/{libkwineffects => core}/renderviewport.h | 0 src/debug_console.cpp | 4 +- src/effects.cpp | 6 +- src/libkwineffects/kwinanimationeffect.cpp | 2 +- src/libkwineffects/kwinoffscreeneffect.cpp | 8 +-- src/libkwineffects/kwinoffscreenquickview.cpp | 2 +- src/libkwineffects/logging.cpp | 1 - src/libkwineffects/logging_p.h | 1 - src/main.cpp | 6 +- .../glframebuffer.cpp | 12 ++-- .../glframebuffer.h | 0 src/{libkwineffects => opengl}/gllut.cpp | 0 src/{libkwineffects => opengl}/gllut.h | 0 src/{libkwineffects => opengl}/gllut3D.cpp | 0 src/{libkwineffects => opengl}/gllut3D.h | 0 src/{libkwineffects => opengl}/glplatform.cpp | 4 +- src/{libkwineffects => opengl}/glplatform.h | 0 src/{libkwineffects => opengl}/glshader.cpp | 22 +++---- src/{libkwineffects => opengl}/glshader.h | 2 +- .../glshadermanager.cpp | 16 ++--- .../glshadermanager.h | 0 src/{libkwineffects => opengl}/gltexture.cpp | 12 ++-- src/{libkwineffects => opengl}/gltexture.h | 0 src/{libkwineffects => opengl}/gltexture_p.h | 2 +- src/{libkwineffects => opengl}/glutils.cpp | 14 ++--- src/{libkwineffects => opengl}/glutils.h | 14 ++--- .../glutils_funcs.cpp | 4 +- .../glutils_funcs.h | 0 .../glvertexbuffer.cpp | 8 +-- .../glvertexbuffer.h | 2 +- .../openglcontext.cpp | 0 .../openglcontext.h | 2 +- .../scenes/opengl/abstract_egl_backend.cpp | 4 +- .../opengl/basiceglsurfacetexture_wayland.cpp | 2 +- .../scenes/opengl/eglcontext.cpp | 2 +- .../scenes/opengl/eglcontext.h | 4 +- .../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.cpp | 4 +- src/plugins/backgroundcontrast/contrast.h | 4 +- .../backgroundcontrast/contrastshader.cpp | 2 +- .../backgroundcontrast/contrastshader.h | 2 +- src/plugins/blendchanges/blendchanges.cpp | 2 +- src/plugins/blur/blur.cpp | 6 +- src/plugins/blur/blur.h | 2 +- .../colorblindnesscorrection.cpp | 2 +- .../colorblindnesscorrection.h | 2 +- src/plugins/colorpicker/colorpicker.cpp | 8 +-- src/plugins/glide/glide.cpp | 4 +- src/plugins/invert/invert.cpp | 4 +- src/plugins/magnifier/magnifier.cpp | 4 +- src/plugins/mouseclick/mouseclick.cpp | 4 +- src/plugins/mouseclick/mouseclick.h | 2 +- src/plugins/mousemark/mousemark.cpp | 6 +- src/plugins/mousemark/mousemark.h | 2 +- src/plugins/qpa/eglplatformcontext.cpp | 2 +- .../screencast/outputscreencastsource.cpp | 4 +- .../screencast/regionscreencastsource.cpp | 4 +- .../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 | 8 +-- src/plugins/screenedge/screenedgeeffect.cpp | 8 +-- src/plugins/screenshot/screenshot.cpp | 8 +-- .../screentransform/screentransform.cpp | 6 +- src/plugins/sheet/sheet.cpp | 2 +- src/plugins/showfps/showfpseffect.cpp | 2 +- src/plugins/showpaint/showpaint.cpp | 4 +- src/plugins/snaphelper/snaphelper.cpp | 6 +- .../startupfeedback/startupfeedback.cpp | 6 +- src/plugins/thumbnailaside/thumbnailaside.cpp | 2 +- src/plugins/touchpoints/touchpoints.cpp | 6 +- src/plugins/trackmouse/trackmouse.cpp | 6 +- src/plugins/zoom/zoom.cpp | 6 +- src/scene/cursordelegate_opengl.cpp | 8 +-- src/scene/cursordelegate_qpainter.cpp | 4 +- src/scene/cursorscene.cpp | 4 +- src/scene/imageitem.cpp | 2 +- src/scene/item.h | 2 +- src/scene/itemrenderer_opengl.cpp | 4 +- src/scene/itemrenderer_opengl.h | 2 +- src/scene/itemrenderer_qpainter.cpp | 2 +- src/scene/workspacescene.cpp | 2 +- src/scene/workspacescene.h | 2 +- src/scene/workspacescene_opengl.cpp | 2 +- src/scene/workspacescene_opengl.h | 2 +- src/scripting/scriptedeffect.cpp | 2 +- src/scripting/windowthumbnailitem.cpp | 8 +-- src/utils/common.h | 2 +- src/utils/edid.h | 2 +- src/utils/kernel.h | 2 +- src/{libkwineffects => utils}/version.cpp | 0 src/{libkwineffects => utils}/version.h | 4 +- src/utils/xcbutils.h | 2 +- src/wayland/frog_colormanagement_v1.h | 2 +- src/wayland/surface.h | 2 +- src/workspace.cpp | 2 +- src/x11syncmanager.cpp | 2 +- src/x11syncmanager.h | 2 +- 133 files changed, 264 insertions(+), 259 deletions(-) rename src/{libkwineffects => core}/colorspace.cpp (100%) rename src/{libkwineffects => core}/colorspace.h (100%) rename src/{libkwineffects => core}/rendertarget.cpp (95%) rename src/{libkwineffects => core}/rendertarget.h (96%) rename src/{libkwineffects => core}/renderviewport.cpp (97%) rename src/{libkwineffects => core}/renderviewport.h (100%) rename src/{libkwineffects => opengl}/glframebuffer.cpp (96%) rename src/{libkwineffects => opengl}/glframebuffer.h (100%) rename src/{libkwineffects => opengl}/gllut.cpp (100%) rename src/{libkwineffects => opengl}/gllut.h (100%) rename src/{libkwineffects => opengl}/gllut3D.cpp (100%) rename src/{libkwineffects => opengl}/gllut3D.h (100%) rename src/{libkwineffects => opengl}/glplatform.cpp (99%) rename src/{libkwineffects => opengl}/glplatform.h (100%) rename src/{libkwineffects => opengl}/glshader.cpp (95%) rename src/{libkwineffects => opengl}/glshader.h (99%) rename src/{libkwineffects => opengl}/glshadermanager.cpp (97%) rename src/{libkwineffects => opengl}/glshadermanager.h (100%) rename src/{libkwineffects => opengl}/gltexture.cpp (98%) rename src/{libkwineffects => opengl}/gltexture.h (100%) rename src/{libkwineffects => opengl}/gltexture_p.h (98%) rename src/{libkwineffects => opengl}/glutils.cpp (92%) rename src/{libkwineffects => opengl}/glutils.h (81%) rename src/{libkwineffects => opengl}/glutils_funcs.cpp (97%) rename src/{libkwineffects => opengl}/glutils_funcs.h (100%) rename src/{libkwineffects => opengl}/glvertexbuffer.cpp (99%) rename src/{libkwineffects => opengl}/glvertexbuffer.h (99%) rename src/{libkwineffects => opengl}/openglcontext.cpp (100%) rename src/{libkwineffects => opengl}/openglcontext.h (97%) rename src/{libkwineffects => utils}/version.cpp (100%) rename src/{libkwineffects => utils}/version.h (87%) diff --git a/autotests/integration/screencasting_test.cpp b/autotests/integration/screencasting_test.cpp index 341ef89f9e..2e2284bf57 100644 --- a/autotests/integration/screencasting_test.cpp +++ b/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" diff --git a/autotests/libkwineffects/CMakeLists.txt b/autotests/libkwineffects/CMakeLists.txt index c8161f4c30..aa697d8fd5 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/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) diff --git a/autotests/libkwineffects/kwinglplatformtest.cpp b/autotests/libkwineffects/kwinglplatformtest.cpp index 98aab12d51..61cc84b63c 100644 --- a/autotests/libkwineffects/kwinglplatformtest.cpp +++ b/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 #include diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7b6f4ff48a..ee8de4f883 100644 --- a/src/CMakeLists.txt +++ b/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" diff --git a/src/backends/drm/drm_egl_backend.h b/src/backends/drm/drm_egl_backend.h index ff4ccec381..43c431f07b 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/glutils.h" +#include "opengl/glutils.h" #include #include diff --git a/src/backends/drm/drm_egl_layer_surface.cpp b/src/backends/drm/drm_egl_layer_surface.cpp index da72d4542d..fb751a8d38 100644 --- a/src/backends/drm/drm_egl_layer_surface.cpp +++ b/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" diff --git a/src/backends/drm/drm_egl_layer_surface.h b/src/backends/drm/drm_egl_layer_surface.h index 984456554f..954f0cd141 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/gltexture.h" +#include "opengl/gltexture.h" #include "utils/damagejournal.h" struct gbm_bo; diff --git a/src/backends/drm/drm_pipeline.h b/src/backends/drm/drm_pipeline.h index 57b83915a8..5a4c4d3b7d 100644 --- a/src/backends/drm/drm_pipeline.h +++ b/src/backends/drm/drm_pipeline.h @@ -17,12 +17,12 @@ #include #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 { diff --git a/src/backends/drm/icc_shader.cpp b/src/backends/drm/icc_shader.cpp index 0f104b22e4..84c2e9f689 100644 --- a/src/backends/drm/icc_shader.cpp +++ b/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 { diff --git a/src/backends/virtual/virtual_egl_backend.cpp b/src/backends/virtual/virtual_egl_backend.cpp index 63c60254b8..8102ac126a 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/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" diff --git a/src/backends/wayland/wayland_egl_backend.cpp b/src/backends/wayland/wayland_egl_backend.cpp index c429b5a05f..a9ece751b5 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/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" diff --git a/src/backends/x11/standalone/glxcontext.h b/src/backends/x11/standalone/glxcontext.h index 751aeedea1..9241151c9a 100644 --- a/src/backends/x11/standalone/glxcontext.h +++ b/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 diff --git a/src/backends/x11/standalone/x11_standalone_egl_backend.cpp b/src/backends/x11/standalone/x11_standalone_egl_backend.cpp index afbae4995e..1b76cc9d4e 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/glplatform.h" +#include "opengl/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 07ec2129d8..175fc81434 100644 --- a/src/backends/x11/standalone/x11_standalone_egl_backend.h +++ b/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; diff --git a/src/backends/x11/standalone/x11_standalone_glx_backend.cpp b/src/backends/x11/standalone/x11_standalone_glx_backend.cpp index e00d27f214..d717eae1fe 100644 --- a/src/backends/x11/standalone/x11_standalone_glx_backend.cpp +++ b/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 #include diff --git a/src/backends/x11/standalone/x11_standalone_glx_backend.h b/src/backends/x11/standalone/x11_standalone_glx_backend.h index fea367d4d5..a68414d610 100644 --- a/src/backends/x11/standalone/x11_standalone_glx_backend.h +++ b/src/backends/x11/standalone/x11_standalone_glx_backend.h @@ -18,8 +18,8 @@ #include #include -#include "libkwineffects/gltexture.h" -#include "libkwineffects/gltexture_p.h" +#include "opengl/gltexture.h" +#include "opengl/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 703165810a..9c639f1a7c 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/glutils.h" +#include "opengl/glutils.h" #include "platformsupport/scenes/opengl/abstract_egl_backend.h" namespace KWin diff --git a/src/compositor_wayland.cpp b/src/compositor_wayland.cpp index 36f80a76ed..f82cacbf14 100644 --- a/src/compositor_wayland.cpp +++ b/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" diff --git a/src/compositor_x11.cpp b/src/compositor_x11.cpp index f69ee10432..00a06fc03a 100644 --- a/src/compositor_x11.cpp +++ b/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" diff --git a/src/libkwineffects/colorspace.cpp b/src/core/colorspace.cpp similarity index 100% rename from src/libkwineffects/colorspace.cpp rename to src/core/colorspace.cpp diff --git a/src/libkwineffects/colorspace.h b/src/core/colorspace.h similarity index 100% rename from src/libkwineffects/colorspace.h rename to src/core/colorspace.h diff --git a/src/core/iccprofile.h b/src/core/iccprofile.h index 003014a1a0..ea528685ff 100644 --- a/src/core/iccprofile.h +++ b/src/core/iccprofile.h @@ -5,8 +5,8 @@ */ #pragma once +#include "core/colorspace.h" #include "kwin_export.h" -#include "libkwineffects/colorspace.h" #include #include diff --git a/src/core/outputlayer.h b/src/core/outputlayer.h index bd091dfaa8..cbe6926109 100644 --- a/src/core/outputlayer.h +++ b/src/core/outputlayer.h @@ -6,8 +6,8 @@ #pragma once +#include "core/rendertarget.h" #include "kwin_export.h" -#include "libkwineffects/rendertarget.h" #include #include diff --git a/src/core/renderbackend.h b/src/core/renderbackend.h index 28534540cc..40d7e8a113 100644 --- a/src/core/renderbackend.h +++ b/src/core/renderbackend.h @@ -6,8 +6,8 @@ #pragma once +#include "core/rendertarget.h" #include "libkwineffects/kwinglobals.h" -#include "libkwineffects/rendertarget.h" #include diff --git a/src/libkwineffects/rendertarget.cpp b/src/core/rendertarget.cpp similarity index 95% rename from src/libkwineffects/rendertarget.cpp rename to src/core/rendertarget.cpp index ed45af69f4..4d53cd129d 100644 --- a/src/libkwineffects/rendertarget.cpp +++ b/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 { diff --git a/src/libkwineffects/rendertarget.h b/src/core/rendertarget.h similarity index 96% rename from src/libkwineffects/rendertarget.h rename to src/core/rendertarget.h index e19ae44406..b59e898522 100644 --- a/src/libkwineffects/rendertarget.h +++ b/src/core/rendertarget.h @@ -6,7 +6,7 @@ #pragma once -#include "libkwineffects/colorspace.h" +#include "core/colorspace.h" #include #include diff --git a/src/libkwineffects/renderviewport.cpp b/src/core/renderviewport.cpp similarity index 97% rename from src/libkwineffects/renderviewport.cpp rename to src/core/renderviewport.cpp index ddefc9cef4..13b84fb2fd 100644 --- a/src/libkwineffects/renderviewport.cpp +++ b/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 { diff --git a/src/libkwineffects/renderviewport.h b/src/core/renderviewport.h similarity index 100% rename from src/libkwineffects/renderviewport.h rename to src/core/renderviewport.h diff --git a/src/debug_console.cpp b/src/debug_console.cpp index a7c7a3851f..c5ff610322 100644 --- a/src/debug_console.cpp +++ b/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" diff --git a/src/effects.cpp b/src/effects.cpp index d38db052cc..9931e78362 100644 --- a/src/effects.cpp +++ b/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" diff --git a/src/libkwineffects/kwinanimationeffect.cpp b/src/libkwineffects/kwinanimationeffect.cpp index 8cb8e1b4f1..c0fd181774 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/glutils.h" +#include "opengl/glutils.h" #include #include diff --git a/src/libkwineffects/kwinoffscreeneffect.cpp b/src/libkwineffects/kwinoffscreeneffect.cpp index f37be13945..69184a6408 100644 --- a/src/libkwineffects/kwinoffscreeneffect.cpp +++ b/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 { diff --git a/src/libkwineffects/kwinoffscreenquickview.cpp b/src/libkwineffects/kwinoffscreenquickview.cpp index c4a4b97d8c..51be9958b1 100644 --- a/src/libkwineffects/kwinoffscreenquickview.cpp +++ b/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 #include diff --git a/src/libkwineffects/logging.cpp b/src/libkwineffects/logging.cpp index 5a80d98c49..9e83fa274c 100644 --- a/src/libkwineffects/logging.cpp +++ b/src/libkwineffects/logging.cpp @@ -8,4 +8,3 @@ */ #include "logging_p.h" Q_LOGGING_CATEGORY(LIBKWINEFFECTS, "libkwineffects", QtWarningMsg) -Q_LOGGING_CATEGORY(LIBKWINGLUTILS, "libkwinglutils", QtWarningMsg) diff --git a/src/libkwineffects/logging_p.h b/src/libkwineffects/logging_p.h index 3631fe80ae..8c94346352 100644 --- a/src/libkwineffects/logging_p.h +++ b/src/libkwineffects/logging_p.h @@ -12,4 +12,3 @@ #include Q_DECLARE_LOGGING_CATEGORY(LIBKWINEFFECTS) -Q_DECLARE_LOGGING_CATEGORY(LIBKWINGLUTILS) diff --git a/src/main.cpp b/src/main.cpp index b287608c39..a42c7a6700 100644 --- a/src/main.cpp +++ b/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" diff --git a/src/libkwineffects/glframebuffer.cpp b/src/opengl/glframebuffer.cpp similarity index 96% rename from src/libkwineffects/glframebuffer.cpp rename to src/opengl/glframebuffer.cpp index b05f9a8443..03e9c4c85e 100644 --- a/src/libkwineffects/glframebuffer.cpp +++ b/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; } diff --git a/src/libkwineffects/glframebuffer.h b/src/opengl/glframebuffer.h similarity index 100% rename from src/libkwineffects/glframebuffer.h rename to src/opengl/glframebuffer.h diff --git a/src/libkwineffects/gllut.cpp b/src/opengl/gllut.cpp similarity index 100% rename from src/libkwineffects/gllut.cpp rename to src/opengl/gllut.cpp diff --git a/src/libkwineffects/gllut.h b/src/opengl/gllut.h similarity index 100% rename from src/libkwineffects/gllut.h rename to src/opengl/gllut.h diff --git a/src/libkwineffects/gllut3D.cpp b/src/opengl/gllut3D.cpp similarity index 100% rename from src/libkwineffects/gllut3D.cpp rename to src/opengl/gllut3D.cpp diff --git a/src/libkwineffects/gllut3D.h b/src/opengl/gllut3D.h similarity index 100% rename from src/libkwineffects/gllut3D.h rename to src/opengl/gllut3D.h diff --git a/src/libkwineffects/glplatform.cpp b/src/opengl/glplatform.cpp similarity index 99% rename from src/libkwineffects/glplatform.cpp rename to src/opengl/glplatform.cpp index 5360215fda..7225217b3f 100644 --- a/src/libkwineffects/glplatform.cpp +++ b/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 #include diff --git a/src/libkwineffects/glplatform.h b/src/opengl/glplatform.h similarity index 100% rename from src/libkwineffects/glplatform.h rename to src/opengl/glplatform.h diff --git a/src/libkwineffects/glshader.cpp b/src/opengl/glshader.cpp similarity index 95% rename from src/libkwineffects/glshader.cpp rename to src/opengl/glshader.cpp index 46e26ceedb..c0899ac3d9 100644 --- a/src/libkwineffects/glshader.cpp +++ b/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 @@ -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) { diff --git a/src/libkwineffects/glshader.h b/src/opengl/glshader.h similarity index 99% rename from src/libkwineffects/glshader.h rename to src/opengl/glshader.h index 4f36fd7b4e..2db75ccb11 100644 --- a/src/libkwineffects/glshader.h +++ b/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 #include diff --git a/src/libkwineffects/glshadermanager.cpp b/src/opengl/glshadermanager.cpp similarity index 97% rename from src/libkwineffects/glshadermanager.cpp rename to src/opengl/glshadermanager.cpp index d14d77dc42..85135b840e 100644 --- a/src/libkwineffects/glshadermanager.cpp +++ b/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 #include @@ -272,11 +272,11 @@ std::unique_ptr 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 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 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; diff --git a/src/libkwineffects/glshadermanager.h b/src/opengl/glshadermanager.h similarity index 100% rename from src/libkwineffects/glshadermanager.h rename to src/opengl/glshadermanager.h diff --git a/src/libkwineffects/gltexture.cpp b/src/opengl/gltexture.cpp similarity index 98% rename from src/libkwineffects/gltexture.cpp rename to src/opengl/gltexture.cpp index 92992bc132..5b761f4253 100644 --- a/src/libkwineffects/gltexture.cpp +++ b/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 #include @@ -615,7 +615,7 @@ std::unique_ptr 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::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); diff --git a/src/libkwineffects/gltexture.h b/src/opengl/gltexture.h similarity index 100% rename from src/libkwineffects/gltexture.h rename to src/opengl/gltexture.h diff --git a/src/libkwineffects/gltexture_p.h b/src/opengl/gltexture_p.h similarity index 98% rename from src/libkwineffects/gltexture_p.h rename to src/opengl/gltexture_p.h index d268f3355d..e7c21b8be7 100644 --- a/src/libkwineffects/gltexture_p.h +++ b/src/opengl/gltexture_p.h @@ -11,7 +11,7 @@ #pragma once -#include "libkwineffects/glutils.h" +#include "opengl/glutils.h" #include #include diff --git a/src/libkwineffects/glutils.cpp b/src/opengl/glutils.cpp similarity index 92% rename from src/libkwineffects/glutils.cpp rename to src/opengl/glutils.cpp index f7dc464bbf..c6e3905927 100644 --- a/src/libkwineffects/glutils.cpp +++ b/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; } } diff --git a/src/libkwineffects/glutils.h b/src/opengl/glutils.h similarity index 81% rename from src/libkwineffects/glutils.h rename to src/opengl/glutils.h index 3f15304c6f..3038a16c11 100644 --- a/src/libkwineffects/glutils.h +++ b/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 #include diff --git a/src/libkwineffects/glutils_funcs.cpp b/src/opengl/glutils_funcs.cpp similarity index 97% rename from src/libkwineffects/glutils_funcs.cpp rename to src/opengl/glutils_funcs.cpp index 7226390a2a..4e36c1e8ea 100644 --- a/src/libkwineffects/glutils_funcs.cpp +++ b/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 diff --git a/src/libkwineffects/glutils_funcs.h b/src/opengl/glutils_funcs.h similarity index 100% rename from src/libkwineffects/glutils_funcs.h rename to src/opengl/glutils_funcs.h diff --git a/src/libkwineffects/glvertexbuffer.cpp b/src/opengl/glvertexbuffer.cpp similarity index 99% rename from src/libkwineffects/glvertexbuffer.cpp rename to src/opengl/glvertexbuffer.cpp index 558b4e7634..db067ba433 100644 --- a/src/libkwineffects/glvertexbuffer.cpp +++ b/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 #include @@ -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; } } diff --git a/src/libkwineffects/glvertexbuffer.h b/src/opengl/glvertexbuffer.h similarity index 99% rename from src/libkwineffects/glvertexbuffer.h rename to src/opengl/glvertexbuffer.h index 842102cc0e..fa29162625 100644 --- a/src/libkwineffects/glvertexbuffer.h +++ b/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 #include diff --git a/src/libkwineffects/openglcontext.cpp b/src/opengl/openglcontext.cpp similarity index 100% rename from src/libkwineffects/openglcontext.cpp rename to src/opengl/openglcontext.cpp diff --git a/src/libkwineffects/openglcontext.h b/src/opengl/openglcontext.h similarity index 97% rename from src/libkwineffects/openglcontext.h rename to src/opengl/openglcontext.h index 947812b0a7..8e81c1a229 100644 --- a/src/libkwineffects/openglcontext.h +++ b/src/opengl/openglcontext.h @@ -8,7 +8,7 @@ */ #pragma once #include "kwin_export.h" -#include "version.h" +#include "utils/version.h" #include #include diff --git a/src/platformsupport/scenes/opengl/abstract_egl_backend.cpp b/src/platformsupport/scenes/opengl/abstract_egl_backend.cpp index a244de9c70..a8b449e2c0 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/glplatform.h" -#include "libkwineffects/glutils.h" +#include "opengl/glplatform.h" +#include "opengl/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 548d1523d9..e1587f81c5 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/gltexture.h" +#include "opengl/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 badcffcb8c..b7d28c0c29 100644 --- a/src/platformsupport/scenes/opengl/eglcontext.cpp +++ b/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" diff --git a/src/platformsupport/scenes/opengl/eglcontext.h b/src/platformsupport/scenes/opengl/eglcontext.h index cbef81ce1d..1f65acde5e 100644 --- a/src/platformsupport/scenes/opengl/eglcontext.h +++ b/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 #include diff --git a/src/platformsupport/scenes/opengl/egldisplay.cpp b/src/platformsupport/scenes/opengl/egldisplay.cpp index f5d2a4d206..646b62627c 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/glutils.h" +#include "opengl/glutils.h" #include "utils/common.h" #include diff --git a/src/platformsupport/scenes/opengl/eglswapchain.cpp b/src/platformsupport/scenes/opengl/eglswapchain.cpp index 01e22d90d8..bf28122bc2 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/glutils.h" +#include "opengl/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 13c9f58ea6..40dffc71bc 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/glplatform.h" +#include "opengl/glplatform.h" namespace KWin { diff --git a/src/platformsupport/scenes/opengl/kwineglimagetexture.cpp b/src/platformsupport/scenes/opengl/kwineglimagetexture.cpp index cf43696fcf..b9234975db 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/gltexture_p.h" +#include "opengl/gltexture_p.h" #include #include diff --git a/src/platformsupport/scenes/opengl/kwineglimagetexture.h b/src/platformsupport/scenes/opengl/kwineglimagetexture.h index ccb84c9235..99ffcea0bc 100644 --- a/src/platformsupport/scenes/opengl/kwineglimagetexture.h +++ b/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; diff --git a/src/platformsupport/scenes/opengl/openglbackend.cpp b/src/platformsupport/scenes/opengl/openglbackend.cpp index f305c2d1db..482555207f 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/glutils_funcs.h" +#include "opengl/glutils_funcs.h" #include "utils/common.h" diff --git a/src/platformsupport/scenes/opengl/openglsurfacetexture.cpp b/src/platformsupport/scenes/opengl/openglsurfacetexture.cpp index 73944a920c..834b9bfc44 100644 --- a/src/platformsupport/scenes/opengl/openglsurfacetexture.cpp +++ b/src/platformsupport/scenes/opengl/openglsurfacetexture.cpp @@ -5,7 +5,7 @@ */ #include "openglsurfacetexture.h" -#include "libkwineffects/gltexture.h" +#include "opengl/gltexture.h" namespace KWin { diff --git a/src/plugins/backgroundcontrast/contrast.cpp b/src/plugins/backgroundcontrast/contrast.cpp index f45732d0ca..5947f799df 100644 --- a/src/plugins/backgroundcontrast/contrast.cpp +++ b/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" diff --git a/src/plugins/backgroundcontrast/contrast.h b/src/plugins/backgroundcontrast/contrast.h index 39c8409af2..16f724c19c 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 "opengl/glplatform.h" +#include "opengl/glutils.h" #include #include diff --git a/src/plugins/backgroundcontrast/contrastshader.cpp b/src/plugins/backgroundcontrast/contrastshader.cpp index 1aaa3a3323..7458f90974 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 "opengl/glplatform.h" #include #include diff --git a/src/plugins/backgroundcontrast/contrastshader.h b/src/plugins/backgroundcontrast/contrastshader.h index f75f3ab8c5..c979e0304b 100644 --- a/src/plugins/backgroundcontrast/contrastshader.h +++ b/src/plugins/backgroundcontrast/contrastshader.h @@ -7,7 +7,7 @@ #pragma once -#include "libkwineffects/glutils.h" +#include "opengl/glutils.h" class QMatrix4x4; diff --git a/src/plugins/blendchanges/blendchanges.cpp b/src/plugins/blendchanges/blendchanges.cpp index 0feb515d34..1c11d64544 100644 --- a/src/plugins/blendchanges/blendchanges.cpp +++ b/src/plugins/blendchanges/blendchanges.cpp @@ -8,7 +8,7 @@ */ // own #include "blendchanges.h" -#include "libkwineffects/glutils.h" +#include "opengl/glutils.h" #include #include diff --git a/src/plugins/blur/blur.cpp b/src/plugins/blur/blur.cpp index d06507dc2c..6d4b75ebd2 100644 --- a/src/plugins/blur/blur.cpp +++ b/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" diff --git a/src/plugins/blur/blur.h b/src/plugins/blur/blur.h index d1230a42b9..cb9a231b37 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 "opengl/glutils.h" #include diff --git a/src/plugins/colorblindnesscorrection/colorblindnesscorrection.cpp b/src/plugins/colorblindnesscorrection/colorblindnesscorrection.cpp index c6e01da9e1..de65c33efb 100644 --- a/src/plugins/colorblindnesscorrection/colorblindnesscorrection.cpp +++ b/src/plugins/colorblindnesscorrection/colorblindnesscorrection.cpp @@ -8,8 +8,8 @@ #include -#include "libkwineffects/glshader.h" #include "libkwineffects/kwineffects.h" +#include "opengl/glshader.h" #include "colorblindnesscorrection_settings.h" diff --git a/src/plugins/colorblindnesscorrection/colorblindnesscorrection.h b/src/plugins/colorblindnesscorrection/colorblindnesscorrection.h index 8c8e2ab466..46beb6f5a6 100644 --- a/src/plugins/colorblindnesscorrection/colorblindnesscorrection.h +++ b/src/plugins/colorblindnesscorrection/colorblindnesscorrection.h @@ -8,8 +8,8 @@ #include -#include "libkwineffects/glshadermanager.h" #include "libkwineffects/kwinoffscreeneffect.h" +#include "opengl/glshadermanager.h" namespace KWin { diff --git a/src/plugins/colorpicker/colorpicker.cpp b/src/plugins/colorpicker/colorpicker.cpp index a620242712..f129a4bba4 100644 --- a/src/plugins/colorpicker/colorpicker.cpp +++ b/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 #include #include diff --git a/src/plugins/glide/glide.cpp b/src/plugins/glide/glide.cpp index 03a9b5ca47..1d2f5d8ee3 100644 --- a/src/plugins/glide/glide.cpp +++ b/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 diff --git a/src/plugins/invert/invert.cpp b/src/plugins/invert/invert.cpp index 7b1aa335af..6ca4897cd0 100644 --- a/src/plugins/invert/invert.cpp +++ b/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 #include #include diff --git a/src/plugins/magnifier/magnifier.cpp b/src/plugins/magnifier/magnifier.cpp index 8ef9fa69e8..97e534a8c4 100644 --- a/src/plugins/magnifier/magnifier.cpp +++ b/src/plugins/magnifier/magnifier.cpp @@ -16,8 +16,8 @@ #include #include -#include "libkwineffects/glutils.h" -#include "libkwineffects/renderviewport.h" +#include "core/renderviewport.h" +#include "opengl/glutils.h" #include namespace KWin diff --git a/src/plugins/mouseclick/mouseclick.cpp b/src/plugins/mouseclick/mouseclick.cpp index f8b94a87ce..8972fa433d 100644 --- a/src/plugins/mouseclick/mouseclick.cpp +++ b/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 diff --git a/src/plugins/mouseclick/mouseclick.h b/src/plugins/mouseclick/mouseclick.h index 43d3a52cb1..9271a42156 100644 --- a/src/plugins/mouseclick/mouseclick.h +++ b/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 #include #include diff --git a/src/plugins/mousemark/mousemark.cpp b/src/plugins/mousemark/mousemark.cpp index 3981509a97..2d687dae73 100644 --- a/src/plugins/mousemark/mousemark.cpp +++ b/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 #include #include diff --git a/src/plugins/mousemark/mousemark.h b/src/plugins/mousemark/mousemark.h index a3df6c2ee0..e5a5474144 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 "opengl/glutils.h" namespace KWin { diff --git a/src/plugins/qpa/eglplatformcontext.cpp b/src/plugins/qpa/eglplatformcontext.cpp index 3c0cc78c4d..201f609bf4 100644 --- a/src/plugins/qpa/eglplatformcontext.cpp +++ b/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" diff --git a/src/plugins/screencast/outputscreencastsource.cpp b/src/plugins/screencast/outputscreencastsource.cpp index def3a8a1c1..70a53a1bf8 100644 --- a/src/plugins/screencast/outputscreencastsource.cpp +++ b/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 diff --git a/src/plugins/screencast/regionscreencastsource.cpp b/src/plugins/screencast/regionscreencastsource.cpp index 2937591dda..acfb9e9c5b 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/gltexture.h" -#include "libkwineffects/glutils.h" +#include "opengl/gltexture.h" +#include "opengl/glutils.h" #include #include #include diff --git a/src/plugins/screencast/regionscreencastsource.h b/src/plugins/screencast/regionscreencastsource.h index 0e85bb0b21..a2b350928b 100644 --- a/src/plugins/screencast/regionscreencastsource.h +++ b/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 namespace KWin diff --git a/src/plugins/screencast/screencastdmabuftexture.cpp b/src/plugins/screencast/screencastdmabuftexture.cpp index 1fb4d10c34..d24574806e 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/glutils.h" +#include "opengl/glutils.h" namespace KWin { diff --git a/src/plugins/screencast/screencastmanager.cpp b/src/plugins/screencast/screencastmanager.cpp index 0a8964563d..bde7ac5fa0 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/gltexture.h" +#include "opengl/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 8645061b7e..7135da91d4 100644 --- a/src/plugins/screencast/screencaststream.cpp +++ b/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" diff --git a/src/plugins/screencast/screencastutils.h b/src/plugins/screencast/screencastutils.h index 5cc887c41a..1484e37dc7 100644 --- a/src/plugins/screencast/screencastutils.h +++ b/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 #include diff --git a/src/plugins/screencast/windowscreencastsource.cpp b/src/plugins/screencast/windowscreencastsource.cpp index 9760f7cf31..552dbdb01c 100644 --- a/src/plugins/screencast/windowscreencastsource.cpp +++ b/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" diff --git a/src/plugins/screenedge/screenedgeeffect.cpp b/src/plugins/screenedge/screenedgeeffect.cpp index f5aa47b872..cf97732a99 100644 --- a/src/plugins/screenedge/screenedgeeffect.cpp +++ b/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 #include diff --git a/src/plugins/screenshot/screenshot.cpp b/src/plugins/screenshot/screenshot.cpp index 54beef2493..b615d12cdc 100644 --- a/src/plugins/screenshot/screenshot.cpp +++ b/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 diff --git a/src/plugins/screentransform/screentransform.cpp b/src/plugins/screentransform/screentransform.cpp index 71cac9b369..2aa067d740 100644 --- a/src/plugins/screentransform/screentransform.cpp +++ b/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 diff --git a/src/plugins/sheet/sheet.cpp b/src/plugins/sheet/sheet.cpp index a4f2c0db5f..8a77997f09 100644 --- a/src/plugins/sheet/sheet.cpp +++ b/src/plugins/sheet/sheet.cpp @@ -15,7 +15,7 @@ // KConfigSkeleton #include "sheetconfig.h" -#include "libkwineffects/renderviewport.h" +#include "core/renderviewport.h" // Qt #include diff --git a/src/plugins/showfps/showfpseffect.cpp b/src/plugins/showfps/showfpseffect.cpp index 23d33f9224..e4d2a4588e 100644 --- a/src/plugins/showfps/showfpseffect.cpp +++ b/src/plugins/showfps/showfpseffect.cpp @@ -8,7 +8,7 @@ #include "showfpseffect.h" #include "core/output.h" -#include "libkwineffects/renderviewport.h" +#include "core/renderviewport.h" #include diff --git a/src/plugins/showpaint/showpaint.cpp b/src/plugins/showpaint/showpaint.cpp index 5b3a519f06..f2830b2e77 100644 --- a/src/plugins/showpaint/showpaint.cpp +++ b/src/plugins/showpaint/showpaint.cpp @@ -10,8 +10,8 @@ #include "showpaint.h" -#include "libkwineffects/glutils.h" -#include "libkwineffects/renderviewport.h" +#include "core/renderviewport.h" +#include "opengl/glutils.h" #include #include diff --git a/src/plugins/snaphelper/snaphelper.cpp b/src/plugins/snaphelper/snaphelper.cpp index 3232510880..ed033475c7 100644 --- a/src/plugins/snaphelper/snaphelper.cpp +++ b/src/plugins/snaphelper/snaphelper.cpp @@ -10,9 +10,9 @@ #include "snaphelper.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 diff --git a/src/plugins/startupfeedback/startupfeedback.cpp b/src/plugins/startupfeedback/startupfeedback.cpp index 0854c182f7..d7be40c12c 100644 --- a/src/plugins/startupfeedback/startupfeedback.cpp +++ b/src/plugins/startupfeedback/startupfeedback.cpp @@ -24,9 +24,9 @@ #include #include // KWin -#include "libkwineffects/glutils.h" -#include "libkwineffects/rendertarget.h" -#include "libkwineffects/renderviewport.h" +#include "core/rendertarget.h" +#include "core/renderviewport.h" +#include "opengl/glutils.h" // based on StartupId in KRunner by Lubos Lunak // SPDX-FileCopyrightText: 2001 Lubos Lunak diff --git a/src/plugins/thumbnailaside/thumbnailaside.cpp b/src/plugins/thumbnailaside/thumbnailaside.cpp index e46547e178..4f2ad3db49 100644 --- a/src/plugins/thumbnailaside/thumbnailaside.cpp +++ b/src/plugins/thumbnailaside/thumbnailaside.cpp @@ -12,7 +12,7 @@ // KConfigSkeleton #include "thumbnailasideconfig.h" -#include "libkwineffects/renderviewport.h" +#include "core/renderviewport.h" #include #include diff --git a/src/plugins/touchpoints/touchpoints.cpp b/src/plugins/touchpoints/touchpoints.cpp index 07641c0ab4..1622c85bf7 100644 --- a/src/plugins/touchpoints/touchpoints.cpp +++ b/src/plugins/touchpoints/touchpoints.cpp @@ -10,9 +10,9 @@ #include "touchpoints.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 #include diff --git a/src/plugins/trackmouse/trackmouse.cpp b/src/plugins/trackmouse/trackmouse.cpp index 8b3fbeb2ad..4ead665efa 100644 --- a/src/plugins/trackmouse/trackmouse.cpp +++ b/src/plugins/trackmouse/trackmouse.cpp @@ -19,9 +19,9 @@ #include #include -#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 #include diff --git a/src/plugins/zoom/zoom.cpp b/src/plugins/zoom/zoom.cpp index 77a99725e8..f8021bb5a4 100644 --- a/src/plugins/zoom/zoom.cpp +++ b/src/plugins/zoom/zoom.cpp @@ -24,9 +24,9 @@ #include #include -#include "libkwineffects/glutils.h" -#include "libkwineffects/rendertarget.h" -#include "libkwineffects/renderviewport.h" +#include "core/rendertarget.h" +#include "core/renderviewport.h" +#include "opengl/glutils.h" namespace KWin { diff --git a/src/scene/cursordelegate_opengl.cpp b/src/scene/cursordelegate_opengl.cpp index 907dffe123..3acd9b8b06 100644 --- a/src/scene/cursordelegate_opengl.cpp +++ b/src/scene/cursordelegate_opengl.cpp @@ -8,11 +8,11 @@ #include "compositor.h" #include "core/output.h" #include "core/renderlayer.h" +#include "core/rendertarget.h" +#include "core/renderviewport.h" #include "cursor.h" -#include "libkwineffects/gltexture.h" -#include "libkwineffects/glutils.h" -#include "libkwineffects/rendertarget.h" -#include "libkwineffects/renderviewport.h" +#include "opengl/gltexture.h" +#include "opengl/glutils.h" #include "scene/cursorscene.h" #include diff --git a/src/scene/cursordelegate_qpainter.cpp b/src/scene/cursordelegate_qpainter.cpp index 59466e15d1..5c4e8cb6ff 100644 --- a/src/scene/cursordelegate_qpainter.cpp +++ b/src/scene/cursordelegate_qpainter.cpp @@ -8,9 +8,9 @@ #include "compositor.h" #include "core/output.h" #include "core/renderlayer.h" +#include "core/rendertarget.h" +#include "core/renderviewport.h" #include "cursor.h" -#include "libkwineffects/rendertarget.h" -#include "libkwineffects/renderviewport.h" #include "scene/cursorscene.h" #include diff --git a/src/scene/cursorscene.cpp b/src/scene/cursorscene.cpp index d22898ba09..44c04bca5b 100644 --- a/src/scene/cursorscene.cpp +++ b/src/scene/cursorscene.cpp @@ -6,8 +6,8 @@ #include "scene/cursorscene.h" #include "core/output.h" -#include "libkwineffects/rendertarget.h" -#include "libkwineffects/renderviewport.h" +#include "core/rendertarget.h" +#include "core/renderviewport.h" #include "scene/cursoritem.h" #include "scene/itemrenderer.h" diff --git a/src/scene/imageitem.cpp b/src/scene/imageitem.cpp index 4cdb42926e..01c0be9cb5 100644 --- a/src/scene/imageitem.cpp +++ b/src/scene/imageitem.cpp @@ -6,7 +6,7 @@ #include "scene/imageitem.h" -#include "libkwineffects/gltexture.h" +#include "opengl/gltexture.h" namespace KWin { diff --git a/src/scene/item.h b/src/scene/item.h index 1e6f515487..75b7e34e76 100644 --- a/src/scene/item.h +++ b/src/scene/item.h @@ -6,7 +6,7 @@ #pragma once -#include "libkwineffects/colorspace.h" +#include "core/colorspace.h" #include "libkwineffects/kwineffects.h" #include "libkwineffects/kwinglobals.h" diff --git a/src/scene/itemrenderer_opengl.cpp b/src/scene/itemrenderer_opengl.cpp index e7ae7390a9..2cce9b316d 100644 --- a/src/scene/itemrenderer_opengl.cpp +++ b/src/scene/itemrenderer_opengl.cpp @@ -5,8 +5,8 @@ */ #include "scene/itemrenderer_opengl.h" -#include "libkwineffects/rendertarget.h" -#include "libkwineffects/renderviewport.h" +#include "core/rendertarget.h" +#include "core/renderviewport.h" #include "platformsupport/scenes/opengl/openglsurfacetexture.h" #include "scene/decorationitem.h" #include "scene/imageitem.h" diff --git a/src/scene/itemrenderer_opengl.h b/src/scene/itemrenderer_opengl.h index 87d7ab71e5..9d188da738 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 "opengl/glutils.h" #include "scene/itemrenderer.h" namespace KWin diff --git a/src/scene/itemrenderer_qpainter.cpp b/src/scene/itemrenderer_qpainter.cpp index 285a421e0d..f2c2e35b2e 100644 --- a/src/scene/itemrenderer_qpainter.cpp +++ b/src/scene/itemrenderer_qpainter.cpp @@ -5,7 +5,7 @@ */ #include "scene/itemrenderer_qpainter.h" -#include "libkwineffects/renderviewport.h" +#include "core/renderviewport.h" #include "platformsupport/scenes/qpainter/qpaintersurfacetexture.h" #include "scene/imageitem.h" #include "scene/workspacescene_qpainter.h" diff --git a/src/scene/workspacescene.cpp b/src/scene/workspacescene.cpp index b26400b21d..5e20895f11 100644 --- a/src/scene/workspacescene.cpp +++ b/src/scene/workspacescene.cpp @@ -58,9 +58,9 @@ #include "core/renderbackend.h" #include "core/renderlayer.h" #include "core/renderloop.h" +#include "core/renderviewport.h" #include "effects.h" #include "internalwindow.h" -#include "libkwineffects/renderviewport.h" #include "scene/dndiconitem.h" #include "scene/itemrenderer.h" #include "scene/shadowitem.h" diff --git a/src/scene/workspacescene.h b/src/scene/workspacescene.h index d63a075760..c11af7503e 100644 --- a/src/scene/workspacescene.h +++ b/src/scene/workspacescene.h @@ -11,7 +11,7 @@ #include "scene/scene.h" -#include "libkwineffects/colorspace.h" +#include "core/colorspace.h" #include "libkwineffects/kwineffects.h" #include "utils/common.h" #include "window.h" diff --git a/src/scene/workspacescene_opengl.cpp b/src/scene/workspacescene_opengl.cpp index c733979e86..5225fb22ca 100644 --- a/src/scene/workspacescene_opengl.cpp +++ b/src/scene/workspacescene_opengl.cpp @@ -13,7 +13,7 @@ */ #include "workspacescene_opengl.h" -#include "libkwineffects/glplatform.h" +#include "opengl/glplatform.h" #include "compositor.h" #include "core/output.h" diff --git a/src/scene/workspacescene_opengl.h b/src/scene/workspacescene_opengl.h index 600c05a7ab..36ef8eb7eb 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/glutils.h" +#include "opengl/glutils.h" namespace KWin { diff --git a/src/scripting/scriptedeffect.cpp b/src/scripting/scriptedeffect.cpp index f33de90425..c83a66af8b 100644 --- a/src/scripting/scriptedeffect.cpp +++ b/src/scripting/scriptedeffect.cpp @@ -18,7 +18,7 @@ #include "screenedge.h" #include "workspace.h" // KDE -#include "libkwineffects/glutils.h" +#include "opengl/glutils.h" #include #include #include diff --git a/src/scripting/windowthumbnailitem.cpp b/src/scripting/windowthumbnailitem.cpp index 394e6fd28c..90e75b4c22 100644 --- a/src/scripting/windowthumbnailitem.cpp +++ b/src/scripting/windowthumbnailitem.cpp @@ -9,9 +9,9 @@ #include "windowthumbnailitem.h" #include "compositor.h" #include "core/renderbackend.h" +#include "core/rendertarget.h" +#include "core/renderviewport.h" #include "effects.h" -#include "libkwineffects/rendertarget.h" -#include "libkwineffects/renderviewport.h" #include "scene/itemrenderer.h" #include "scene/windowitem.h" #include "scene/workspacescene.h" @@ -20,8 +20,8 @@ #include "window.h" #include "workspace.h" -#include "libkwineffects/gltexture.h" -#include "libkwineffects/glutils.h" +#include "opengl/gltexture.h" +#include "opengl/glutils.h" #include #include diff --git a/src/utils/common.h b/src/utils/common.h index 785c08c6b7..7ba08bba5f 100644 --- a/src/utils/common.h +++ b/src/utils/common.h @@ -14,7 +14,7 @@ #include "config-kwin.h" // kwin #include "libkwineffects/kwinglobals.h" -#include "libkwineffects/version.h" +#include "utils/version.h" // Qt #include #include diff --git a/src/utils/edid.h b/src/utils/edid.h index 113d1fe5a4..d2424b5460 100644 --- a/src/utils/edid.h +++ b/src/utils/edid.h @@ -9,8 +9,8 @@ #pragma once +#include "core/colorspace.h" #include "kwin_export.h" -#include "libkwineffects/colorspace.h" #include #include diff --git a/src/utils/kernel.h b/src/utils/kernel.h index 34bcabab03..a99425f0c0 100644 --- a/src/utils/kernel.h +++ b/src/utils/kernel.h @@ -7,7 +7,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #pragma once -#include "libkwineffects/version.h" +#include "utils/version.h" #include diff --git a/src/libkwineffects/version.cpp b/src/utils/version.cpp similarity index 100% rename from src/libkwineffects/version.cpp rename to src/utils/version.cpp diff --git a/src/libkwineffects/version.h b/src/utils/version.h similarity index 87% rename from src/libkwineffects/version.h rename to src/utils/version.h index c3df431b80..5f0e78567f 100644 --- a/src/libkwineffects/version.h +++ b/src/utils/version.h @@ -21,7 +21,9 @@ public: Version(uint32_t major, uint32_t minor, uint32_t patch = 0); Version() = default; - auto operator<=>(const Version &other) const = default; + // clang-format off + auto operator<=> (const Version &other) const = default; + // clang-format on bool isValid() const; uint32_t majorVersion() const; uint32_t minorVersion() const; diff --git a/src/utils/xcbutils.h b/src/utils/xcbutils.h index eb084fa055..7c43b4e664 100644 --- a/src/utils/xcbutils.h +++ b/src/utils/xcbutils.h @@ -10,9 +10,9 @@ #include "libkwineffects/kwinglobals.h" #include "libkwineffects/kwinxcb.h" -#include "libkwineffects/version.h" #include "main.h" #include "utils/c_ptr.h" +#include "utils/version.h" #include #include diff --git a/src/wayland/frog_colormanagement_v1.h b/src/wayland/frog_colormanagement_v1.h index 246ff01a46..0544fe0a6f 100644 --- a/src/wayland/frog_colormanagement_v1.h +++ b/src/wayland/frog_colormanagement_v1.h @@ -5,7 +5,7 @@ */ #pragma once -#include "libkwineffects/colorspace.h" +#include "core/colorspace.h" #include "qwayland-server-frog-color-management-v1.h" #include diff --git a/src/wayland/surface.h b/src/wayland/surface.h index 1d7c06a3f7..5557eaa514 100644 --- a/src/wayland/surface.h +++ b/src/wayland/surface.h @@ -6,9 +6,9 @@ */ #pragma once +#include "core/colorspace.h" #include "core/output.h" #include "core/renderbackend.h" -#include "libkwineffects/colorspace.h" #include #include diff --git a/src/workspace.cpp b/src/workspace.cpp index 16bcb3863d..dbe3924f69 100644 --- a/src/workspace.cpp +++ b/src/workspace.cpp @@ -12,7 +12,7 @@ // own #include "workspace.h" // kwin libs -#include "libkwineffects/glplatform.h" +#include "opengl/glplatform.h" // kwin #include "core/output.h" #if KWIN_BUILD_ACTIVITIES diff --git a/src/x11syncmanager.cpp b/src/x11syncmanager.cpp index 24f72aa05f..a11684f759 100644 --- a/src/x11syncmanager.cpp +++ b/src/x11syncmanager.cpp @@ -14,7 +14,7 @@ #include "scene/workspacescene.h" #include "utils/common.h" -#include "libkwineffects/glplatform.h" +#include "opengl/glplatform.h" namespace KWin { diff --git a/src/x11syncmanager.h b/src/x11syncmanager.h index 9d30384654..38c52246d3 100644 --- a/src/x11syncmanager.h +++ b/src/x11syncmanager.h @@ -6,7 +6,7 @@ #pragma once -#include "libkwineffects/glutils.h" +#include "opengl/glutils.h" #include #include