diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2024-01-16 09:37:16 +0100 |
|---|---|---|
| committer | Michael Brüning <michael.bruning@qt.io> | 2024-03-14 08:23:26 +0000 |
| commit | 0f491ae8386a44326ac31ec91c635a39e7d239e6 (patch) | |
| tree | e71690b1867ffde9288fdc1d291748dc1d8cbfbd /src/core/ozone/ozone_platform_qt.cpp | |
| parent | 2449499ddfdf14845ab40252b51c0fba1de4b9f7 (diff) | |
Clean up GLX code
- Remove unused GLX extension check functions
- Replace USE_GLX macro usage because it is expected to be
removed in the near future
Pulls in the following patches:
* e403fbe5937 FIXUP: Fix vaapi support for QtWebEngine
* f2b407a61be FIXUP: Restore GLX usage
Pick-to: 6.7.0 6.7
Change-Id: Icda14a8cb25ecb0b7b171ecd0e9ffeebcb0ddb97
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'src/core/ozone/ozone_platform_qt.cpp')
| -rw-r--r-- | src/core/ozone/ozone_platform_qt.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/ozone/ozone_platform_qt.cpp b/src/core/ozone/ozone_platform_qt.cpp index cc56b1c09..31862c3de 100644 --- a/src/core/ozone/ozone_platform_qt.cpp +++ b/src/core/ozone/ozone_platform_qt.cpp @@ -14,16 +14,13 @@ #include "ui/events/ozone/layout/stub/stub_keyboard_layout_engine.h" #include "ui/gfx/linux/client_native_pixmap_dmabuf.h" #include "ui/gfx/linux/client_native_pixmap_factory_dmabuf.h" -#include "ui/gfx/linux/gpu_memory_buffer_support_x11.h" #include "ui/ozone/common/bitmap_cursor_factory.h" -#include "ui/ozone/common/stub_client_native_pixmap_factory.h" #include "ui/ozone/common/stub_overlay_manager.h" #include "ui/ozone/public/gpu_platform_support_host.h" #include "ui/ozone/public/input_controller.h" #include "ui/ozone/public/ozone_platform.h" #include "ui/ozone/public/platform_screen.h" #include "ui/ozone/public/system_input_injector.h" -#include "ui/ozone/platform/x11/gl_egl_utility_x11.h" #include "ui/ozone/platform/wayland/gpu/wayland_gl_egl_utility.h" #include "ui/platform_window/platform_window_delegate.h" #include "ui/platform_window/platform_window_init_properties.h" @@ -42,6 +39,9 @@ #endif // BUILDFLAG(USE_XKBCOMMON) #if BUILDFLAG(OZONE_PLATFORM_X11) +#include "ui/gfx/linux/gpu_memory_buffer_support_x11.h" +#include "ui/ozone/platform/x11/gl_egl_utility_x11.h" + extern void *GetQtXDisplay(); #endif |