diff options
| author | Tor Lillqvist <tml@collabora.com> | 2013-11-13 18:06:32 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2013-11-20 18:23:05 +0000 |
| commit | 25fb3d749c3184b96c79352be4990c9b4fa6c602 (patch) | |
| tree | 21f776990e73bbbf140103b4c236478fd53665e6 /sc/inc | |
| parent | 3e8df9eb9535349b2bbb1394794cffcae4b067ac (diff) | |
WIP: Background ahead-of-time OpenCL compilation
Change-Id: I6e9906fb68a22eb0adab753726ec0d62dd05fe9b
Diffstat (limited to 'sc/inc')
| -rw-r--r-- | sc/inc/formulacell.hxx | 15 | ||||
| -rw-r--r-- | sc/inc/types.hxx | 1 |
2 files changed, 11 insertions, 5 deletions
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx index 68648fc1049a..656eebb49ac4 100644 --- a/sc/inc/formulacell.hxx +++ b/sc/inc/formulacell.hxx @@ -20,15 +20,19 @@ #ifndef SC_FORMULACELL_HXX #define SC_FORMULACELL_HXX -#include "formularesult.hxx" +#include <set> + +#include <boost/noncopyable.hpp> -#include "formula/tokenarray.hxx" +#include <formula/tokenarray.hxx> +#include <osl/conditn.hxx> +#include <osl/mutex.hxx> #include <rtl/ref.hxx> -#include "svl/listener.hxx" +#include <svl/listener.hxx> + #include "types.hxx" -#include <set> -#include <boost/noncopyable.hpp> +#include "formularesult.hxx" namespace sc { @@ -54,6 +58,7 @@ struct SC_DLLPUBLIC ScFormulaCellGroup : boost::noncopyable ScTokenArray* mpCode; osl::Mutex maMutex; + osl::Condition maCompilationDone; sc::CompiledFormula* mpCompiledFormula; ScFormulaCell *mpTopCell; SCROW mnLength; // How many of these do we have ? diff --git a/sc/inc/types.hxx b/sc/inc/types.hxx index 170434124163..fc0e0e85c07b 100644 --- a/sc/inc/types.hxx +++ b/sc/inc/types.hxx @@ -59,6 +59,7 @@ const sal_uInt16 MatrixEdgeOpen = 32; enum GroupCalcState { GroupCalcEnabled, + GroupCalcOpenCLKernelCompilationScheduled, GroupCalcOpenCLKernelBinaryCreated, GroupCalcRunning, GroupCalcDisabled |