Commit Graph

74 Commits

Author SHA1 Message Date
Markus Mohrhard
c49f057550 don't crash if the new create context method is not available
Change-Id: I50a8b89f83e095e5d8a110dfbf81ccadea4b39a5
2014-09-03 15:09:56 +02:00
Markus Mohrhard
6f5b639d4a don't create a core context if we need a legacy one
Change-Id: Ieb8a26e0495f537ca78898e6d49df2c1271537a0
2014-09-03 15:09:56 +02:00
Markus Mohrhard
2b1ad741d7 create a 3.2 core context if supported in dbgutil mode
Change-Id: I2ef951590d23e8b805301b2ffc1b82213b898400
2014-09-03 15:09:55 +02:00
Markus Mohrhard
979f918a87 SAL_INFO -> SAL_WARN for important error message
Change-Id: I204ca62f77d580b9ebdf9e7d41c28e3f2675ef94
2014-09-03 15:09:55 +02:00
Markus Mohrhard
6f479a3207 SAL_INFO -> SAL_WARN for important error message
Change-Id: I52cf416286801c5eebc1dd395fb7cf592b985e92
2014-09-03 15:09:55 +02:00
Markus Mohrhard
8b384c946c support legacy and core context on OSX
Change-Id: Ib8cadb3f182ce49c0ca8b6ccaa95960eb8e5f9ae
2014-09-02 01:08:54 +02:00
Markus Mohrhard
6626d13529 fix non OSX build again
Change-Id: I3faccc9f70b1afb7cbefd5ba9b26612eb7cda1fd
2014-09-02 01:08:54 +02:00
Markus Mohrhard
4f321bd267 working OSX OpenGLContext
In contrast to the CGL solution this renders not only to a FBO but to a
rendering context.

Change-Id: I083795cab5ea6372efac312a1f5e0053066121ea
2014-09-02 01:08:53 +02:00
Markus Mohrhard
e65acd2ebb use SystemWindowData to request a NSOpenGLWindow
Change-Id: Ief50a2fc533846cd61be66b1ea166a992942083b
2014-09-02 01:08:52 +02:00
Markus Mohrhard
a5346d7f3d switch to a NSOpenGLView implementation
Change-Id: Ifed59a9e899abc900ddf27378eec6b641be061d3
2014-09-02 01:08:52 +02:00
Markus Mohrhard
7a7a8e1b32 add possibility to request a compatibility context
Change-Id: I0135e81f925fda19c06144d21d2f2b0efc9e57be
2014-09-02 01:08:45 +02:00
Markus Mohrhard
01a4949dac ignore aggressive Nvidia GLSL compiler error messages
Change-Id: Ifc83bd3fb1d0fcbc8056c72b2545a8a3aed00a64
2014-08-29 17:40:36 +02:00
Zolnai Tamás
a60cc58021 Upgrade libgltf to 0.0.1
News in this version:
- Solve some limitations of walkthrough mode (fdo#81425)
- Multisampling (better rendering quality, mainly at the edges)
- Better error handling (no crash in case of invalid input file)

Change-Id: I46fdf56b00476614487fbcc04178e43e33a01794
Reviewed-on: https://gerrit.libreoffice.org/11179
Reviewed-by: Zolnai Tamás <tamas.zolnai@collabora.com>
Tested-by: Zolnai Tamás <tamas.zolnai@collabora.com>
2014-08-29 05:01:31 -05:00
Markus Mohrhard
0b48025baf seems like the better approach for getting it working
Change-Id: I18d5ecc9a14a6eb8ad8c6ea5ec9835dbe8f5db40
2014-08-15 00:02:50 +02:00
Markus Mohrhard
882db332c1 add some error reporting to OSX OpenGL context code
Change-Id: I09f9a60b596a0b12a5031bb3db406d8ab6af0b89
2014-08-12 06:04:54 +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
Tor Lillqvist
e9c5022580 Blind fix attempt for compiling against the 10.6 SDK
Change-Id: I0ee5f4f709aa521d85974ebb6518d8f2bce3f513
2014-07-29 11:21:38 +03:00
Markus Mohrhard
887c088f20 make libgltf compile on OSX
Change-Id: Ie39292137f931bfd557f66c485e104cf5d5089b8
2014-07-23 21:51:42 +02:00
Markus Mohrhard
cc1bea8692 first part of OpenGL context work for OSX
Context is correctly created and the OpenGL calls no longer crash but it seems that I still have a buffer problem so nothing is shown on the screen.

Change-Id: Ia9cc585cd92c6049197dbfa47a41e30e130739ed
2014-07-16 14:58:39 +02:00
Markus Mohrhard
dde00f1f8a make threaded rendering work correctly, fdo#81110
The context may only be bound in one thread!

Change-Id: Ibb67f88c2f11fd48884ee39d89620193e4e5471b
2014-07-13 07:54:09 +02:00
Noel Grandin
3e82897353 improve the inlinesimplememberfunctions clang plugin
Change-Id: I6d5a952901648e01904ef5c37f953c517304d31e
2014-06-17 10:55:17 +02:00
weigao
29eceedd7b Modified the depth bit to 24
Change-Id: I57387f9250c0c62c3cab7a75571d001fef99fdb4
2014-06-10 15:58:25 +02:00
Markus Mohrhard
b2f412a395 Lsan: fix memory leak
Change-Id: I223e0587b5a82c1617a0e79a002472070d2d4402
2014-05-28 23:17:08 +02:00
Peter Senna Tschudin
3b24dcc8a8 Remove unnecessary semicolons
A simplified version of the semantic match that finds this problem is
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@r1@
statement S;
position p,p1;
@@
S@p1;@p

@script:python r2@
p << r1.p;
p1 << r1.p1;
@@
if p[0].line != p1[0].line_end:
    cocci.include_match(False)
@@
position r1.p;
@@
-;@p
// </smpl>

Change-Id: Ib9708d37fbb4c6060f88d5dae3814a2d37b2091e
Reviewed-on: https://gerrit.libreoffice.org/9493
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
2014-05-27 01:19:00 -05:00
Markus Mohrhard
c68c5e753d the variable is only available on linux 2014-05-23 03:02:32 +02:00
Markus Mohrhard
cfaa96546a Lsan: fix memory leak
Change-Id: I82a517a267cceaac4dd1030d45c67fc070e22def
2014-05-23 02:50:42 +02:00
Jan Holesovsky
f72d85e6fa Avoid blinking when doing operations in the spreadsheets.
Change-Id: I31d24ef32ef4bb9ea4b57d596cccd269d07d91ec
2014-05-21 10:36:54 +02:00
Jan Holesovsky
58cb649dbe Don't disable painting.
Change-Id: Ia7d8a49af756a642c393f47b7dc342b8e48b5eda
2014-05-21 12:18:29 +02:00
David Tardon
eccaf91ec9 use VCL's OpenGLContext for 3D transitions
Change-Id: I510518461eb8bc9669d0de2679c34c473f66b175
2014-05-20 15:48:51 +02:00
Tor Lillqvist
c3ed5f6d33 Fail early in OpenGLContext::ImplInit() on platforms where not yet implemented
So far this code apparently has not been invoked except in the very
special use cases for which it has been developed, and which
presumably aren't such that one would come across in "normal"
LibreOffice use.

But now it gets invoked unconditionally, in some unit tests even, and
letting it call glewInit(), which calls glGetString(), without any
OpenGL context, leads to a crash. So instead, explicitly fail early on
OS X (and iOS and Android).

Change-Id: Ia4547cc1ddff1aaa0190fcdb69506ad444214b7a
2014-05-20 11:07:10 +03:00
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