Commit 40e2e163 authored by Nancy Wang's avatar Nancy Wang Committed by Chromium LUCI CQ

Revert "Disable Vulkan for LACROS"

This reverts commit bc24c252.

Reason for revert: <INSERT REASONING HERE>
It looks like this CL breaks below tests:
GpuDataManagerImplPrivateTest.FallbackFromVulkanToGL
GpuDataManagerImplPrivateTest.VulkanInitializationFails
GpuDataManagerImplPrivateTest.FallbackFromVulkanWithGLDisabled
GpuDataManagerImplPrivateTest.GpuStartsWithVulkanFeatureFlag

https://ci.chromium.org/p/chromium/builders/ci/linux-lacros-tester-rel/5190

https://ci.chromium.org/p/chromium/builders/ci/linux-lacros-tester-rel

Original change's description:
> Disable Vulkan for LACROS
>
> Bug: 1155622
> Change-Id: I8def57cef648ec4881f666aec614200d13eac972
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2577815
> Auto-Submit: Peng Huang <penghuang@chromium.org>
> Commit-Queue: Erik Chen <erikchen@chromium.org>
> Reviewed-by: Erik Chen <erikchen@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#834507}

TBR=penghuang@chromium.org,rjkroege@chromium.org,erikchen@chromium.org,chromium-scoped@luci-project-accounts.iam.gserviceaccount.com

Change-Id: I249afa54900b08acbd75b37ac3e15d853b6bb32c
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1155622
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2578418Reviewed-by: default avatarNancy Wang <nancylingwang@chromium.org>
Commit-Queue: Nancy Wang <nancylingwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#834558}
parent d00ff1d2
......@@ -10,7 +10,6 @@
#include "base/logging.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
#include "build/chromeos_buildflags.h"
#include "build/build_config.h"
#include "gpu/command_buffer/common/gles2_cmd_utils.h"
#include "gpu/command_buffer/service/context_group.h"
......@@ -201,13 +200,6 @@ VulkanImplementationName ParseVulkanImplementationName(
}
#endif
#if BUILDFLAG(IS_CHROMEOS_LACROS)
// LACROS doesn't support Vulkan right now, to avoid LACROS picking up Linux
// finch, kNone is returned for LACROS.
// TODO(https://crbug.com/1155622): When LACROS is separated from Linux finch
// config.
return VulkanImplementationName::kNone;
#else
if (command_line->HasSwitch(switches::kUseVulkan)) {
auto value = command_line->GetSwitchValueASCII(switches::kUseVulkan);
if (value.empty() || value == switches::kVulkanImplementationNameNative) {
......@@ -227,7 +219,6 @@ VulkanImplementationName ParseVulkanImplementationName(
features::kVulkan.name, base::FeatureList::OVERRIDE_ENABLE_FEATURE)
? VulkanImplementationName::kForcedNative
: VulkanImplementationName::kNative;
#endif
}
} // namespace gles2
......
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