From 17f4cde9af31adac12780cec06328b45f5b59bab Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Tue, 11 Apr 2023 12:00:35 +0300 Subject: [PATCH] Drop kwineglext.h EGL_WL_bind_wayland_display definitions are needed only in one cpp file, so move them there instead. We need to duplicate EGL_WL_bind_wayland_display definitions because libepoxy doesn't define them for us. --- .../opengl/basiceglsurfacetexture_wayland.cpp | 11 ++++++++- .../scenes/opengl/kwineglext.h | 23 ------------------- 2 files changed, 10 insertions(+), 24 deletions(-) delete mode 100644 src/platformsupport/scenes/opengl/kwineglext.h diff --git a/src/platformsupport/scenes/opengl/basiceglsurfacetexture_wayland.cpp b/src/platformsupport/scenes/opengl/basiceglsurfacetexture_wayland.cpp index 20fe33ad1f..f0e7c0ad48 100644 --- a/src/platformsupport/scenes/opengl/basiceglsurfacetexture_wayland.cpp +++ b/src/platformsupport/scenes/opengl/basiceglsurfacetexture_wayland.cpp @@ -5,7 +5,6 @@ */ #include "platformsupport/scenes/opengl/basiceglsurfacetexture_wayland.h" -#include "kwineglext.h" #include "libkwineffects/kwingltexture.h" #include "platformsupport/scenes/opengl/abstract_egl_backend.h" #include "scene/surfaceitem_wayland.h" @@ -14,6 +13,16 @@ #include "wayland/linuxdmabufv1clientbuffer.h" #include "wayland/shmclientbuffer.h" +#ifndef EGL_WL_bind_wayland_display +#define EGL_WAYLAND_BUFFER_WL 0x31D5 +#define EGL_WAYLAND_PLANE_WL 0x31D6 +#define EGL_TEXTURE_Y_U_V_WL 0x31D7 +#define EGL_TEXTURE_Y_UV_WL 0x31D8 +#define EGL_TEXTURE_Y_XUXV_WL 0x31D9 +#define EGL_TEXTURE_EXTERNAL_WL 0x31DA +#define EGL_WAYLAND_Y_INVERTED_WL 0x31DB +#endif // EGL_WL_bind_wayland_display + namespace KWin { diff --git a/src/platformsupport/scenes/opengl/kwineglext.h b/src/platformsupport/scenes/opengl/kwineglext.h deleted file mode 100644 index 3895bc8632..0000000000 --- a/src/platformsupport/scenes/opengl/kwineglext.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - KWin - the KDE window manager - This file is part of the KDE project. - - SPDX-FileCopyrightText: 2018 Fredrik Höglund - SPDX-FileCopyrightText: 2020 Vlad Zahorodnii - - SPDX-License-Identifier: GPL-2.0-or-later -*/ - -#pragma once - -#include - -#ifndef EGL_WL_bind_wayland_display -#define EGL_WAYLAND_BUFFER_WL 0x31D5 -#define EGL_WAYLAND_PLANE_WL 0x31D6 -#define EGL_TEXTURE_Y_U_V_WL 0x31D7 -#define EGL_TEXTURE_Y_UV_WL 0x31D8 -#define EGL_TEXTURE_Y_XUXV_WL 0x31D9 -#define EGL_TEXTURE_EXTERNAL_WL 0x31DA -#define EGL_WAYLAND_Y_INVERTED_WL 0x31DB -#endif // EGL_WL_bind_wayland_display