Tighten the workarounds on isnan for Intel drivers

include/platform/WorkaroundsD3D.h

@@ -91,8 +91,9 @@ struct WorkaroundsD3D
     bool rewriteUnaryMinusOperator = false;
 
     // On some Intel drivers, using isnan() on highp float will get wrong answer. To work around
-    // this bug, we use an expression to emulate function isnan(). Tracking bug:
-    // https://crbug.com/650547
+    // this bug, we use an expression to emulate function isnan().
+    // Tracking bug: https://crbug.com/650547
+    // This driver bug is fixed in 21.20.16.4542.
     bool emulateIsnanFloat = false;
 
     // On some Intel drivers, using clear() may not take effect. One of such situation is to clear

src/libANGLE/renderer/d3d/d3d11/renderer11_utils.cpp

@@ -1858,8 +1858,21 @@ angle::WorkaroundsD3D GenerateWorkarounds(const Renderer11DeviceCaps &deviceCaps
     workarounds.rewriteUnaryMinusOperator =
         IsIntel(adapterDesc.VendorId) &&
         (IsBroadwell(adapterDesc.DeviceId) || IsHaswell(adapterDesc.DeviceId));
-    workarounds.emulateIsnanFloat =
-        IsIntel(adapterDesc.VendorId) && IsSkylake(adapterDesc.DeviceId);
+    if (IsIntel(adapterDesc.VendorId) && IsSkylake(adapterDesc.DeviceId))
+    {
+        if (deviceCaps.driverVersion.valid())
+        {
+            WORD part1 = HIWORD(deviceCaps.driverVersion.value().LowPart);
+            WORD part2 = LOWORD(deviceCaps.driverVersion.value().LowPart);
+
+            // Disable the workaround on the new fixed driver.
+            workarounds.emulateIsnanFloat = part1 <= 16u && part2 < 4542u;
+        }
+        else
+        {
+            workarounds.emulateIsnanFloat = true;
+        }
+    }
     workarounds.callClearTwiceOnSmallTarget =
         IsIntel(adapterDesc.VendorId) && IsSkylake(adapterDesc.DeviceId);