Kaydet (Commit) 1a41d97f authored tarafından Tor Lillqvist's avatar Tor Lillqvist

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
üst a1a9f0e5
...@@ -40,9 +40,12 @@ struct SC_DLLPUBLIC ScCalcConfig ...@@ -40,9 +40,12 @@ struct SC_DLLPUBLIC ScCalcConfig
formula::FormulaGrammar::AddressConvention meStringRefAddressSyntax; formula::FormulaGrammar::AddressConvention meStringRefAddressSyntax;
StringConversion meStringConversion; StringConversion meStringConversion;
bool mbEmptyStringAsZero:1; bool mbEmptyStringAsZero:1;
bool mbOpenCLEnabled:1; bool mbOpenCLEnabled:1;
bool mbOpenCLSubsetOnly:1;
bool mbOpenCLAutoSelect:1; bool mbOpenCLAutoSelect:1;
OUString maOpenCLDevice; OUString maOpenCLDevice;
int mnOpenCLMinimumFormulaGroupSize;
ScCalcConfig(); ScCalcConfig();
......
...@@ -13,8 +13,10 @@ ScCalcConfig::ScCalcConfig() : ...@@ -13,8 +13,10 @@ ScCalcConfig::ScCalcConfig() :
meStringRefAddressSyntax(formula::FormulaGrammar::CONV_UNSPECIFIED), meStringRefAddressSyntax(formula::FormulaGrammar::CONV_UNSPECIFIED),
meStringConversion(STRING_CONVERSION_LOCALE_DEPENDENT), // old LibreOffice behavior meStringConversion(STRING_CONVERSION_LOCALE_DEPENDENT), // old LibreOffice behavior
mbEmptyStringAsZero(false), mbEmptyStringAsZero(false),
mbOpenCLEnabled(false), mbOpenCLEnabled(true),
mbOpenCLAutoSelect(true) mbOpenCLSubsetOnly(true),
mbOpenCLAutoSelect(true),
mnOpenCLMinimumFormulaGroupSize(20)
{ {
} }
...@@ -38,8 +40,10 @@ bool ScCalcConfig::operator== (const ScCalcConfig& r) const ...@@ -38,8 +40,10 @@ bool ScCalcConfig::operator== (const ScCalcConfig& r) const
meStringConversion == r.meStringConversion && meStringConversion == r.meStringConversion &&
mbEmptyStringAsZero == r.mbEmptyStringAsZero && mbEmptyStringAsZero == r.mbEmptyStringAsZero &&
mbOpenCLEnabled == r.mbOpenCLEnabled && mbOpenCLEnabled == r.mbOpenCLEnabled &&
mbOpenCLSubsetOnly == r.mbOpenCLSubsetOnly &&
mbOpenCLAutoSelect == r.mbOpenCLAutoSelect && mbOpenCLAutoSelect == r.mbOpenCLAutoSelect &&
maOpenCLDevice == r.maOpenCLDevice; maOpenCLDevice == r.maOpenCLDevice &&
mnOpenCLMinimumFormulaGroupSize == r.mnOpenCLMinimumFormulaGroupSize;
} }
bool ScCalcConfig::operator!= (const ScCalcConfig& r) const bool ScCalcConfig::operator!= (const ScCalcConfig& r) const
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment