Commit cc654250 authored by Peng Huang's avatar Peng Huang Committed by Chromium LUCI CQ

Reland "Disable Vulkan for LACROS"

This is a reland of bc24c252

add failed vulkan related test in the filter.

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}

Bug: 1155622
Change-Id: I9dde50222a5d947eab2c8b63bbcd6c5d8f4409fe
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2578170
Commit-Queue: Peng Huang <penghuang@chromium.org>
Reviewed-by: default avatarRobert Kroeger <rjkroege@chromium.org>
Reviewed-by: default avatarJonathan Backer <backer@chromium.org>
Reviewed-by: default avatarErik Chen <erikchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#835039}
parent 9ba30e03
......@@ -346,6 +346,8 @@ TEST_F(GpuDataManagerImplPrivateTest, FallbackFromMetalWithGLDisabled) {
#endif // OS_MAC
#if BUILDFLAG(ENABLE_VULKAN)
// TODO(crbug.com/1155622): enable tests when Vulkan is supported on LaCrOS.
#if !BUILDFLAG(IS_CHROMEOS_LACROS)
TEST_F(GpuDataManagerImplPrivateTest, GpuStartsWithUseVulkanFlag) {
base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
switches::kUseVulkan, switches::kVulkanImplementationNameNative);
......@@ -412,6 +414,7 @@ TEST_F(GpuDataManagerImplPrivateTest, FallbackFromVulkanWithGLDisabled) {
}
#endif // !OS_ANDROID && !OS_CHROMEOS
#endif // !OS_FUCHSIA
#endif // !IS_CHROMEOS_LACROS
#endif // BUILDFLAG(ENABLE_VULKAN)
} // namespace content
......@@ -10,6 +10,7 @@
#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"
......@@ -200,6 +201,13 @@ 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) {
......@@ -219,6 +227,7 @@ 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