mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
353,400 Commits 1 Branch 0 Tags
fe39041f98b1abb3a23b43f399963487fe5b66b9
Commit Graph

44 Commits

Author SHA1 Message Date
Stephan Bergmann
498c314861 Hack to for now work around dpy == null crashing CppunitTest_chart2_* 
...since 2fc4f5cd75 "Register OpenGL windows to
ScGridWindow upon file load."  Should be revisited and fixed properly.

Change-Id: I5a3d08cb750fd9ec7c98d5b85250eaabd1c7a8b2
 2014-05-20 09:41:59 +02:00
Markus Mohrhard
bc5c536559 add missing OpenGL type error string 
Change-Id: I53a7eba4a4f8b1bd61381283b20190cfc05a138a
 2014-05-17 09:12:00 +02:00
Markus Mohrhard
3ddae832bb fix crash when glDebugMessageCallback is 0 despite feature being there 
Change-Id: I1e6986e1e56f78f10f4677f471d2bdea2231f787
Reviewed-on: https://gerrit.libreoffice.org/9331
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
 2014-05-12 15:54:24 +00:00
Markus Mohrhard
21130eaef9 we need glew initalized before testing through it for features 
Change-Id: I4999de29b2a12888129ab291344b239b8def373c
 2014-05-12 03:00:04 +02:00
Markus Mohrhard
7ffd1af722 move the renderToFile function to the helper to avoid the context 
Change-Id: I5493126047179d67b2f2ed0d3d5d936ebbaf4810
 2014-05-09 00:39:42 +02:00
Markus Mohrhard
6470b42ce8 chart2.opengl to vcl.opengl 
Change-Id: Idd3b6ddec5ba2fbc56b7b9eb45ff379425104527
 2014-05-09 00:39:42 +02:00
Markus Mohrhard
7ee5bd5b98 we only want a fb that allows window rendering 
Change-Id: I13d58c941e6a2411c3840b9efd341a4b827afc93
 2014-05-08 03:06:29 +02:00
Markus Mohrhard
720515987c correct check for double buffered rendering 
Change-Id: I52972cb477c77a86fa04aa876717db9740cc0113
 2014-05-08 03:06:29 +02:00
Markus Mohrhard
657004ae5c we only want fb configs that support double buffered rendering 
Change-Id: I808e36ccd2a0d1ad89af2449d709d24a92ecff4f
 2014-05-08 02:30:56 +02:00
Markus Mohrhard
81074d6080 fix the OpenGL offscreen rendering a bit 
Change-Id: I1f11cdff0de48e3281a58aec9ea37a78c637195e
 2014-05-06 07:25:49 +02:00
Markus Mohrhard
08a02bce23 sal_Bool to bool 
Change-Id: I2febe40b1128eefa8838f3dc0836863ed96c0048
 2014-05-06 07:25:48 +02:00
Jan Holesovsky
f585323f89 OpenGLContext: More error handling. 
Change-Id: Ib92adfc83c963ecfcfa7fdbc2ec71f363a181330
 2014-05-06 03:09:39 +02:00
Jan Holesovsky
d9fb35083d OpenGLContext: Use the right window handle on Windows. 
Change-Id: I77eaf1dad9ce4c855b5f88bd8568944fd4128227
 2014-05-06 03:07:50 +02:00
Jan Holesovsky
fc4000a9be openGL: More debug info. 
Change-Id: Ia2e09c92673b97fd48c4ede7ebb9ff47da821926
 2014-05-05 16:47:23 +02:00
Caolán McNamara
e1566d1a23 coverity#1210161 Uninitialized scalar variable 
Change-Id: I393aadc30190177b75f7f6b723c000b583697c37
 2014-04-29 17:17:54 +01:00
Caolán McNamara
9bd7e8f1d6 coverity#1210193 Uninitialized pointer field 
Change-Id: I8d9ee48fa7fb08aa7488d891121078024b13bd71
 2014-04-29 11:39:31 +01:00
Zolnai Tamás
4ee7708bc2 OpenGLContext: destroy context 
Change-Id: Ia779045d93361a4ca4bfe5027958a04fdebd2ca1
 2014-04-28 17:26:34 +02:00
Zolnai Tamás
039c9efa6d Introduce OpenGLContext::MakeCurrent for switching between contexts 
Change-Id: I00b06d1330241c4df3b07dc6e0019c49fd7aa521
 2014-04-28 17:26:34 +02:00
Zolnai Tamás
99a034f914 OpenGLHelper: extract BGRA buffer -> BitmepEx conversion 
Change-Id: I71edb2768d24f0c6686a9c94333447a5acc498b4
 2014-04-27 20:27:59 +02:00
Tor Lillqvist
fb57e17251 WaE: implicit conversion of literal of type 'sal_Bool' to 'bool' 
Change-Id: I259f3a192097fed449bbea28a18febccfd93db04
 2014-04-27 19:26:41 +03:00
Zolnai Tamás
1bf5639cb3 Fix mac build: explicitly check all platforms inside swapBuffers 
Plus some cosmetics

Change-Id: I42d989217a0b40a8a6a03c0ebc6c4aa14b34d387
 2014-04-27 12:47:52 +02:00
Zolnai Tamás
e112ac81d1 First try to render OpenGL content in a window 
Change-Id: Ibb7178330d356806cea2cfc972b361167d5a9340
 2014-04-27 12:34:07 +02:00
