Lift outdated NVIDIA test suppressions

src/tests/gl_tests/ClearTest.cpp

@@ -355,9 +355,11 @@ TEST_P(ClearTestES3, MixedSRGBClear)
 // flush or finish after ClearBufferfv or each draw.
 TEST_P(ClearTestES3, RepeatedClear)
 {
-    if (IsD3D11() && (IsNVIDIA() || IsIntel()))
+    if (IsD3D11() && IsIntel())
     {
-        std::cout << "Test skipped on Nvidia and Intel D3D11." << std::endl;
+        // Note that there's been a bug affecting this test on NVIDIA drivers as well, until fall
+        // 2016 driver releases.
+        std::cout << "Test skipped on Intel D3D11." << std::endl;
         return;
     }
 

src/tests/gl_tests/GLSLTest.cpp

@@ -1086,8 +1086,9 @@ TEST_P(GLSLTest_ES3, MissingReturnArrayOfStructs)
 // Verify that functions without return statements still compile
 TEST_P(GLSLTest_ES3, MissingReturnStructOfArrays)
 {
-    // TODO(cwallez) remove the suppression once NVIDIA removes the restriction for
-    // GLSL >= 300. It was defined only in GLSL 2.0, section 6.1.
+    // TODO(cwallez) remove the suppression once NVIDIA drivers are updated across trybots, drivers
+    // since late 2016 should have the fix. Last check on 2017-05-30 revealed that the Windows
+    // Server 2008 bots still had the old, failing drivers.
     if (IsNVIDIA() && IsOpenGLES())
     {
         std::cout << "Test skipped on NVIDIA OpenGL ES because it disallows returning "

src/tests/gl_tests/TransformFeedbackTest.cpp

@@ -501,21 +501,17 @@ TEST_P(TransformFeedbackTest, MultiplePaused)
 // contexts returns the correct results.  Helps expose bugs in ANGLE's virtual contexts.
 TEST_P(TransformFeedbackTest, MultiContext)
 {
-#if defined(ANGLE_PLATFORM_APPLE)
-    if ((IsNVIDIA() || IsAMD() || IsIntel()) && GetParam() == ES3_OPENGL())
+    if (IsOSX() && (IsNVIDIA() || IsAMD() || IsIntel()) && IsOpenGL())
     {
-        std::cout << "Test skipped on NVidia, AMD and Intel OpenGL on OSX." << std::endl;
+        std::cout << "Test skipped on NVIDIA, AMD and Intel OpenGL on OSX." << std::endl;
         return;
     }
-#endif
 
-#if defined(ANGLE_PLATFORM_LINUX)
-    if (IsAMD() && GetParam() == ES3_OPENGL())
+    if (IsLinux() && IsAMD() && IsOpenGL())
     {
         std::cout << "Test skipped on AMD OpenGL on Linux." << std::endl;
         return;
     }
-#endif
 
     EGLint contextAttributes[] = {
         EGL_CONTEXT_MAJOR_VERSION_KHR,