mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
318,631 Commits 1 Branch 0 Tags
b51d0ec93d11bd34766ef95dc09d8347cfbe86c6
Commit Graph

103 Commits

Author SHA1 Message Date
Tor Lillqvist
b51d0ec93d Make the OpenGL transition code buildable for Windows 
Whether it works at run-time is another question;)

Use the same source files as for X11, with relevant conditional
coding.

The Windows OpenGL import library corresponds to OpenGL 1.2, so we
can't directly use APIs from OpenGL 1.3 or newer. (Even if they as
such are present in the "Mesa" headers we use.) So look up also
glActivetexture() dynamically.

Change-Id: I2280e2ad7e190356e9409cc28142fa9fc33e078b
 2013-01-10 23:53:41 +02:00
Tor Lillqvist
6312695ad6 The "unx" and "win" OGLTrans_Shaders.cxx files were effectively identical 
Just some OSL_TRACE/SAL_INFO changes in the "unx" one. And it isn't
like the "win" one would actually compile for Windows as is anyway, as
it unconditionally uses glX stuff. So certainly it is better to have
just one copy, and if we want to make the OpenGL transitions build on
Windows then add ifdefs for Windows to it.

Change-Id: If6887e24a0fc03c7e0e77f003d08feb51c264f30
 2013-01-10 14:59:40 +02:00
Matteo Casalin
a4c7ded1fd Cleanup: #include <tools/gen.hxx> 
Change-Id: Ic547b4a59102afc8bdbc85ec95ac312e32ef2530
Reviewed-on: https://gerrit.libreoffice.org/1484
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
 2013-01-07 13:14:57 +00:00
Marcos Paulo de Souza
3d623f3933 Remove some unused functions 
Change-Id: I618de5d34d891b1b183cca12b71aff4128b2f92e
Signed-off-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/1517
Reviewed-by: Olivier Hallot <olivier.hallot@alta.org.br>
Tested-by: Olivier Hallot <olivier.hallot@alta.org.br>
 2012-12-31 10:23:16 +00:00
Julien Nabet
a1ff0ec108 Fix 'Primitive::operator=' should return 'Primitive & 
I applied the same for Windows part, hope there won't be any building pb

Change-Id: Id62c8c5f60e7a525d82c36ced944b71cc5c28b78
 2012-12-27 20:36:21 +01:00
Tor Lillqvist
7f78980ea2 WaE: non-constant-expression cannot be narrowed to float in initializer list 
More of the -Wc++11-narrowing warnings.

Change-Id: If371de0f480119d9b6f5fdc10b67484eb63c9d61
 2012-12-10 09:36:36 +02:00
Stephan Bergmann
4689f1c4cf -Werror,-Wunused-function 
Change-Id: Ida1f703b4552d891f8fe3defd373ec45697ae5b5
 2012-12-06 15:04:09 +01:00
David Tardon
60f6c7578b fix first run of shader-using 3D transitions 
The slideshow engine emits viewChanged() immediately after the
transition has been initialized. Because the ShaderTransition data were
not fully reset in finishTransition_, no transition texture would be
generated on the re-initialization in viewChanged(), thus there would be
no transition on the first slide.

Change-Id: I04fef9a6c09537995d83889be2fe15569a1ddc2c
 2012-11-28 12:14:20 +01:00
David Tardon
5ff406634d fix 3D slide trans. initialization 
Change-Id: Iafec5485d0a097f386070370b989d5e77f631d99
 2012-11-28 12:14:19 +01:00
Julien Nabet
db4aab0e11 Remove some newly tagged unused methods 
Change-Id: Ie55dfd19f223df62c091ffc4fdf28789b308a1c7
 2012-11-23 22:39:04 +01:00
David Tardon
642b86aa54 fix 3D 'fade' transitions 
* canvas bitmaps created without transparency get an appropriate color
  space
* implement a color space for OpenGL RGBA to use instead of
  canvas::tools::getStdColorSpace(), which apparently uses VCL's
  interpretation of alpha (alpha == 0xff means full transparency,
  alpha == 0 full opacity).

Change-Id: I97f30533206b75132abd0bb0d290a279f15ae8a9
 2012-11-22 10:47:16 +01:00
