Hash :
b512e42d
Author :
Date :
2024-08-20T15:12:19
Reland: Metal: Fix availability for kIOMainPortDefault Remove ad hoc deprecation disables for kIOMasterPortDefault. macCatalyst kIOMainPortDefault available 15.0, less than minimum 15.6. Remove the ifdefs. Reland: Guard macOS specific unittests with compile guards. The patch changes the tested function to be macOS only. Bug: angleproject:360147118 Change-Id: Icbcc811a066995e742825a364fc5f0b5a27a59bc Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5816832 Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Kimmo Kinnunen <kkinnunen@apple.com> Commit-Queue: Geoff Lang <geofflang@chromium.org> Auto-Submit: Kimmo Kinnunen <kkinnunen@apple.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54
//
// Copyright 2013 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// SystemInfo_internal.h: Functions used by the SystemInfo_* files and unittests
#ifndef GPU_INFO_UTIL_SYSTEM_INFO_INTERNAL_H_
#define GPU_INFO_UTIL_SYSTEM_INFO_INTERNAL_H_
#include "common/platform.h"
#include "gpu_info_util/SystemInfo.h"
namespace angle
{
// Defined in SystemInfo_libpci when GPU_INFO_USE_LIBPCI is defined.
bool GetPCIDevicesWithLibPCI(std::vector<GPUDeviceInfo> *devices);
// Defined in SystemInfo_x11 when GPU_INFO_USE_X11 is defined.
bool GetNvidiaDriverVersionWithXNVCtrl(std::string *version);
// Target specific helper functions that can be compiled on all targets
// Live in SystemInfo.cpp
bool ParseAMDBrahmaDriverVersion(const std::string &content, std::string *version);
bool ParseAMDCatalystDriverVersion(const std::string &content, std::string *version);
bool CMDeviceIDToDeviceAndVendorID(const std::string &id, uint32_t *vendorId, uint32_t *deviceId);
#if defined(ANGLE_PLATFORM_MACOS) || defined(ANGLE_PLATFORM_MACCATALYST)
bool GetSystemInfo_mac(SystemInfo *info);
#else
bool GetSystemInfo_ios(SystemInfo *info);
#endif
#if defined(ANGLE_PLATFORM_MACOS) || defined(ANGLE_PLATFORM_MACCATALYST)
// Helper to get the active GPU ID from a given Core Graphics display ID.
uint64_t GetGpuIDFromDisplayID(uint32_t displayID);
# if ANGLE_ENABLE_CGL
// Helper to get the active GPU ID from an OpenGL display mask.
uint64_t GetGpuIDFromOpenGLDisplayMask(uint32_t displayMask);
# endif
#endif
#if defined(ANGLE_PLATFORM_MACOS) && ANGLE_ENABLE_METAL
// Get VendorID from metal device's registry ID
VendorID GetVendorIDFromMetalDeviceRegistryID(uint64_t registryID);
#endif
} // namespace angle
#endif // GPU_INFO_UTIL_SYSTEM_INFO_INTERNAL_H_