30 Commits

Author SHA1 Message Date
Michael Meeks
82d25c02f8 tdf#94006 - need an explicit dispose for GLContext's SystemChildWindow.
Previously we would get an explicit ~OpenGLContext - and potentially
leave FMR's around for other OGC users, now we treat the other users
properly - we need an explicit dispose() to get Window::dispose ordering
right.

Change-Id: I5edcbd73399b6db3dbcfb391570f364f9ab0c70d
Reviewed-on: https://gerrit.libreoffice.org/18412
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2015-09-08 15:47:49 +00:00
Michael Meeks
56900a441d tdf#94006 - fix OpenGLContext mis-use in several places.
gltf rendering, OpenGL canvas, GL transitions & GL capable (charts)
Avoid GLX operations on un-initialized contexts.

Change-Id: I7f523640f66ab656896181e5c865879234f6640e
2015-09-08 13:04:02 +01:00
Daniel Robertson
720cea21f3 canvas: replace for_each with range-based for-loop
Replace ::std::for_each for a more readable range-based for loop in
cases in which the function object to be applied by for_each is more
readable as the body of a for loop.

Change-Id: I5ea0f6a464855b8cc8af38f211bb784dd91eca0d
Reviewed-on: https://gerrit.libreoffice.org/17775
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2015-08-16 18:30:15 +00:00
Norbert Thiebaud
e5ec630414 stop inclduing canvas/verbosetraces.hxx and canvas/debug.hxx
also clean-up and 'standardize' the include sections of canvas' source code

Change-Id: Ib437a41ea41ae2ea6528f755ae5b2828775aaf73
Reviewed-on: https://gerrit.libreoffice.org/17633
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
2015-08-11 03:57:18 +00:00
Norbert Thiebaud
326777b5d9 remove VERBOSE use from canva
in preparation to kill --enable-verbose in configure.ac
convert modules that use VERBOSE-YES/NO (uppercase) env variable
to do things differently at compile time
Convert canvas to use SAL_INFO/SAL_WARN mechanism instead of its
home-grown 'verbose logging'.

Change-Id: I2898d2309d421457839e3cd7078166c6da919882
Reviewed-on: https://gerrit.libreoffice.org/17619
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
2015-08-10 17:14:18 +00:00
Michael Stahl
9e90038b73 canvas: replace boost::function with std::function
Change-Id: Ia3644bc0d9db2159aa4e9f05ca2f36e60b63e6f4
2015-07-31 21:24:26 +02:00
Noel Grandin
a60cc5d62a com::sun::star->css in canvas
Change-Id: I23c3f774834bb7e84e2f02fe05fa9d844adadc9d
Reviewed-on: https://gerrit.libreoffice.org/17259
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2015-07-22 09:04:57 +00:00
Caolán McNamara
0f71828a95 cppcheck: noExplicitConstructor
Change-Id: I8b03c27188b02c3c4a9a9fbbe0df1fb1ae1c5caf
2015-06-08 11:14:38 +01:00
Tor Lillqvist
d883c12556 Get rid of the initial :: for the vcl namespace
We used it all over the place without leading :: already anyway, even
in many files in include. So let's be consistent. In the majority of
cases, prefer the easier-on-the-eyes choice, not the "safe" one.

In those files in include where *all* existing uses of ::vcl:: indeed
used the :: prefix, there let's keep it for consistency.

