diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-11-17 10:38:14 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-11-17 12:18:54 +0200 |
| commit | e6a441ccc19aacdde335c2282047631e0baf40cd (patch) | |
| tree | 5ebf930d31b3a294d5dccfa2d5b91057462f2f1d | |
| parent | fbe3a3cf6070caba35e0c7b8e6fffff15ed6136f (diff) | |
Insert some fairly generic fallback whitelist entries for now
Change-Id: I1887a32aeef8097e3e8297d6bddc51179dd65127
| -rw-r--r-- | officecfg/registry/schema/org/openoffice/Office/Calc.xcs | 2 | ||||
| -rw-r--r-- | sc/source/core/tool/calcconfig.cxx | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs index 6f2dc7c93ef2..d4e65eb86ffb 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs +++ b/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"> diff --git a/sc/source/core/tool/calcconfig.cxx b/sc/source/core/tool/calcconfig.cxx index 0ff048b71178..c93d48212835 100644 --- a/sc/source/core/tool/calcconfig.cxx +++ b/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() |