diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-02-15 17:57:59 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-10-04 10:21:05 +0200 |
| commit | ef7f6c6ae7463d0e14bf15c57fb0ed5c2626c7c1 (patch) | |
| tree | 51fd4db9e9d154701b9539d2849ac336b97b6648 | |
| parent | 0080853ab63f0f28b835360839df87868a76f396 (diff) | |
| download | qtwebengine-chromium-ef7f6c6ae7463d0e14bf15c57fb0ed5c2626c7c1.tar.gz | |
Avoid using libdrm
Change-Id: I62f1048995935995a4f9c84bf636624c6d5ec14c
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | chromium/content/gpu/BUILD.gn | 2 | ||||
| -rw-r--r-- | chromium/gpu/ipc/common/gpu_memory_buffer_support.cc | 2 | ||||
| -rw-r--r-- | chromium/gpu/ipc/service/gpu_memory_buffer_factory_native_pixmap.cc | 5 | ||||
| -rw-r--r-- | chromium/ui/gfx/native_pixmap_handle.cc | 4 |
4 files changed, 8 insertions, 5 deletions
diff --git a/chromium/content/gpu/BUILD.gn b/chromium/content/gpu/BUILD.gn index 049ff7bcee1..e777cefe7f4 100644 --- a/chromium/content/gpu/BUILD.gn +++ b/chromium/content/gpu/BUILD.gn @@ -137,7 +137,7 @@ target(link_target_type, "gpu_sources") { # Use DRI on desktop Linux builds. if (current_cpu != "s390x" && current_cpu != "ppc64" && (is_linux || is_chromeos_lacros) && - (!is_chromecast || is_cast_desktop_build)) { + ((!is_chromecast || is_cast_desktop_build) && !use_qt)) { configs += [ "//build/config/linux/dri" ] } } diff --git a/chromium/gpu/ipc/common/gpu_memory_buffer_support.cc b/chromium/gpu/ipc/common/gpu_memory_buffer_support.cc index 0e0b612894b..fbbb182e1d3 100644 --- a/chromium/gpu/ipc/common/gpu_memory_buffer_support.cc +++ b/chromium/gpu/ipc/common/gpu_memory_buffer_support.cc @@ -53,7 +53,7 @@ GpuMemoryBufferSupport::GpuMemoryBufferSupport() { return; } #endif -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(TOOLKIT_QT) client_native_pixmap_factory_.reset( gfx::CreateClientNativePixmapFactoryDmabuf()); #endif diff --git a/chromium/gpu/ipc/service/gpu_memory_buffer_factory_native_pixmap.cc b/chromium/gpu/ipc/service/gpu_memory_buffer_factory_native_pixmap.cc index b645f8b38eb..6be8d881dd3 100644 --- a/chromium/gpu/ipc/service/gpu_memory_buffer_factory_native_pixmap.cc +++ b/chromium/gpu/ipc/service/gpu_memory_buffer_factory_native_pixmap.cc @@ -191,8 +191,9 @@ GpuMemoryBufferFactoryNativePixmap::CreateImageForGpuMemoryBuffer( surface_handle, size, format, std::move(handle.native_pixmap_handle)); } -#endif -#if !defined(OS_FUCHSIA) +#elif defined(TOOLKIT_QT) + return nullptr; +#elif !defined(OS_FUCHSIA) if (!pixmap) { DCHECK_EQ(surface_handle, gpu::kNullSurfaceHandle); pixmap = base::WrapRefCounted(new gfx::NativePixmapDmaBuf( diff --git a/chromium/ui/gfx/native_pixmap_handle.cc b/chromium/ui/gfx/native_pixmap_handle.cc index 137056bcdcd..da021867598 100644 --- a/chromium/ui/gfx/native_pixmap_handle.cc +++ b/chromium/ui/gfx/native_pixmap_handle.cc @@ -10,7 +10,9 @@ #include "build/build_config.h" #if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if !defined(TOOLKIT_QT) #include <drm_fourcc.h> +#endif #include "base/posix/eintr_wrapper.h" #endif @@ -21,7 +23,7 @@ namespace gfx { -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(TOOLKIT_QT) static_assert(NativePixmapHandle::kNoModifier == DRM_FORMAT_MOD_INVALID, "gfx::NativePixmapHandle::kNoModifier should be an alias for" "DRM_FORMAT_MOD_INVALID"); |