diff options
| author | Tor Lillqvist <tml@collabora.com> | 2016-01-26 11:17:57 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-02-08 14:14:55 +0000 |
| commit | 59ebd032b834f31f2b3069395f7e7962a0adfea2 (patch) | |
| tree | 5a123cad10bad8c6c9ec0d1e17a002431b78ca5a /toolkit | |
| parent | 572252b562075825a0ee7e8b6c2421d16e48f98c (diff) | |
tdf#97633 Add API to get the number of OpenGL buffer swaps, including ...
... through UNO
(cherry picked from commits dff18c2be9c72aa05940982f506804eb41d3d79a,
2c55288357c9d5410afae58c1fbb97cdfabf0360,
32d98b2551644dea50e58f99ae921a82a0f69753 and
4cd058f3f6568724c65ac88769f17fcc6078da23)
Change-Id: Iff29ac615ad4b6516790b1cbbde0215a3cd0efe6
Reviewed-on: https://gerrit.libreoffice.org/22209
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/Library_tk.mk | 5 | ||||
| -rw-r--r-- | toolkit/source/awt/vclxtoolkit.cxx | 12 |
2 files changed, 16 insertions, 1 deletions
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index e5aaad5083e4..1136e2e65896 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -21,7 +21,10 @@ $(eval $(call gb_Library_Library,tk)) $(eval $(call gb_Library_set_componentfile,tk,toolkit/util/tk)) -$(eval $(call gb_Library_use_external,tk,boost_headers)) +$(eval $(call gb_Library_use_externals,tk,\ + boost_headers \ + glew \ +)) $(eval $(call gb_Library_set_include,tk,\ $$(INCLUDE) \ diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 32aa182853f2..3b5548be561b 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -113,6 +113,7 @@ #include <vcl/window.hxx> #include <vcl/wrkwin.hxx> #include <vcl/throbber.hxx> +#include <vcl/opengl/OpenGLWrapper.hxx> #include "toolkit/awt/vclxspinbutton.hxx" #include <tools/debug.hxx> #include <comphelper/processfactory.hxx> @@ -195,6 +196,9 @@ public: virtual void SAL_CALL processEventsToIdle() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getOpenGLBufferSwapCounter() + throw (css::uno::RuntimeException, std::exception) override; + // css::awt::XToolkit css::uno::Reference< css::awt::XWindowPeer > SAL_CALL getDesktopWindow( ) throw(css::uno::RuntimeException, std::exception) override; css::awt::Rectangle SAL_CALL getWorkArea( ) throw(css::uno::RuntimeException, std::exception) override; @@ -1906,6 +1910,8 @@ void SAL_CALL VCLXToolkit::reschedule() Application::Reschedule(true); } +// css::awt::XToolkitExperimental + void SAL_CALL VCLXToolkit::processEventsToIdle() throw (css::uno::RuntimeException, std::exception) { @@ -1913,6 +1919,12 @@ void SAL_CALL VCLXToolkit::processEventsToIdle() Scheduler::ProcessEventsToIdle(); } +sal_Int64 SAL_CALL VCLXToolkit::getOpenGLBufferSwapCounter() + throw (css::uno::RuntimeException, std::exception) +{ + return OpenGLWrapper::getBufferSwapCounter(); +} + // css:awt:XToolkitRobot void SAL_CALL VCLXToolkit::keyPress( const css::awt::KeyEvent & aKeyEvent ) |