diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-10-30 15:40:54 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-11-06 11:49:23 +0200 |
| commit | 1a41d97fc65697e5d1602490a89e2cc84375f482 (patch) | |
| tree | b7d0af0ca9d28b77af76aae17334ddeef459df6d | |
| parent | a1a9f0e5c4f7d7331072854250a7eb9046e4f111 (diff) | |
Add more detailled configuration for OpenCL use, and make OpenCL default to on
Add a boolean whether to use OpenCL for just a subset of functions, and a
numberical minimum length of a cell group for OpenCL to be used. No
functionality or GUI for this yet implemented, just the setting fields.
Make whether to use OpenCL default to "on". Sure, this breaks stuff right and
left for now. Fixes and workarounds later.
Change-Id: I09b7aff9c7d1845df2bf01f09616e646373f030c
| -rw-r--r-- | sc/inc/calcconfig.hxx | 3 | ||||
| -rw-r--r-- | sc/source/core/tool/calcconfig.cxx | 10 |
2 files changed, 10 insertions, 3 deletions
diff --git a/sc/inc/calcconfig.hxx b/sc/inc/calcconfig.hxx index 33d31c749a7f..277d27a16219 100644 --- a/sc/inc/calcconfig.hxx +++ b/sc/inc/calcconfig.hxx @@ -40,9 +40,12 @@ struct SC_DLLPUBLIC ScCalcConfig formula::FormulaGrammar::AddressConvention meStringRefAddressSyntax; StringConversion meStringConversion; bool mbEmptyStringAsZero:1; + bool mbOpenCLEnabled:1; + bool mbOpenCLSubsetOnly:1; bool mbOpenCLAutoSelect:1; OUString maOpenCLDevice; + int mnOpenCLMinimumFormulaGroupSize; ScCalcConfig(); diff --git a/sc/source/core/tool/calcconfig.cxx b/sc/source/core/tool/calcconfig.cxx index 7975664b75b2..149f15ce9564 100644 --- a/sc/source/core/tool/calcconfig.cxx +++ b/sc/source/core/tool/calcconfig.cxx @@ -13,8 +13,10 @@ ScCalcConfig::ScCalcConfig() : meStringRefAddressSyntax(formula::FormulaGrammar::CONV_UNSPECIFIED), meStringConversion(STRING_CONVERSION_LOCALE_DEPENDENT), // old LibreOffice behavior mbEmptyStringAsZero(false), - mbOpenCLEnabled(false), - mbOpenCLAutoSelect(true) + mbOpenCLEnabled(true), + mbOpenCLSubsetOnly(true), + mbOpenCLAutoSelect(true), + mnOpenCLMinimumFormulaGroupSize(20) { } @@ -38,8 +40,10 @@ bool ScCalcConfig::operator== (const ScCalcConfig& r) const meStringConversion == r.meStringConversion && mbEmptyStringAsZero == r.mbEmptyStringAsZero && mbOpenCLEnabled == r.mbOpenCLEnabled && + mbOpenCLSubsetOnly == r.mbOpenCLSubsetOnly && mbOpenCLAutoSelect == r.mbOpenCLAutoSelect && - maOpenCLDevice == r.maOpenCLDevice; + maOpenCLDevice == r.maOpenCLDevice && + mnOpenCLMinimumFormulaGroupSize == r.mnOpenCLMinimumFormulaGroupSize; } bool ScCalcConfig::operator!= (const ScCalcConfig& r) const |