Skip to content

Use arch agnostic bin/graphics_detector #1869

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jmacnak wants to merge 1 commit into
base: main
Choose a base branch
from
+1 −24
Open

Use arch agnostic bin/graphics_detector #1869

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 1 addition & 24 deletions base/cvd/cuttlefish/host/commands/assemble_cvd/graphics_flags.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,20 +397,6 @@ Result<GuestRendererPreload> SelectGuestRendererPreload(

#endif

Result<std::string> GraphicsDetectorBinaryPath() {
const auto host_arch = HostArch();
switch (host_arch) {
case Arch::Arm64:
return HostBinaryPath("aarch64-linux-gnu/gfxstream_graphics_detector");
case Arch::X86:
case Arch::X86_64:
return HostBinaryPath("x86_64-linux-gnu/gfxstream_graphics_detector");
default:
break;
}
return CF_ERR("Graphics detector unavailable for host arch.");
}

bool IsAmdGpu(const gfxstream::proto::GraphicsAvailability& availability) {
return (availability.has_egl() &&
((availability.egl().has_gles2_availability() &&
Expand Down Expand Up @@ -539,18 +525,9 @@ GetGraphicsAvailabilityWithSubprocessCheck() {
#ifdef __APPLE__
return {};
#else
auto graphics_detector_binary_result = GraphicsDetectorBinaryPath();
if (!graphics_detector_binary_result.ok()) {
LOG(ERROR) << "Failed to run graphics detector, graphics detector path "
<< " not available: \n"
<< graphics_detector_binary_result.error().FormatForEnv()
<< ". Assuming no availability.";
return {};
}

TemporaryFile graphics_availability_file;

Command graphics_detector_cmd(graphics_detector_binary_result.value());
Command graphics_detector_cmd(HostBinaryPath("graphics_detector"));
graphics_detector_cmd.AddParameter(graphics_availability_file.path);

Result<std::string> graphics_detector_stdout =
Expand Down
Loading