David Tardon
d6ce23bbf2 refactor OpenGL transition creation 
Change-Id: I1f2de591906f3560cc60d1323e8dcfb66448f4eb
 2012-11-22 10:47:15 +01:00
David Tardon
302f567e83 make conditionally-compiled code easier to read 
Change-Id: I6e855fd09ded2afc14379b75a7ab66b99588dd6b
 2012-11-22 10:47:14 +01:00
Caolán McNamara
ab4eb0e332 SetPosSizePixel->setPosSizePixel 
Change-Id: Id1cab5b27776180cd8403af848c1294858384b4a
 2012-09-28 09:18:09 +01:00
Caolán McNamara
2f002e3a49 having two SetPosSizePixel is a blasted nuisance 
Lets rename the multiargument SetPosSizePixel to
setPosSizePixel drop the various using Window::SetPosSizePixel
and work towards de-virtualizing SetPosSizePixel/SetPosPixel and
SetSizePixel and doing the work in a virtual setPosSizePixel

Change-Id: I7057654168001b67becee1791e97f9e9dc01f7b8
 2012-09-28 08:48:39 +01:00
David Tardon
7fac82d6f4 convert OSL_ debug funcs to SAL_ 
Change-Id: I8903dd6aff6cdd6a4b24e3030309780975ea9318
 2012-09-07 10:07:02 +02:00
David Tardon
6b84e09ff1 more refactoring 
Change-Id: I2470e0d1ace4139a735e9de32c124bc054b8ff76
 2012-09-07 10:07:02 +02:00
David Tardon
e24e04ccac refactor the OGLTransitionerImpl init. a bit 
This removes some possible code paths that IMHO only added complexity
and shaves some time off each presentation start (200--500 ms on this
machine) by avoiding one call of GLInitSlides, which creates the
textures.

Change-Id: I0f66d138f14c86c87d6046276adc36072227c859
 2012-09-07 10:07:01 +02:00
David Tardon
1d5d8584a3 shuffle #ifdefs around a bit 
Change-Id: I93b7c3796acf2da0ba28d3ae61aab4e15681683f
 2012-09-07 10:07:01 +02:00
David Tardon
c0582db6f9 more indentation fixes 
Change-Id: Ia4a3a2aede8240d98423dbf78da15b95e19bfa5b
 2012-09-07 10:07:01 +02:00
David Tardon
07bb32fdcb drop useless nested anonymous namespace 
Change-Id: I0876e253b69fa4ec8262946339bb643aa43f3bad
 2012-09-07 10:07:00 +02:00
David Tardon
9a6544bc9f add more timing code 
Change-Id: I481e1acfee06e56932bf7ba7bbe7f89f35ff0435
 2012-09-07 10:07:00 +02:00
David Tardon
38b70b169c simplify time profiling 
Change-Id: Ib5976cd3e0c6e3b90fc62fe8336317f259dd544b
 2012-09-07 10:06:59 +02:00
David Tardon
7a545ea8bd use meaningful names for debugging variables 
Change-Id: I50918435903a053ce99487c6ad48d45552358cd2
 2012-09-07 10:06:59 +02:00
Stephan Bergmann
07f44bfd39 -Werror,-Wunused-private-field (Clang towards 3.2) 
Change-Id: I885db00df96c73c35f9c1a6add8caf6b93f7c01a
 2012-08-31 09:04:16 +02:00
David Tardon
76367894c0 switch logging from OSL_ to SAL_ 
Change-Id: Iad5041fe85c5f03b9b5ed4a13d5c59c4ac027386
 2012-08-17 14:42:53 +02:00
David Tardon
67955bfb2a fix indentation 
Change-Id: I9b077cbbeac37c0eaac1365a8793cbc3f33f8b3e
 2012-08-17 14:42:53 +02:00
Tor Lillqvist
07a33fd7db Check MACOSX_SDK_VERSION, not MAC_OS_X_VERSION_MIN_REQUIRED 
Change-Id: I7b24c218d45cdcd743d0b56ae94e604c72c59ebf
 2012-08-12 11:01:52 +03:00
