Commit 1070802c by Yuly Novikov Committed by Commit Bot

Skip Instanced MultiDrawTest.MultiDrawArrays on Mac Mini 8.1

Bug: angleproject:5265 Change-Id: I1d3f1802398472c0da2d00526bd7eb52f6596bea Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2508532Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
parent e77e3528
...@@ -103,8 +103,9 @@ constexpr VendorID kVendorID_VeriSilicon = 0x10002; ...@@ -103,8 +103,9 @@ constexpr VendorID kVendorID_VeriSilicon = 0x10002;
constexpr VendorID kVendorID_Kazan = 0x10003; constexpr VendorID kVendorID_Kazan = 0x10003;
// Known device IDs // Known device IDs
constexpr DeviceID kDeviceID_Swiftshader = 0xC0DE; constexpr DeviceID kDeviceID_Swiftshader = 0xC0DE;
constexpr DeviceID kDeviceID_Adreno540 = 0x5040001; constexpr DeviceID kDeviceID_Adreno540 = 0x5040001;
constexpr DeviceID kDeviceID_UHD630Mobile = 0x3E9B;
// Predicates on vendor IDs // Predicates on vendor IDs
bool IsAMD(VendorID vendorId); bool IsAMD(VendorID vendorId);
......
...@@ -467,6 +467,10 @@ TEST_P(MultiDrawTest, CanCompile) ...@@ -467,6 +467,10 @@ TEST_P(MultiDrawTest, CanCompile)
TEST_P(MultiDrawTest, MultiDrawArrays) TEST_P(MultiDrawTest, MultiDrawArrays)
{ {
ANGLE_SKIP_TEST_IF(!requestExtensions()); ANGLE_SKIP_TEST_IF(!requestExtensions());
// http://anglebug.com/5265
ANGLE_SKIP_TEST_IF(IsInstancedTest() && IsOSX() && IsIntelUHD630Mobile() && IsDesktopOpenGL());
SetupBuffers(); SetupBuffers();
SetupProgram(); SetupProgram();
DoDrawArrays(); DoDrawArrays();
......
...@@ -315,6 +315,11 @@ bool IsIntel() ...@@ -315,6 +315,11 @@ bool IsIntel()
return HasSystemVendorID(kVendorID_Intel); return HasSystemVendorID(kVendorID_Intel);
} }
bool IsIntelUHD630Mobile()
{
return HasSystemDeviceID(kVendorID_Intel, kDeviceID_UHD630Mobile);
}
bool IsAMD() bool IsAMD()
{ {
return HasSystemVendorID(kVendorID_AMD); return HasSystemVendorID(kVendorID_AMD);
......
...@@ -48,6 +48,7 @@ bool IsNVIDIA(); ...@@ -48,6 +48,7 @@ bool IsNVIDIA();
// GPU devices. // GPU devices.
bool IsSwiftshaderDevice(); bool IsSwiftshaderDevice();
bool IsIntelUHD630Mobile();
// Compiler configs. // Compiler configs.
inline bool IsASan() inline bool IsASan()
......
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