commit 7b94ba6bf5473fb6506895620a21ca5246d3068a
author Chris Blume <cblume@chromium.org> Thu Oct 25 20:39:11 2018
committer Commit Bot <commit-bot@chromium.org> Thu Oct 25 20:39:11 2018
tree 4dcaecfa3db3d0e7bc2e5ddf9b228b53470acaaa
parent a61b89311be5de95b7b915a5452a1fe85e3f77f0

Enable Vulkan on Android builds

Vulkan is currently disabled on Android builds. They were once enabled
but caused a binary size increase. We decided to disable Vulkan support
to give us time to investigate the binary size increase.

I investigated and wrote some patches that would allow us to keep the
binary size low on devices that cannot use Vulkan. However, those
patches are forced to increase complexity beyond the point we want to
support. So we're just going to re-enable Vulkan and accept the binary
size increase.

We'll loop back and double check before shipping a build with Vulkan to
double check the binary size hasn't increased further. Additionally,
we'll re-disable before each branch point until it will be used.

This patch will re-enable Vulkan on Android builds.

BUG=850725

Binary-Size: Increase is due to new Vulkan code paths and so cannot be avoided.
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: I248425d99529ef255497f05e5cf023afa9832804
Reviewed-on: https://chromium-review.googlesource.com/c/1287043
Reviewed-by: agrieve <agrieve@chromium.org>
Reviewed-by: Eric Karl <ericrk@chromium.org>
Commit-Queue: Chris Blume <cblume@chromium.org>
Cr-Commit-Position: refs/heads/master@{#602840}

gpu/vulkan/android/vulkan_implementation_android.cc

diff --git a/gpu/vulkan/android/vulkan_implementation_android.cc b/gpu/vulkan/android/vulkan_implementation_android.cc
index c5ef55a..c5f4c29c 100644
--- a/gpu/vulkan/android/vulkan_implementation_android.cc
+++ b/gpu/vulkan/android/vulkan_implementation_android.cc
@@ -30,7 +30,7 @@
   if (!vulkan_function_pointers->vulkan_loader_library_)
     return false;
 
-  if (!vulkan_instance_.Initialize(required_extensions)) {
+  if (!vulkan_instance_.Initialize(required_extensions, {})) {
     vulkan_instance_.Destroy();
     return false;
   }

gpu/vulkan/features.gni

diff --git a/gpu/vulkan/features.gni b/gpu/vulkan/features.gni
index d97fadb7..d55edde 100644
--- a/gpu/vulkan/features.gni
+++ b/gpu/vulkan/features.gni
@@ -8,5 +8,5 @@
 # For details see declare_args() in build/config/BUILDCONFIG.gn.
 declare_args() {
   # Enable experimental vulkan backend.
-  enable_vulkan = is_linux || is_fuchsia
+  enable_vulkan = is_linux || is_android || is_fuchsia
 }