diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2024-02-15 07:52:09 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-03-07 02:01:02 +0000 |
| commit | 9ec316d79aac27af073bfa31c950012604bdbf9f (patch) | |
| tree | 1b5897cdc0179c749d91982281a45b84b466953d | |
| parent | dd541669ed53fffcdb0552019388080a4e594bd0 (diff) | |
Fix pure wayland builds with vaapi
Add missing build flag checks.
This amends 1b7aaf1c7d98482cd6dc3d80aa0140fe9dd2c7d3.
Task-number: QTBUG-118035
Fixes: QTBUG-121589
Change-Id: I7dc6aae9898133e893b544e392076dc421a51f17
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
(cherry picked from commit fd1946fc90ec75582aa64bcf8f89940e2fc82120)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit c732837107e3d4fb172ce0a7d4cf4831b312922e)
| -rw-r--r-- | src/core/configure/BUILD.root.gn.in | 10 | ||||
| -rw-r--r-- | src/core/ozone/ozone_platform_qt.cpp | 5 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/core/configure/BUILD.root.gn.in b/src/core/configure/BUILD.root.gn.in index 7b61ff4ef..fe4f306b0 100644 --- a/src/core/configure/BUILD.root.gn.in +++ b/src/core/configure/BUILD.root.gn.in @@ -356,20 +356,24 @@ source_set("qtwebengine_sources") { "//components/embedder_support/user_agent_utils.cc", "//components/embedder_support/user_agent_utils.h", ] - if (use_ozone && use_vaapi) { + if (use_vaapi_x11) { deps += [ "//ui/base/x:gl", "//ui/gfx/linux:gpu_memory_buffer_support_x11", ] sources += [ - "//ui/ozone/platform/wayland/gpu/wayland_gl_egl_utility.cc", - "//ui/ozone/platform/wayland/gpu/wayland_gl_egl_utility.h", "//ui/ozone/platform/x11/gl_egl_utility_x11.cc", "//ui/ozone/platform/x11/gl_egl_utility_x11.h", "//ui/ozone/platform/x11/native_pixmap_glx_binding.cc", "//ui/ozone/platform/x11/native_pixmap_glx_binding.h", ] } + if (use_vaapi) { + sources += [ + "//ui/ozone/platform/wayland/gpu/wayland_gl_egl_utility.cc", + "//ui/ozone/platform/wayland/gpu/wayland_gl_egl_utility.h", + ] + } if (enable_extensions) { deps += [ ":qtwebengine_extensions_features", diff --git a/src/core/ozone/ozone_platform_qt.cpp b/src/core/ozone/ozone_platform_qt.cpp index 8dcb56446..12a204f20 100644 --- a/src/core/ozone/ozone_platform_qt.cpp +++ b/src/core/ozone/ozone_platform_qt.cpp @@ -70,13 +70,14 @@ public: static OzonePlatform::PlatformRuntimeProperties properties; #if BUILDFLAG(USE_VAAPI) if (has_initialized_gpu()) { +#if BUILDFLAG(USE_VAAPI_X11) if (GetQtXDisplay()) { // This property is set when the GetPlatformRuntimeProperties is // called on the gpu process side. properties.supports_native_pixmaps = ui::GpuMemoryBufferSupportX11::GetInstance()->has_gbm_device(); - } else { + } else +#endif properties.supports_native_pixmaps = true; // buffer_manager_->GetGbmDevice() != nullptr - } } #endif return properties; |