Zolnai Tamás
4db3805a2d OpenGLContext: use generateWinData inside window initialization 
Change-Id: I618dacceb88ddab1ca6d45a8669199354e4b6a6d
 2014-04-27 12:34:06 +02:00
Zolnai Tamás
d8719aa04a OpenGLContext: Provide all data for SystemChildWindow creation. 
Change-Id: I7a0ceee6c784af8240fb908f19622d4ede1f5a6a
 2014-04-27 12:34:05 +02:00
Markus Mohrhard
ce9f9de197 move the opengl headers to vcl/opengl for better separation 
Change-Id: I1bdd0fe0d27674da69a61bd8b438f0c9b050a337
 2014-04-15 01:51:28 +02:00
Tor Lillqvist
7232a2d520 Make libvclopengl build for iOS 
Change-Id: Id338d1fb8a1334fb4e984aff9494bab7f3c35dc1
 2014-04-08 17:05:28 +03:00
Markus Mohrhard
b6e5907f5a temporarily render to a file 
Change-Id: Ibfc8101f261489bf11f990ea3fe6ae2e74b99df9
 2014-04-08 04:38:23 +02:00
Markus Mohrhard
0869626e2b improve the code for temporary OpenGl context 
Change-Id: Ia66bf54539e67066a56bb50fb606e50e581bee73
 2014-04-08 04:38:22 +02:00
Markus Mohrhard
ed649cc481 call glewInit in vcl's OpenGLContext just once 
Change-Id: I9f9b50615e588e659c7fcdd016cf9ceb8407b974
 2014-04-08 04:38:22 +02:00
Markus Mohrhard
b458c16a43 fix crash when passing external Window to OpenGLContext::init 
The external window is not controlled by OpenGLContext so it is not
allowed to delete the window

Change-Id: Id2c79a3612cc875fd94b8cd1206b30af2f185875
 2014-04-08 04:38:20 +02:00
Markus Mohrhard
8325b7b49e prevent initializing the OpenGL context multiple times 
Change-Id: I2ebdbcd51938bc1dc61693ac392eed5d5e497a8d
 2014-04-08 04:38:20 +02:00
Markus Mohrhard
ee86c908d1 OSL_TRACE to SAL_INFO in opengl code 
Change-Id: I7bdefec1cf941d1a51b7777639c0979387e1b436
 2014-04-08 04:38:19 +02:00
Tor Lillqvist
50bf123ddb Kill superfluous vertical whitespace 
Change-Id: I81ce8fd7022bf283db668705efdfb0666f87bde9
 2014-04-02 16:54:18 +03:00
Zolnai Tamás
d834be0dac Init an opengl context bounded to an existent window. 
Via ViewObjectContact can we query a window.
It seems this window is the same which is used
by chart edit mode.

Change-Id: Ib6df4d58730774f3d86b453b8174a78bb2c8a45b
 2014-03-21 14:00:56 +01:00
Markus Mohrhard
418edcf057 fix multisample support in OpenGL 
Change-Id: I7e530f5ae8d83d275df554781847b525b38bf4c7
 2014-03-17 08:24:14 +01:00
Markus Mohrhard
5d42bbdcf8 windows fixes for opengl 
Change-Id: I2ee3bcf9f87b46c14af26adb82eabd43d9164adb
 2014-03-17 08:13:50 +01:00
Markus Mohrhard
6495015702 no need for OpenGLRender in OpenGLContext anymore 
Change-Id: I8506bcea49792cd1ef6ca451ca515b4669326c29
 2014-03-17 08:13:49 +01:00
Markus Mohrhard
3aa298e010 move the windows multisample code to OpenGLContext 
Change-Id: I531d058ff00b3b6eaf2bf7c889589058b1be7bd0
 2014-03-17 08:13:49 +01:00
Markus Mohrhard
40ea5e9dd0 Revert "Move OpenGLRender to vcl" 
This reverts commit 04b70c682e.

The OpenGLRender is not abstract enough for vcl. Leave it in chart2.

Conflicts:
	chart2/source/view/inc/DummyXShape.hxx
	chart2/source/view/main/OpenGLRender.hxx
	vcl/Library_vclopengl.mk

Change-Id: I5392c8ee34462ff49059126ca2284d8ebe1eb379
 2014-03-17 08:13:49 +01:00
Zolnai Tamás
57f7841fca Win build: explicit default contstructor/destructor ofor OpenGLConext 
Change-Id: I3f73da70ba798305b67dbb1a7becfa4f21166571
 2014-03-15 07:07:08 +01:00
Zolnai Tamás
a14e8c1cd6 Fix mac build: not define these locals for mac 
Change-Id: I9239e00aaed39eaf4e8a3afc79f78557a8708bf5
 2014-03-14 23:33:10 +01:00
Zolnai Tamás
a12de5aab0 Fix build: move namespace again. 
Change-Id: I60dd154cef72146a2f98ce72480091046fabd6f2
 2014-03-14 22:11:29 +01:00
Zolnai Tamás
be147e18e7 Fix build: namespace in wrong place. 
Change-Id: I1c13e8932b3b95267470963c2b64bb98026749dd
 2014-03-14 22:06:55 +01:00
Zolnai Tamás
a5d178b424 Introduce OpenGLContext in vclopengl 
Move DummyChart::initOpengl() and
DummyChart::initWindow into this class.

Change-Id: If3c1bb52cb2819019f0dda626612a164709b17ac
 2014-03-14 19:59:22 +01:00