Insert some fairly generic fallback whitelist entries for now

Change-Id: I1887a32aeef8097e3e8297d6bddc51179dd65127

officecfg/registry/schema/org/openoffice/Office/Calc.xcs

@@ -1401,7 +1401,7 @@
           <info>
             <desc>Like OpenCLWhiteList, but for combinations known to be good.</desc>
           </info>
-          <value oor:separator=";">Linux/*/Advanced Micro Devices, Inc./*/1445.5 (sse2,avx)/</value>
+          <value oor:separator=";">Linux/*/Advanced Micro Devices, Inc./*/1445.5 (sse2,avx)/;*/*/Advanced Micro Devices, Inc./*/*/;*/*/Intel(R) Corporation/*/*/;*/*/NVIDIA Corporation/*/*/</value>
         </prop>
       </group>
       <group oor:name="Syntax">

sc/source/core/tool/calcconfig.cxx

@@ -45,9 +45,18 @@ void ScCalcConfig::setOpenCLConfigToDefault()
     maOpenCLSubsetOpCodes.insert(ocAverage);
     maOpenCLSubsetOpCodes.insert(ocSumIfs);
 
+    // This entry we have had for some time (when blacklisting was
+    // done elsewhere in the code), so presumably there is a known
+    // good reason for it.
     maOpenCLBlackList.insert(OpenCLImplMatcher("Windows", "*", "Intel(R) Corporation", "*", "9.17.10.2884", ""));
 
+    // This is what I have tested on Linux and it works for our unit tests.
     maOpenCLWhiteList.insert(OpenCLImplMatcher("Linux", "*", "Advanced Micro Devices, Inc.", "*", "1445.5 (sse2,avx)", ""));
+
+    // For now, assume that AMD, Intel and NVIDIA drivers are good
+    maOpenCLWhiteList.insert(OpenCLImplMatcher("*", "*", "Advanced Micro Devices, Inc.", "*", "*", ""));
+    maOpenCLWhiteList.insert(OpenCLImplMatcher("*", "*", "Intel(R) Corporation", "*", "*", ""));
+    maOpenCLWhiteList.insert(OpenCLImplMatcher("*", "*", "NVIDIA Corporation", "*", "*", ""));
 }
 
 void ScCalcConfig::reset()