diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_Version.js b/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_Version.js index 8d253420a7dd..d5ea5512d653 100755 --- a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_Version.js +++ b/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_Version.js @@ -129,6 +129,10 @@ function run_test() { status = gfxInfo.getFeatureStatus(Ci.nsIGfxInfo.FEATURE_DIRECT3D_11_ANGLE, failureId); do_check_eq(status, Ci.nsIGfxInfo.FEATURE_STATUS_OK); + status = gfxInfo.getFeatureStatus(Ci.nsIGfxInfo.FEATURE_DX_INTEROP2, failureId); + do_check_eq(status, Ci.nsIGfxInfo.FEATURE_BLOCKED_DRIVER_VERSION); + do_check_eq(failureId.value, "FEATURE_FAILURE_DL_BLACKLIST_NO_ID"); + gTestserver.stop(do_test_finished); } diff --git a/widget/nsIGfxInfo.idl b/widget/nsIGfxInfo.idl index bb93eb8e1738..210924e1b2f0 100644 --- a/widget/nsIGfxInfo.idl +++ b/widget/nsIGfxInfo.idl @@ -111,6 +111,8 @@ interface nsIGfxInfo : nsISupports const long FEATURE_VP8_HW_DECODE = 17; /* Whether hardware VP9 decoding is supported, starting in 48. */ const long FEATURE_VP9_HW_DECODE = 18; + /* Whether NV_dx_interop2 is supported, starting in 50. */ + const long FEATURE_DX_INTEROP2 = 19; /* * A set of return values from GetFeatureStatus diff --git a/widget/windows/GfxInfo.cpp b/widget/windows/GfxInfo.cpp index aea19eb82c4c..269abe99909f 100644 --- a/widget/windows/GfxInfo.cpp +++ b/widget/windows/GfxInfo.cpp @@ -1204,6 +1204,14 @@ GfxInfo::GetGfxDriverInfo() nsIGfxInfo::FEATURE_WEBGL_OPENGL, nsIGfxInfo::FEATURE_DISCOURAGED, DRIVER_LESS_THAN, V(10,18,13,6200), "WEBGL_NATIVE_GL_OLD_NVIDIA"); + //////////////////////////////////// + // FEATURE_DX_INTEROP2 + + // All AMD. + APPEND_TO_DRIVER_BLOCKLIST2(OperatingSystem::Windows, + (nsAString&) GfxDriverInfo::GetDeviceVendor(VendorAMD), GfxDriverInfo::allDevices, + nsIGfxInfo::FEATURE_DX_INTEROP2, nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION, + DRIVER_LESS_THAN, GfxDriverInfo::allDriverVersions, "DX_INTEROP2_AMD_CRASH"); } return *mDriverInfo; }