From 0ed66ed5d26135fc1ea485ca4024e5cf35ff4c64 Mon Sep 17 00:00:00 2001 From: Xaver Hugl Date: Thu, 28 Dec 2023 00:37:51 +0100 Subject: [PATCH] move more opengl related files to the opengl folder --- autotests/CMakeLists.txt | 4 +-- .../opengl_context_attribute_builder_test.cpp | 4 +-- src/CMakeLists.txt | 25 +++++++++++++++---- src/backends/drm/drm_egl_backend.cpp | 2 +- src/backends/drm/drm_egl_layer_surface.cpp | 6 ++--- src/backends/drm/drm_virtual_egl_layer.cpp | 4 +-- src/backends/virtual/virtual_egl_backend.cpp | 4 +-- src/backends/wayland/wayland_egl_backend.cpp | 4 +-- .../standalone/x11_standalone_egl_backend.cpp | 2 +- .../standalone/x11_standalone_glx_backend.cpp | 2 +- ...standalone_glx_context_attribute_builder.h | 2 +- .../x11/windowed/x11_windowed_egl_backend.cpp | 4 +-- src/core/outputbackend.cpp | 2 +- ...tract_opengl_context_attribute_builder.cpp | 0 ...bstract_opengl_context_attribute_builder.h | 0 .../egl_context_attribute_builder.cpp | 0 .../egl_context_attribute_builder.h | 0 .../scenes => }/opengl/eglcontext.cpp | 6 ++--- .../scenes => }/opengl/eglcontext.h | 0 .../scenes => }/opengl/egldisplay.cpp | 7 +++--- .../scenes => }/opengl/egldisplay.h | 0 .../eglimagetexture.cpp} | 2 +- .../eglimagetexture.h} | 0 .../scenes => }/opengl/eglnativefence.cpp | 0 .../scenes => }/opengl/eglnativefence.h | 0 .../scenes => }/opengl/eglswapchain.cpp | 6 ++--- .../scenes => }/opengl/eglswapchain.h | 0 src/{kwineglutils_p.h => opengl/eglutils_p.h} | 0 .../scenes => }/opengl/glrendertimequery.cpp | 0 .../scenes => }/opengl/glrendertimequery.h | 0 .../scenes/opengl/CMakeLists.txt | 6 ----- .../scenes/opengl/abstract_egl_backend.cpp | 6 ++--- .../scenes/opengl/abstract_egl_backend.h | 4 +-- src/plugins/qpa/eglhelpers.cpp | 2 +- src/plugins/qpa/eglplatformcontext.cpp | 4 +-- src/plugins/qpa/offscreensurface.cpp | 2 +- src/plugins/screencast/screencaststream.cpp | 2 +- src/utils/CMakeLists.txt | 2 -- 38 files changed, 60 insertions(+), 54 deletions(-) rename src/{utils => opengl}/abstract_opengl_context_attribute_builder.cpp (100%) rename src/{utils => opengl}/abstract_opengl_context_attribute_builder.h (100%) rename src/{utils => opengl}/egl_context_attribute_builder.cpp (100%) rename src/{utils => opengl}/egl_context_attribute_builder.h (100%) rename src/{platformsupport/scenes => }/opengl/eglcontext.cpp (98%) rename src/{platformsupport/scenes => }/opengl/eglcontext.h (100%) rename src/{platformsupport/scenes => }/opengl/egldisplay.cpp (97%) rename src/{platformsupport/scenes => }/opengl/egldisplay.h (100%) rename src/{platformsupport/scenes/opengl/kwineglimagetexture.cpp => opengl/eglimagetexture.cpp} (97%) rename src/{platformsupport/scenes/opengl/kwineglimagetexture.h => opengl/eglimagetexture.h} (100%) rename src/{platformsupport/scenes => }/opengl/eglnativefence.cpp (100%) rename src/{platformsupport/scenes => }/opengl/eglnativefence.h (100%) rename src/{platformsupport/scenes => }/opengl/eglswapchain.cpp (97%) rename src/{platformsupport/scenes => }/opengl/eglswapchain.h (100%) rename src/{kwineglutils_p.h => opengl/eglutils_p.h} (100%) rename src/{platformsupport/scenes => }/opengl/glrendertimequery.cpp (100%) rename src/{platformsupport/scenes => }/opengl/glrendertimequery.h (100%) diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt index e0dbb45660..a171968333 100644 --- a/autotests/CMakeLists.txt +++ b/autotests/CMakeLists.txt @@ -175,8 +175,8 @@ add_test(NAME kwin-testX11TimestampUpdate COMMAND testX11TimestampUpdate) ecm_mark_as_test(testX11TimestampUpdate) set(testOpenGLContextAttributeBuilder_SRCS - ../src/utils/abstract_opengl_context_attribute_builder.cpp - ../src/utils/egl_context_attribute_builder.cpp + ../src/opengl/abstract_opengl_context_attribute_builder.cpp + ../src/opengl/egl_context_attribute_builder.cpp opengl_context_attribute_builder_test.cpp ) diff --git a/autotests/opengl_context_attribute_builder_test.cpp b/autotests/opengl_context_attribute_builder_test.cpp index c2a3cd6d17..edac63119e 100644 --- a/autotests/opengl_context_attribute_builder_test.cpp +++ b/autotests/opengl_context_attribute_builder_test.cpp @@ -6,8 +6,8 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include "utils/abstract_opengl_context_attribute_builder.h" -#include "utils/egl_context_attribute_builder.h" +#include "opengl/abstract_opengl_context_attribute_builder.h" +#include "opengl/egl_context_attribute_builder.h" #include #include diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8eaddcbf21..2bc8eeb0e9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -128,10 +128,18 @@ target_sources(kwin PRIVATE moving_client_x11_filter.cpp netinfo.cpp onscreennotification.cpp + opengl/abstract_opengl_context_attribute_builder.cpp + opengl/egl_context_attribute_builder.cpp + opengl/eglcontext.cpp + opengl/egldisplay.cpp + opengl/eglimagetexture.cpp + opengl/eglnativefence.cpp + opengl/eglswapchain.cpp opengl/glframebuffer.cpp opengl/gllut.cpp opengl/gllut3D.cpp opengl/glplatform.cpp + opengl/glrendertimequery.cpp opengl/glshader.cpp opengl/glshadermanager.cpp opengl/gltexture.cpp @@ -457,7 +465,6 @@ install(FILES keyboard_repeat.h killwindow.h kscreenintegration.h - kwineglutils_p.h layershellv1integration.h layershellv1window.h lidswitchtracker.h @@ -536,13 +543,11 @@ install(FILES DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwin/core COMPONENT Devel) install(FILES - utils/abstract_opengl_context_attribute_builder.h utils/c_ptr.h utils/common.h utils/damagejournal.h utils/drm_format_helper.h utils/edid.h - utils/egl_context_attribute_builder.h utils/executable_path.h utils/filedescriptor.h utils/kernel.h @@ -575,15 +580,25 @@ install(FILES DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwin/effect COMPONENT Devel) install(FILES + opengl/abstract_opengl_context_attribute_builder.h + opengl/egl_context_attribute_builder.h + opengl/eglcontext.h + opengl/egldisplay.h + opengl/eglimagetexture.h + opengl/eglnativefence.h + opengl/eglswapchain.h + opengl/eglutils_p.h opengl/glframebuffer.h - opengl/gllut.h opengl/gllut3D.h + opengl/gllut.h opengl/glplatform.h + opengl/glrendertimequery.h opengl/glshader.h opengl/glshadermanager.h opengl/gltexture.h - opengl/glutils.h + opengl/gltexture_p.h opengl/glutils_funcs.h + opengl/glutils.h opengl/glvertexbuffer.h opengl/openglcontext.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwin/opengl COMPONENT Devel diff --git a/src/backends/drm/drm_egl_backend.cpp b/src/backends/drm/drm_egl_backend.cpp index 14c866b393..72707e37cd 100644 --- a/src/backends/drm/drm_egl_backend.cpp +++ b/src/backends/drm/drm_egl_backend.cpp @@ -18,7 +18,7 @@ #include "drm_output.h" #include "drm_pipeline.h" #include "drm_virtual_egl_layer.h" -#include "kwineglutils_p.h" +#include "opengl/eglutils_p.h" // system #include #include diff --git a/src/backends/drm/drm_egl_layer_surface.cpp b/src/backends/drm/drm_egl_layer_surface.cpp index 4cffe7a641..1fdcb42399 100644 --- a/src/backends/drm/drm_egl_layer_surface.cpp +++ b/src/backends/drm/drm_egl_layer_surface.cpp @@ -16,10 +16,10 @@ #include "drm_gpu.h" #include "drm_logging.h" #include "icc_shader.h" +#include "opengl/eglnativefence.h" +#include "opengl/eglswapchain.h" #include "opengl/gllut.h" -#include "platformsupport/scenes/opengl/eglnativefence.h" -#include "platformsupport/scenes/opengl/eglswapchain.h" -#include "platformsupport/scenes/opengl/glrendertimequery.h" +#include "opengl/glrendertimequery.h" #include "platformsupport/scenes/qpainter/qpainterswapchain.h" #include "utils/drm_format_helper.h" diff --git a/src/backends/drm/drm_virtual_egl_layer.cpp b/src/backends/drm/drm_virtual_egl_layer.cpp index d948965942..5b4564f3e0 100644 --- a/src/backends/drm/drm_virtual_egl_layer.cpp +++ b/src/backends/drm/drm_virtual_egl_layer.cpp @@ -11,8 +11,8 @@ #include "drm_gpu.h" #include "drm_logging.h" #include "drm_virtual_output.h" -#include "platformsupport/scenes/opengl/eglswapchain.h" -#include "platformsupport/scenes/opengl/glrendertimequery.h" +#include "opengl/eglswapchain.h" +#include "opengl/glrendertimequery.h" #include "scene/surfaceitem_wayland.h" #include "wayland/surface.h" diff --git a/src/backends/virtual/virtual_egl_backend.cpp b/src/backends/virtual/virtual_egl_backend.cpp index 8102ac126a..3eb2c9a77f 100644 --- a/src/backends/virtual/virtual_egl_backend.cpp +++ b/src/backends/virtual/virtual_egl_backend.cpp @@ -8,10 +8,10 @@ */ #include "virtual_egl_backend.h" #include "core/gbmgraphicsbufferallocator.h" +#include "opengl/eglswapchain.h" +#include "opengl/glrendertimequery.h" #include "opengl/glutils.h" #include "platformsupport/scenes/opengl/basiceglsurfacetexture_wayland.h" -#include "platformsupport/scenes/opengl/eglswapchain.h" -#include "platformsupport/scenes/opengl/glrendertimequery.h" #include "utils/softwarevsyncmonitor.h" #include "virtual_backend.h" #include "virtual_logging.h" diff --git a/src/backends/wayland/wayland_egl_backend.cpp b/src/backends/wayland/wayland_egl_backend.cpp index a9ece751b5..21182b1110 100644 --- a/src/backends/wayland/wayland_egl_backend.cpp +++ b/src/backends/wayland/wayland_egl_backend.cpp @@ -10,10 +10,10 @@ #include "wayland_egl_backend.h" #include "core/gbmgraphicsbufferallocator.h" +#include "opengl/eglswapchain.h" +#include "opengl/glrendertimequery.h" #include "opengl/glutils.h" #include "platformsupport/scenes/opengl/basiceglsurfacetexture_wayland.h" -#include "platformsupport/scenes/opengl/eglswapchain.h" -#include "platformsupport/scenes/opengl/glrendertimequery.h" #include "wayland_backend.h" #include "wayland_display.h" #include "wayland_logging.h" diff --git a/src/backends/x11/standalone/x11_standalone_egl_backend.cpp b/src/backends/x11/standalone/x11_standalone_egl_backend.cpp index 470a00a437..3dfc893631 100644 --- a/src/backends/x11/standalone/x11_standalone_egl_backend.cpp +++ b/src/backends/x11/standalone/x11_standalone_egl_backend.cpp @@ -12,8 +12,8 @@ #include "core/overlaywindow.h" #include "core/renderloop_p.h" #include "opengl/glplatform.h" +#include "opengl/glrendertimequery.h" #include "options.h" -#include "platformsupport/scenes/opengl/glrendertimequery.h" #include "scene/surfaceitem_x11.h" #include "utils/c_ptr.h" #include "utils/softwarevsyncmonitor.h" diff --git a/src/backends/x11/standalone/x11_standalone_glx_backend.cpp b/src/backends/x11/standalone/x11_standalone_glx_backend.cpp index acf66f5df2..e904c151c0 100644 --- a/src/backends/x11/standalone/x11_standalone_glx_backend.cpp +++ b/src/backends/x11/standalone/x11_standalone_glx_backend.cpp @@ -28,8 +28,8 @@ #include "core/outputbackend.h" #include "core/overlaywindow.h" #include "core/renderloop_p.h" +#include "opengl/glrendertimequery.h" #include "options.h" -#include "platformsupport/scenes/opengl/glrendertimequery.h" #include "scene/surfaceitem_x11.h" #include "utils/xcbutils.h" #include "workspace.h" diff --git a/src/backends/x11/standalone/x11_standalone_glx_context_attribute_builder.h b/src/backends/x11/standalone/x11_standalone_glx_context_attribute_builder.h index b636c7e69a..f04e656c56 100644 --- a/src/backends/x11/standalone/x11_standalone_glx_context_attribute_builder.h +++ b/src/backends/x11/standalone/x11_standalone_glx_context_attribute_builder.h @@ -7,7 +7,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #pragma once -#include "utils/abstract_opengl_context_attribute_builder.h" +#include "opengl/abstract_opengl_context_attribute_builder.h" namespace KWin { diff --git a/src/backends/x11/windowed/x11_windowed_egl_backend.cpp b/src/backends/x11/windowed/x11_windowed_egl_backend.cpp index 47baec776a..816aa941c5 100644 --- a/src/backends/x11/windowed/x11_windowed_egl_backend.cpp +++ b/src/backends/x11/windowed/x11_windowed_egl_backend.cpp @@ -8,9 +8,9 @@ */ #include "x11_windowed_egl_backend.h" #include "core/gbmgraphicsbufferallocator.h" +#include "opengl/eglswapchain.h" +#include "opengl/glrendertimequery.h" #include "platformsupport/scenes/opengl/basiceglsurfacetexture_wayland.h" -#include "platformsupport/scenes/opengl/eglswapchain.h" -#include "platformsupport/scenes/opengl/glrendertimequery.h" #include "x11_windowed_backend.h" #include "x11_windowed_logging.h" #include "x11_windowed_output.h" diff --git a/src/core/outputbackend.cpp b/src/core/outputbackend.cpp index 1219df4c55..901fb909c9 100644 --- a/src/core/outputbackend.cpp +++ b/src/core/outputbackend.cpp @@ -10,9 +10,9 @@ #include "outputbackend.h" #include "inputbackend.h" +#include "opengl/egldisplay.h" #include "output.h" #include "outputconfiguration.h" -#include "platformsupport/scenes/opengl/egldisplay.h" #include "platformsupport/scenes/opengl/openglbackend.h" #include "platformsupport/scenes/qpainter/qpainterbackend.h" diff --git a/src/utils/abstract_opengl_context_attribute_builder.cpp b/src/opengl/abstract_opengl_context_attribute_builder.cpp similarity index 100% rename from src/utils/abstract_opengl_context_attribute_builder.cpp rename to src/opengl/abstract_opengl_context_attribute_builder.cpp diff --git a/src/utils/abstract_opengl_context_attribute_builder.h b/src/opengl/abstract_opengl_context_attribute_builder.h similarity index 100% rename from src/utils/abstract_opengl_context_attribute_builder.h rename to src/opengl/abstract_opengl_context_attribute_builder.h diff --git a/src/utils/egl_context_attribute_builder.cpp b/src/opengl/egl_context_attribute_builder.cpp similarity index 100% rename from src/utils/egl_context_attribute_builder.cpp rename to src/opengl/egl_context_attribute_builder.cpp diff --git a/src/utils/egl_context_attribute_builder.h b/src/opengl/egl_context_attribute_builder.h similarity index 100% rename from src/utils/egl_context_attribute_builder.h rename to src/opengl/egl_context_attribute_builder.h diff --git a/src/platformsupport/scenes/opengl/eglcontext.cpp b/src/opengl/eglcontext.cpp similarity index 98% rename from src/platformsupport/scenes/opengl/eglcontext.cpp rename to src/opengl/eglcontext.cpp index a541e089b4..e41f6130c5 100644 --- a/src/platformsupport/scenes/opengl/eglcontext.cpp +++ b/src/opengl/eglcontext.cpp @@ -9,12 +9,12 @@ #include "eglcontext.h" #include "core/graphicsbuffer.h" #include "egldisplay.h" -#include "kwineglimagetexture.h" -#include "kwineglutils_p.h" +#include "eglimagetexture.h" +#include "opengl/egl_context_attribute_builder.h" +#include "opengl/eglutils_p.h" #include "opengl/glutils.h" #include "utils/common.h" #include "utils/drm_format_helper.h" -#include "utils/egl_context_attribute_builder.h" #include #include diff --git a/src/platformsupport/scenes/opengl/eglcontext.h b/src/opengl/eglcontext.h similarity index 100% rename from src/platformsupport/scenes/opengl/eglcontext.h rename to src/opengl/eglcontext.h diff --git a/src/platformsupport/scenes/opengl/egldisplay.cpp b/src/opengl/egldisplay.cpp similarity index 97% rename from src/platformsupport/scenes/opengl/egldisplay.cpp rename to src/opengl/egldisplay.cpp index fe94effcf1..b9378e343b 100644 --- a/src/platformsupport/scenes/opengl/egldisplay.cpp +++ b/src/opengl/egldisplay.cpp @@ -8,8 +8,7 @@ */ #include "egldisplay.h" #include "core/graphicsbuffer.h" -#include "kwineglimagetexture.h" -#include "kwineglutils_p.h" +#include "opengl/eglutils_p.h" #include "opengl/glutils.h" #include "utils/common.h" @@ -267,8 +266,8 @@ QHash EglDisplay::queryImportFormats() cons return {}; } - typedef EGLBoolean (*eglQueryDmaBufFormatsEXT_func)(EGLDisplay dpy, EGLint max_formats, EGLint * formats, EGLint * num_formats); - typedef EGLBoolean (*eglQueryDmaBufModifiersEXT_func)(EGLDisplay dpy, EGLint format, EGLint max_modifiers, EGLuint64KHR * modifiers, EGLBoolean * external_only, EGLint * num_modifiers); + typedef EGLBoolean (*eglQueryDmaBufFormatsEXT_func)(EGLDisplay dpy, EGLint max_formats, EGLint *formats, EGLint *num_formats); + typedef EGLBoolean (*eglQueryDmaBufModifiersEXT_func)(EGLDisplay dpy, EGLint format, EGLint max_modifiers, EGLuint64KHR *modifiers, EGLBoolean *external_only, EGLint *num_modifiers); eglQueryDmaBufFormatsEXT_func eglQueryDmaBufFormatsEXT = nullptr; eglQueryDmaBufModifiersEXT_func eglQueryDmaBufModifiersEXT = nullptr; eglQueryDmaBufFormatsEXT = (eglQueryDmaBufFormatsEXT_func)eglGetProcAddress("eglQueryDmaBufFormatsEXT"); diff --git a/src/platformsupport/scenes/opengl/egldisplay.h b/src/opengl/egldisplay.h similarity index 100% rename from src/platformsupport/scenes/opengl/egldisplay.h rename to src/opengl/egldisplay.h diff --git a/src/platformsupport/scenes/opengl/kwineglimagetexture.cpp b/src/opengl/eglimagetexture.cpp similarity index 97% rename from src/platformsupport/scenes/opengl/kwineglimagetexture.cpp rename to src/opengl/eglimagetexture.cpp index 10ebf1bd1a..b2bed6197b 100644 --- a/src/platformsupport/scenes/opengl/kwineglimagetexture.cpp +++ b/src/opengl/eglimagetexture.cpp @@ -7,7 +7,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include "kwineglimagetexture.h" +#include "eglimagetexture.h" #include "egldisplay.h" #include "opengl/gltexture_p.h" diff --git a/src/platformsupport/scenes/opengl/kwineglimagetexture.h b/src/opengl/eglimagetexture.h similarity index 100% rename from src/platformsupport/scenes/opengl/kwineglimagetexture.h rename to src/opengl/eglimagetexture.h diff --git a/src/platformsupport/scenes/opengl/eglnativefence.cpp b/src/opengl/eglnativefence.cpp similarity index 100% rename from src/platformsupport/scenes/opengl/eglnativefence.cpp rename to src/opengl/eglnativefence.cpp diff --git a/src/platformsupport/scenes/opengl/eglnativefence.h b/src/opengl/eglnativefence.h similarity index 100% rename from src/platformsupport/scenes/opengl/eglnativefence.h rename to src/opengl/eglnativefence.h diff --git a/src/platformsupport/scenes/opengl/eglswapchain.cpp b/src/opengl/eglswapchain.cpp similarity index 97% rename from src/platformsupport/scenes/opengl/eglswapchain.cpp rename to src/opengl/eglswapchain.cpp index bf28122bc2..1ee35f9fef 100644 --- a/src/platformsupport/scenes/opengl/eglswapchain.cpp +++ b/src/opengl/eglswapchain.cpp @@ -7,15 +7,15 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include "platformsupport/scenes/opengl/eglswapchain.h" +#include "opengl/eglswapchain.h" #include "core/graphicsbuffer.h" #include "core/graphicsbufferallocator.h" +#include "opengl/eglcontext.h" #include "opengl/glutils.h" -#include "platformsupport/scenes/opengl/eglcontext.h" #include "utils/common.h" -#include #include +#include namespace KWin { diff --git a/src/platformsupport/scenes/opengl/eglswapchain.h b/src/opengl/eglswapchain.h similarity index 100% rename from src/platformsupport/scenes/opengl/eglswapchain.h rename to src/opengl/eglswapchain.h diff --git a/src/kwineglutils_p.h b/src/opengl/eglutils_p.h similarity index 100% rename from src/kwineglutils_p.h rename to src/opengl/eglutils_p.h diff --git a/src/platformsupport/scenes/opengl/glrendertimequery.cpp b/src/opengl/glrendertimequery.cpp similarity index 100% rename from src/platformsupport/scenes/opengl/glrendertimequery.cpp rename to src/opengl/glrendertimequery.cpp diff --git a/src/platformsupport/scenes/opengl/glrendertimequery.h b/src/opengl/glrendertimequery.h similarity index 100% rename from src/platformsupport/scenes/opengl/glrendertimequery.h rename to src/opengl/glrendertimequery.h diff --git a/src/platformsupport/scenes/opengl/CMakeLists.txt b/src/platformsupport/scenes/opengl/CMakeLists.txt index f3eaaeab6d..c2c04dbdcd 100644 --- a/src/platformsupport/scenes/opengl/CMakeLists.txt +++ b/src/platformsupport/scenes/opengl/CMakeLists.txt @@ -1,12 +1,6 @@ target_sources(kwin PRIVATE abstract_egl_backend.cpp basiceglsurfacetexture_wayland.cpp - eglcontext.cpp - egldisplay.cpp - eglnativefence.cpp - eglswapchain.cpp - glrendertimequery.cpp - kwineglimagetexture.cpp openglbackend.cpp openglsurfacetexture.cpp openglsurfacetexture_wayland.cpp diff --git a/src/platformsupport/scenes/opengl/abstract_egl_backend.cpp b/src/platformsupport/scenes/opengl/abstract_egl_backend.cpp index 31aa77b223..4b4ae68f5d 100644 --- a/src/platformsupport/scenes/opengl/abstract_egl_backend.cpp +++ b/src/platformsupport/scenes/opengl/abstract_egl_backend.cpp @@ -10,16 +10,16 @@ #include "compositor.h" #include "core/outputbackend.h" #include "main.h" +#include "opengl/egl_context_attribute_builder.h" #include "utils/common.h" -#include "utils/egl_context_attribute_builder.h" #include "wayland/drmclientbuffer.h" #include "wayland_server.h" // kwin libs -#include "kwineglimagetexture.h" +#include "opengl/eglimagetexture.h" +#include "opengl/eglutils_p.h" #include "opengl/glplatform.h" #include "opengl/glutils.h" #include "utils/drm_format_helper.h" -#include // Qt #include diff --git a/src/platformsupport/scenes/opengl/abstract_egl_backend.h b/src/platformsupport/scenes/opengl/abstract_egl_backend.h index 3feeae21a6..0abd331ed6 100644 --- a/src/platformsupport/scenes/opengl/abstract_egl_backend.h +++ b/src/platformsupport/scenes/opengl/abstract_egl_backend.h @@ -7,8 +7,8 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #pragma once -#include "platformsupport/scenes/opengl/eglcontext.h" -#include "platformsupport/scenes/opengl/egldisplay.h" +#include "opengl/eglcontext.h" +#include "opengl/egldisplay.h" #include "platformsupport/scenes/opengl/openglbackend.h" #include "wayland/linuxdmabufv1clientbuffer.h" diff --git a/src/plugins/qpa/eglhelpers.cpp b/src/plugins/qpa/eglhelpers.cpp index f3e0b884d6..7669a0ca9b 100644 --- a/src/plugins/qpa/eglhelpers.cpp +++ b/src/plugins/qpa/eglhelpers.cpp @@ -9,7 +9,7 @@ */ #include "eglhelpers.h" -#include "platformsupport/scenes/opengl/egldisplay.h" +#include "opengl/egldisplay.h" #include diff --git a/src/plugins/qpa/eglplatformcontext.cpp b/src/plugins/qpa/eglplatformcontext.cpp index 418c2d4f7f..b19f20aab5 100644 --- a/src/plugins/qpa/eglplatformcontext.cpp +++ b/src/plugins/qpa/eglplatformcontext.cpp @@ -13,9 +13,9 @@ #include "eglhelpers.h" #include "internalwindow.h" #include "offscreensurface.h" +#include "opengl/eglcontext.h" +#include "opengl/egldisplay.h" #include "opengl/glutils.h" -#include "platformsupport/scenes/opengl/eglcontext.h" -#include "platformsupport/scenes/opengl/egldisplay.h" #include "swapchain.h" #include "window.h" diff --git a/src/plugins/qpa/offscreensurface.cpp b/src/plugins/qpa/offscreensurface.cpp index 866cb8d582..9cae99820b 100644 --- a/src/plugins/qpa/offscreensurface.cpp +++ b/src/plugins/qpa/offscreensurface.cpp @@ -11,7 +11,7 @@ #include "core/outputbackend.h" #include "eglhelpers.h" #include "main.h" -#include "platformsupport/scenes/opengl/egldisplay.h" +#include "opengl/egldisplay.h" #include diff --git a/src/plugins/screencast/screencaststream.cpp b/src/plugins/screencast/screencaststream.cpp index 7e7db1d2de..114f2d5c14 100644 --- a/src/plugins/screencast/screencaststream.cpp +++ b/src/plugins/screencast/screencaststream.cpp @@ -14,11 +14,11 @@ #include "cursor.h" #include "kwinscreencast_logging.h" #include "main.h" +#include "opengl/eglnativefence.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" #include "platformsupport/scenes/opengl/openglbackend.h" #include "scene/workspacescene.h" #include "screencastdmabuftexture.h" diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt index 9e67838ed5..629d17b869 100644 --- a/src/utils/CMakeLists.txt +++ b/src/utils/CMakeLists.txt @@ -1,9 +1,7 @@ target_sources(kwin PRIVATE - abstract_opengl_context_attribute_builder.cpp common.cpp drm_format_helper.cpp edid.cpp - egl_context_attribute_builder.cpp filedescriptor.cpp orientationsensor.cpp ramfile.cpp