Change-Id: If99cb41d3bf290d38c601d91125c3c8d935e61d0
2015-04-30 07:27:52 +03:00
Noel Grandin
d07bf4aad4 loplugin:constantfunction: canvas
Change-Id: I2fb2c4ec0e9467d7ced05b0e815e0d5bd2ba74c3
2015-03-19 10:45:01 +02:00
Noel Grandin
827c46e7d7 fdo#82577: Handle Window
Put the VCL Window class in the vcl namespace. Avoids clash with the X11
Window typedef.

Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a
2014-09-23 14:11:39 +03:00
Markus Mohrhard
be7d3df141 remove SAL_DEBUGs introduced earlier
Change-Id: I901188b5b0a3e64e2407d039dd80f89cce8cf6de
2014-09-02 01:31:13 +02:00
Markus Mohrhard
7741e4c2e5 some temporary debug output 2014-09-02 01:08:48 +02:00
Markus Mohrhard
5522655317 fix shader names, the .glsl is attached in OpenGLHelper::LoadShader
Change-Id: I267c1fefa5330359f3aea0d57d38a153232b655f
2014-09-02 01:08:46 +02:00
Markus Mohrhard
30cf6528cc request a legacy context for OGLTrans
Change-Id: If001121da14ca9d15f6c36af30428f1851710524
2014-09-02 01:08:46 +02:00
Markus Mohrhard
282c16a371 fix OpenGL canvas windows build
Change-Id: Ic6ed9c69003fa79a60310dc0b010ffc0ca868791
2014-08-13 02:00:08 +02:00
Stephan Bergmann
12a1179bcb -Werror,-Wunused-private-field
Change-Id: I03d8f81b17341e128c9c0517ecca2a76f7b4552c
2014-08-08 10:10:00 +02:00
Markus Mohrhard
396fa3b663 reimplement custom sprite rendering with FBO
Change-Id: I8d7a54fac61a3072d4f34615e71e37c70dec4e50
2014-08-08 09:24:00 +02:00
Markus Mohrhard
779ae371b1 reuse OpenGLContext in OGL canvas
The only thing that needs to be reimplemented is the pbuffer based
custom sprite rendering. We should use a FBO with a texture backend
for that. This will also save several OpenGL context switches!

Change-Id: I4aef33ae2499e44c8b5f41c296d8721cb94a37a1
2014-08-08 09:24:00 +02:00
Markus Mohrhard
a7f3c73fd7 extract shaders to own file and use shared shader loading
Change-Id: I1af7e03a3e46f3cb49162be9351ce22f54d08c52
2014-08-08 09:23:59 +02:00
Stephan Bergmann
05a676e86c canvas: sal_Bool -> bool
Change-Id: I4292b0e8810fac781e64272b315dd32eced3623c
2014-07-02 11:45:45 +02:00
Noel Grandin
f0ae48b684 remove unnecessary NULL parameter passed to UNO Exception
.. now that we have a default value for that parameter

Change-Id: I54d6b0a0a01ce2f2e5168ada0c427424de0477bc
2014-05-29 09:01:40 +02:00
Noel Grandin
81bd29a61e canvas: sal_Bool->bool
Change-Id: I0f0fe3bb937299b4f00a46d7dda6764c9d21a18f
2014-05-08 11:44:53 +02:00
Noel Grandin
5babf1b903 remove unnecessary scope qualifier from sal_Bool uses
i.e. convert "::sal_Bool" to "sal_Bool"

Change-Id: Ie5943aee4fee617bf2670655558927ed25b7e067
2014-04-03 13:54:02 +02:00
Stephan Bergmann
362d4f0cd4 Explicitly mark overriding destructors as "virtual"
It appears that the C++ standard allows overriding destructors to be marked
"override," but at least some MSVC versions complain about it, so at least make
sure such destructors are explicitly marked "virtual."

Change-Id: I0e1cafa7584fd16ebdce61f569eae2373a71b0a1
2014-04-01 19:22:54 +02:00
Stephan Bergmann
70cc2b191b First batch of adding SAL_OVERRRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking
necessary to fix poor macro usage.

Change-Id: I71fa20213e86be10de332ece0aa273239df7b61a
2014-03-26 16:39:26 +01:00
Thorsten Behrens
7727b9e88d oglcanvas: OUString cleanup
Change-Id: If37ea29ba239c0affd8e5777c82db755ee03f1c2
2013-10-09 20:09:12 +02:00
Thorsten Behrens
1aae965d44 oglcanvas: ship comp registration, return device window.
Change-Id: I6c7e9416f908fd3b903eaef82492c1f4445b4e0c
2013-10-08 12:33:50 +02:00
Stephan Bergmann
2f5f2c7d3c -Werror,-Wunused-private-field
Change-Id: Ie8aaab5fb6042c4845cb5355db2ee1a1c66d9d92
2013-10-08 09:25:52 +02:00
Thorsten Behrens
e52f1bd7b3 Add opengl canvas implementation.
Adds opengl canvas implementation - display-list-based, all
rendering done as textured geometry. Needs shader support.

Currently compiles and works on Linux, Mac should be ~easy to
add, win32 eventually.

Change-Id: Ibf3eb88d6a36a91b2960a3a6320d708160e4fc14
2013-10-07 17:33:45 +02:00