Commit 2f40d46d authored by Michael Spang's avatar Michael Spang Committed by Commit Bot

ozone: Enable vulkan by default (reland)

Vulkan is enabled by default on Linux desktop (X11) builds. Enable it on
ozone as well to make sure we have build coverage.

Fix chromium.memory/Linux Chromium OS ASan LSan Tests issue by breaking
unnecessary dependency on //gpu/vulkan/init.

Bug: 887110
Test: compile
Change-Id: I298704cf3b199c5c4ecf5173e137293650c5734a
Reviewed-on: https://chromium-review.googlesource.com/1235286
Commit-Queue: Michael Spang <spang@chromium.org>
Reviewed-by: default avatarAntoine Labour <piman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#592885}
parent 6d032e72
...@@ -186,7 +186,7 @@ viz_component("common") { ...@@ -186,7 +186,7 @@ viz_component("common") {
"gpu/vulkan_in_process_context_provider.h", "gpu/vulkan_in_process_context_provider.h",
] ]
configs = [ "//third_party/vulkan:vulkan_config" ] configs = [ "//third_party/vulkan:vulkan_config" ]
deps += [ "//gpu/vulkan/init" ] deps += [ "//gpu/vulkan" ]
} }
if (is_win) { if (is_win) {
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
#include "components/viz/common/gpu/vulkan_in_process_context_provider.h" #include "components/viz/common/gpu/vulkan_in_process_context_provider.h"
#include "gpu/vulkan/buildflags.h" #include "gpu/vulkan/buildflags.h"
#include "gpu/vulkan/init/vulkan_factory.h"
#include "gpu/vulkan/vulkan_device_queue.h" #include "gpu/vulkan/vulkan_device_queue.h"
#include "gpu/vulkan/vulkan_function_pointers.h" #include "gpu/vulkan/vulkan_function_pointers.h"
#include "gpu/vulkan/vulkan_implementation.h" #include "gpu/vulkan/vulkan_implementation.h"
......
...@@ -8,7 +8,7 @@ import("//build/config/ui.gni") ...@@ -8,7 +8,7 @@ import("//build/config/ui.gni")
# For details see declare_args() in build/config/BUILDCONFIG.gn. # For details see declare_args() in build/config/BUILDCONFIG.gn.
declare_args() { declare_args() {
# Enable experimental vulkan backend. # Enable experimental vulkan backend.
enable_vulkan = (is_linux && use_x11) || is_android || is_fuchsia enable_vulkan = is_linux || is_android || is_fuchsia
# We want to temporarily disable Vulkan on Android to give us time to # We want to temporarily disable Vulkan on Android to give us time to
# investigate ways to reduce its binary size. # investigate ways to reduce its binary size.
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#endif #endif
#if defined(USE_X11) #if defined(USE_X11)
#include "gpu/vulkan/x/vulkan_implementation_x11.h" #include "gpu/vulkan/x/vulkan_implementation_x11.h" // nogncheck
#endif #endif
#if defined(USE_OZONE) #if defined(USE_OZONE)
......
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