Commit cd6c8fcb authored by Maksim Sisov's avatar Maksim Sisov Committed by Commit Bot

[ozone] move gbm wrapper into a separate source set.

This patch makes it possible to compile ozone/wayland
on systems without gbm available.

on a system without gbm available.

TEST: compile ozone/wayland with use_wayland_gbm = false
Change-Id: Ibda6632dcafe5ba0a46a819045b7f366d5c76a46
Reviewed-on: https://chromium-review.googlesource.com/c/1350983
Commit-Queue: Maksim Sisov <msisov@igalia.com>
Reviewed-by: default avatarMichael Spang <spang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#612093}
parent f85d2e4d
...@@ -7,18 +7,29 @@ import("//ui/ozone/ozone.gni") ...@@ -7,18 +7,29 @@ import("//ui/ozone/ozone.gni")
assert(ozone_platform_gbm || ozone_platform_wayland) assert(ozone_platform_gbm || ozone_platform_wayland)
source_set("linux") { source_set("drm") {
sources = [ sources = [
"drm_util_linux.cc", "drm_util_linux.cc",
"drm_util_linux.h", "drm_util_linux.h",
]
deps = [
"//base:base",
"//build/config/linux/libdrm",
"//ui/gfx:buffer_types",
]
}
source_set("gbm") {
sources = [
"gbm_buffer.h", "gbm_buffer.h",
"gbm_device.h", "gbm_device.h",
"gbm_wrapper.cc", "gbm_wrapper.cc",
] ]
deps = [ deps = [
":drm",
"//base:base", "//base:base",
"//build/config/linux/libdrm",
"//third_party/minigbm", "//third_party/minigbm",
"//ui/gfx:buffer_types", "//ui/gfx:buffer_types",
"//ui/gfx:memory_buffer", "//ui/gfx:memory_buffer",
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
# found in the LICENSE file. # found in the LICENSE file.
import("//build/config/linux/pkg_config.gni") import("//build/config/linux/pkg_config.gni")
import("//ui/ozone/ozone.gni")
import("//gpu/vulkan/features.gni") import("//gpu/vulkan/features.gni")
import("//ui/ozone/ozone.gni")
visibility = [ "//ui/ozone/*" ] visibility = [ "//ui/ozone/*" ]
...@@ -144,7 +144,8 @@ source_set("gbm") { ...@@ -144,7 +144,8 @@ source_set("gbm") {
"//ui/gl", "//ui/gl",
"//ui/ozone:ozone_base", "//ui/ozone:ozone_base",
"//ui/ozone/common", "//ui/ozone/common",
"//ui/ozone/common/linux", "//ui/ozone/common/linux:drm",
"//ui/ozone/common/linux:gbm",
"//ui/ozone/public/interfaces", "//ui/ozone/public/interfaces",
"//ui/platform_window", "//ui/platform_window",
] ]
...@@ -191,7 +192,8 @@ source_set("gbm_unittests") { ...@@ -191,7 +192,8 @@ source_set("gbm_unittests") {
"//ui/gfx", "//ui/gfx",
"//ui/ozone:platform", "//ui/ozone:platform",
"//ui/ozone/common", "//ui/ozone/common",
"//ui/ozone/common/linux", "//ui/ozone/common/linux:drm",
"//ui/ozone/common/linux:gbm",
] ]
if (drm_commit_properties_on_page_flip) { if (drm_commit_properties_on_page_flip) {
......
...@@ -113,7 +113,7 @@ source_set("wayland") { ...@@ -113,7 +113,7 @@ source_set("wayland") {
"//ui/gfx/geometry", "//ui/gfx/geometry",
"//ui/ozone:ozone_base", "//ui/ozone:ozone_base",
"//ui/ozone/common", "//ui/ozone/common",
"//ui/ozone/common/linux", "//ui/ozone/common/linux:drm",
"//ui/ozone/public/interfaces/wayland:wayland_interfaces", "//ui/ozone/public/interfaces/wayland:wayland_interfaces",
"//ui/platform_window", "//ui/platform_window",
"//ui/platform_window/platform_window_handler", "//ui/platform_window/platform_window_handler",
...@@ -136,9 +136,8 @@ source_set("wayland") { ...@@ -136,9 +136,8 @@ source_set("wayland") {
deps += [ deps += [
"//build/config/linux/libdrm", "//build/config/linux/libdrm",
"//third_party/minigbm",
"//ui/gfx:memory_buffer", "//ui/gfx:memory_buffer",
"//ui/ozone/common/linux", "//ui/ozone/common/linux:gbm",
] ]
} }
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include "ui/ozone/public/interfaces/wayland/wayland_connection.mojom.h" #include "ui/ozone/public/interfaces/wayland/wayland_connection.mojom.h"
#if defined(WAYLAND_GBM) #if defined(WAYLAND_GBM)
#include "ui/ozone/common/linux/gbm_device.h" #include "ui/ozone/common/linux/gbm_device.h" // nogncheck
#endif #endif
struct wl_shm; struct wl_shm;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment