move more opengl related files to the opengl folder

This commit is contained in:
Xaver Hugl 2023-12-28 00:37:51 +01:00
parent b214251f81
commit 0ed66ed5d2
38 changed files with 60 additions and 54 deletions

View file

@ -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
)

View file

@ -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 <QTest>
#include <epoxy/egl.h>

View file

@ -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

View file

@ -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 <drm_fourcc.h>
#include <errno.h>

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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
{

View file

@ -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"

View file

@ -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"

View file

@ -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 <QOpenGLContext>
#include <drm_fourcc.h>

View file

@ -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<uint32_t, EglDisplay::DrmFormatInfo> 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");

View file

@ -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"

View file

@ -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 <errno.h>
#include <drm_fourcc.h>
#include <errno.h>
namespace KWin
{

View file

@ -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

View file

@ -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 <kwineglutils_p.h>
// Qt
#include <QOpenGLContext>

View file

@ -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"

View file

@ -9,7 +9,7 @@
*/
#include "eglhelpers.h"
#include "platformsupport/scenes/opengl/egldisplay.h"
#include "opengl/egldisplay.h"
#include <logging.h>

View file

@ -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"

View file

@ -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 <QOffscreenSurface>

View file

@ -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"

View file

@ -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