Michael Meeks
535e83550e re-base on ALv2 code. Includes: 
Avoid some uses of non portable #!/bin/bash in shell scripts.
    Patch contributed by Pedro Giffuni
    http://svn.apache.org/viewvc?view=revision&revision=1235297
    remove redundant namespace, patch contributed Mathias Bauer
    http://svn.apache.org/viewvc?view=revision&revision=1162610
    removal of OS/2 port changes, and preferring our similiar
    tools/inc/tools/solar.h DLLPOSTFIX cleanup.
    i118595 - Removal of the use of getopt() from rscdep.
    Patch contributed by Andre Fische
    http://svn.apache.org/viewvc?view=revision&revision=1202270
 2012-07-11 18:12:35 +01:00
Norbert Thiebaud
2c506447fc WaE on Mac SDK > 10.4 
Change-Id: Ie0e413a6beef87d399807f98f345103c82442a9c
 2012-06-23 23:23:24 -05:00
Michael Stahl
0caf87c580 remove bunch of obsolete looking .dxp files 
Change-Id: Ib06d88890007fd27d6838a5c8829230733d3df97
 2012-06-22 22:39:34 +02:00
Tor Lillqvist
4005503177 Bin commented-out code 2012-04-24 12:22:42 +03:00
Tor Lillqvist
2a0444f7ad WaE: assigning to 'AquaOpenGLView *' from incompatible type 'NSOpenGLView *' 2012-04-24 12:22:40 +03:00
Tor Lillqvist
efc80f71f5 Add hopefully helpful comment 2012-04-24 12:22:38 +03:00
Tor Lillqvist
72108b8cba WaE: 'SceneObject' has virtual functions but non-virtual destructor 2012-04-24 12:22:36 +03:00
Tor Lillqvist
a5554ed563 WaE: incompatible pointer types: 'long *' vs. 'const GLint *' 2012-04-24 12:22:18 +03:00
Thorsten Behrens
80fe015a86 Add COMPHELPER_SERVICEDECL_EXPORTS* back in, after libmerge changes 
Did I mention I hate boilerplate copied all over the place? ;)
 2012-03-16 17:02:23 +01:00
Alexander Bergmann
8963cc01f5 EasyHack: Removed gcc conditionals 2012-02-13 17:33:15 +00:00
David Tardon
d5286b6462 WaE: deleting object of abstract class type with non-virtual destructor 2012-01-15 20:27:26 +01:00
Michael Stahl
c24552ed05 slideshow: fix unused param warnings in ObjC files 2012-01-04 17:59:39 +01:00
Tor Lillqvist
a47ef216cc Workaround for building against MacOSX 10.6 SDK but with 10.4 as the highest used API 2011-10-19 14:50:18 +03:00
Caolán McNamara
1f5c696c37 add mode-lines to .m files and last round of merged files, etc. 2011-09-30 09:09:25 +01:00
Tor Lillqvist
eeefce57c8 Fix error: invalid conversion from 'long int*' to 'const GLint*' 2011-09-29 22:07:56 +03:00
Pierre-André Jacquod
162800bbaf cppcheck: delete unneded variable in slideshow, OGLTrans_Tran...Impl.cxx 
but left the call to the function behind, since not sure there is
no effect on data
 2011-09-26 22:02:39 +02:00
Thomas Arnhold
be6a8677a6 OSL_TRACE: Remove trailing newlines 
Done with perl regex:
s/(\n\s*OSL_TRACE\(\s*\"[^\n]+?)\s*(\\n)+(\"[^\n]*\)\;\n)/$1$3/gs;

- removed trailing whitespaces and (multiple) newlines
 2011-09-21 09:28:39 +02:00
Pierre-André Jacquod
aa9fe64403 [cppchecker] unread Variable within a #ifdef [WINT] removed 2011-09-06 22:38:07 +02:00
Pierre-André Jacquod
8231574526 unused variable in Windows build 
according cppchecker, small cleaning
 2011-08-14 11:40:57 -05:00
Matúš Kukan
7e5b4be4cf add prefixes for component_getFactory 2011-07-28 14:37:59 +02:00
Norbert Thiebaud
a5eb2da14e remove half baked test without the appropriate include to make it works 2011-07-24 19:48:51 -05:00
Norbert Thiebaud
d5c9bdd202 cString is deprecated use cStringUsingEncoding instead 2011-07-24 19:30:18 -05:00