Commit 4f639a7e by Yuly Novikov Committed by Commit Bot

Fix Ozone backend build flags.

Broken by http://crrev.com/c/2405806 ANGLE_USE_GBM must be defined in Display.cpp, not just GL backend. This also requires depending on libdrm for its headers. Bug: angleproject:3943, chromium:1181952 Change-Id: I4650d7806435413184b36c820cc6d06992f7f5cf Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2726575Reviewed-by: 's avatarShahbaz Youssefi <syoussefi@chromium.org> Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
parent 73afaf1e
...@@ -233,6 +233,9 @@ config("angle_gl_backend_config") { ...@@ -233,6 +233,9 @@ config("angle_gl_backend_config") {
if (angle_enable_gl_null) { if (angle_enable_gl_null) {
defines += [ "ANGLE_ENABLE_OPENGL_NULL" ] defines += [ "ANGLE_ENABLE_OPENGL_NULL" ]
} }
if (ozone_platform_gbm) {
defines += [ "ANGLE_USE_GBM" ]
}
if (is_apple) { if (is_apple) {
defines += [ "GL_SILENCE_DEPRECATION" ] defines += [ "GL_SILENCE_DEPRECATION" ]
} }
...@@ -244,7 +247,6 @@ angle_source_set("angle_gl_backend") { ...@@ -244,7 +247,6 @@ angle_source_set("angle_gl_backend") {
public_configs = [ ":angle_gl_backend_config" ] public_configs = [ ":angle_gl_backend_config" ]
public_deps = [ "$angle_root:libANGLE_headers" ] public_deps = [ "$angle_root:libANGLE_headers" ]
defines = []
deps = [ deps = [
"$angle_root:angle_gpu_info_util", "$angle_root:angle_gpu_info_util",
...@@ -277,8 +279,7 @@ angle_source_set("angle_gl_backend") { ...@@ -277,8 +279,7 @@ angle_source_set("angle_gl_backend") {
} }
} }
if (ozone_platform_gbm) { if (ozone_platform_gbm) {
configs += [ ":libdrm" ] public_configs += [ ":libdrm" ]
defines += [ "ANGLE_USE_GBM" ]
deps += [ "//third_party/minigbm" ] deps += [ "//third_party/minigbm" ]
} }
} }
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