Commit Graph

359769 Commits

Author SHA1 Message Date
45f9f5f4d9 use size_t instead of unsigned int for container indices
Change-Id: Iff2f797915f1558ea23336e273bd26e0c0edc63e
2014-09-02 01:08:52 +02:00
27fce9349b the values are float now
actually OpenGL does not like double that much

Change-Id: I3267f46072194bb6b2d4705733408e3db44c8c08
2014-09-02 01:08:51 +02:00
ca82d9e720 remove that ugly underscore at the end of the method names
Change-Id: I3c81c9d8b89ddf18bdc5ae700b721ca71f2700bb
2014-09-02 01:08:51 +02:00
63f49714a1 basegfx -> glm in OGLTrans
Change-Id: I3f3002d975f3ee2732c5e132b3b67531356aad5c
2014-09-02 01:08:51 +02:00
cf97444233 use constructor initializer list
Change-Id: I0bb1345f05dbd835e3f7debc66a824ccf44ef88b
2014-09-02 01:08:50 +02:00
9f3171fe01 improve readability
Change-Id: I7a8791c661cbd3c602c0d12d228b63ffc416a96c
2014-09-02 01:08:50 +02:00
c6fd7be336 no need to make these variables public
Change-Id: I9b57d6811252c75186e03ed6928bd8829fa0307c
2014-09-02 01:08:50 +02:00
79090d5fb0 more OpenGL error checking in OGLTrans
Change-Id: I7eff84d18be92423b3d8616162bfaf5be5203a9d
2014-09-02 01:08:50 +02:00
5a7ab9f1f4 add invalid framebuffer operation to OpenGL error messages
Change-Id: I359ec166e9bf0585842fb436a1edd20720b89a9b
2014-09-02 01:08:49 +02:00
3758286117 check framebuffer status
Change-Id: Ieb36804247b4e2790d625585661a1c85586348f1
2014-09-02 01:08:49 +02:00
0c3a8965b5 simplify code
Change-Id: If0b1c47a1e0f6084795fb5ca4a2acced736d4523
2014-09-02 01:08:49 +02:00
49a788a377 add OpenGL error checking to OGLTrans
Change-Id: I9e511221e3da54b44935ebde22c49e5a151f6961
2014-09-02 01:08:49 +02:00
276b3d1f8a extract some shared code
Change-Id: I062ea860f695189ab1d59615f1d2390710a21d44
2014-09-02 01:08:48 +02:00
7741e4c2e5 some temporary debug output 2014-09-02 01:08:48 +02:00
b3d7fd2a42 add more notes about deprecated OpenGL features
Change-Id: Ic83ec7e99c8b666b755b93f315019754f9d9757f
2014-09-02 01:08:48 +02:00
b1d2bbecac add warning about bad input
Change-Id: I7018813740460c79d09318770fbdcb24a24a441e
2014-09-02 01:08:48 +02:00
3604dc4ffc remove old OSX OGLTrans
Change-Id: Icdb3a5f998d69727247c3fc4803c46803f2fa199
2014-09-02 01:08:47 +02:00
1de0dd02c8 make the shaders compliant to GLSL 1.2
Change-Id: Ic15760ca40d719ae333003c9bc241c813cb284fa
2014-09-02 01:08:47 +02:00
b29154d85e use generic implementation for OSX
Change-Id: I9b82ca8bb6c1c6453bbedac2c60bec4d6a98c009
2014-09-02 01:08:47 +02:00
5522655317 fix shader names, the .glsl is attached in OpenGLHelper::LoadShader
Change-Id: I267c1fefa5330359f3aea0d57d38a153232b655f
2014-09-02 01:08:46 +02:00
30cf6528cc request a legacy context for OGLTrans
Change-Id: If001121da14ca9d15f6c36af30428f1851710524
2014-09-02 01:08:46 +02:00
b3e74732e9 don't try to use X11 functions on OSX
Change-Id: Ife987833a52c7ed0b55f1003df1ee0dad2011cc0
2014-09-02 01:08:46 +02:00
d44155730a use glew instead of directly including OpenGL headers
Change-Id: I7337d2d2f116f465bf6988dd9c7997b0267ca1cc
2014-09-02 01:08:46 +02:00
7a7a8e1b32 add possibility to request a compatibility context
Change-Id: I0135e81f925fda19c06144d21d2f2b0efc9e57be
2014-09-02 01:08:45 +02:00
a72a10a32b WIP debug statements 2014-09-02 01:08:45 +02:00
14cdc08470 add a note about deprecated functionality
Change-Id: Ic980e633f7c9cdcbb3a1b512d66bfd8279d16339
2014-09-02 01:08:45 +02:00
bf24374a91 don't even try to create a shape for non existing values
Change-Id: I0af9285c2fa0371607e9ec750bb07968244c44d8
2014-09-02 01:08:45 +02:00
69fa8cfb2d fixed pipeline functions are not available in core context
Change-Id: I50f5e876da902181f8ab5c9571df61f035630218
2014-09-02 01:08:44 +02:00
9d12559881 GL_LIGHTING is deprecated
Change-Id: I6280af7182f4afefe39ef676024caa9c21f089ff
2014-09-02 01:08:44 +02:00
6a7dd1b385 GL_TEXTURE_WRAP_* is deprecated
Change-Id: I2604a6d647c912a91da156072b9821b2abe52b48
2014-09-02 01:08:44 +02:00
71aa5ff208 GL_POINT_SMOOTH is deprecated
Change-Id: Id81a238ed71c8c2f9297e14f6f37d148f29cfbca
2014-09-02 01:08:43 +02:00
a0fc0d0488 glEnable(GL_TEXTURE_2D) is deprecated
Change-Id: Ic4ee5414fbbea3d73655b52e66cb397220e61566
2014-09-02 01:08:43 +02:00
006844a15f fix my last core shader error
Now all shaders compile cleanly against a core context without
deprecated functions.

Change-Id: I53c1fe04e07247f94ad5e3a17819cebea0a9f535
2014-09-02 01:08:43 +02:00
8d61b3feee texture*D in GLSL is deprecated and not available in core contexts
Change-Id: Ia5da0899d73aea22fe7bae735e57e30dcd37b254
2014-09-02 01:08:43 +02:00
249c5e0f21 replace all attribute and varying in chart shaders
Next step to a pure OpenGL 3.2 core context.

Change-Id: Ifcfccd9ffc8adcc3b7338e10cb25aeb8496909a3
2014-09-02 01:08:42 +02:00
fbddfdeccc we need to switch to OpenGL 3.2 core for OSX
A 3.2 core context only supports GLSL 150 core and above. This at least
removes all vompile errors related to missing or wrong version
requirements. In a next step we need to make use of modern GLSL features
now.

Change-Id: I59f1bc84ab4f64cc6520309b7da25adc3e116997
2014-09-02 01:08:42 +02:00
653ace96c6 make sure that all shaders contain a version string
This is necessary for OSX where we are using a core context that does
not implement any legacy features anymore.

Change-Id: I59536e99761691d910fef62cf82ceb03e57725ae
2014-09-02 01:08:42 +02:00
4dbd58abb4 Partially revert: fixincludeguards.sh: sd
Doesn't look this sane...

 commit 3b58ababc566adef48d8ab600489e554c4585b1d
 Author: Thomas Arnhold <thomas@arnhold.org>
 Date:   Wed Oct 23 22:38:46 2013 +0200

    fixincludeguards.sh: sd

Change-Id: Ia6836deaa1982febf71cd8abd89e93ea0a844721
2014-09-01 23:08:48 +02:00
368374a67b correct include guard comment
Change-Id: Ie94573f7c43c834cd636493bed32f07aa792da49
2014-09-01 23:03:30 +02:00
fba7b58a9d fix typo Sufface->Surface
Change-Id: I90847d0edbc2c13e405562647b150012bc5df7e2
Reviewed-on: https://gerrit.libreoffice.org/11249
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-09-01 15:39:42 -05:00
1a91abb451 Avoid invalid premature downcasts
Change-Id: Ifc6d84a63719b141ddc9bd89349d4a605d2b3e00
2014-09-01 17:09:30 +02:00
148aea32a3 Consistency around SvxB3DVectorItem in svx/svx3ditems.hxx
...similar to what has been done for svx/sdtmfitm.hxx in
68969cc61adecac481ae9656978ef952f435b310 "Consistency around SdrMetricItem."

Change-Id: I7f2348d82c76f6f231e34f0dfc4b6ee6fddffe55
2014-09-01 16:46:59 +02:00
e5d6ae0c2e Consistency around SvxColorItem in svx/svx3ditems.hxx
...similar to what has been done for svx/sdtmfitm.hxx in
68969cc61adecac481ae9656978ef952f435b310 "Consistency around SdrMetricItem."

Change-Id: If26ab3229871d2d6a7e4e7e8f79f4cb927b96930
2014-09-01 16:16:49 +02:00
d19609e118 Missing Clone overrides
Change-Id: I0dda3dc849fce9ba994baa82f7e25497ea995c75
2014-09-01 15:40:39 +02:00
e62ec6d049 fdo#75757: remove inheritance to std::vector
from SwLayCacheImpl.

Change-Id: I77520495aab1d6a572b25433396202b11e478636
Reviewed-on: https://gerrit.libreoffice.org/11158
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2014-09-01 08:19:05 -05:00
edf7c73d45 Consistency around SfxUInt16Item in svx/svx3ditems.hxx
...similar to what has been done for svx/sdtmfitm.hxx in
68969cc61adecac481ae9656978ef952f435b310 "Consistency around SdrMetricItem."

Change-Id: I2e467df03a34d694214e0560476cb7fd76ef0735
2014-09-01 15:18:17 +02:00
9f6018bb64 Consistency around SfxBoolItem in svx/svx3ditems.hxx
...similar to what has been done for svx/sdtmfitm.hxx in
68969cc61adecac481ae9656978ef952f435b310 "Consistency around SdrMetricItem."

Change-Id: I3253b4cc5657a7d6b960ee892584109d373eed3d
2014-09-01 14:46:50 +02:00
bebe30e917 Consistency around SfxUInt32Item in svx/svx3ditems.hxx
...similar to what has been done for svx/sdtmfitm.hxx in
68969cc61adecac481ae9656978ef952f435b310 "Consistency around SdrMetricItem."

Change-Id: I3193eab34a34c051002adeedd8b368e26f55f7a3
2014-09-01 13:37:27 +02:00
407d23bace Remove redundancy in Statistics labels
These labels were too long, obtrusive, and state the obvious.
We can make them shorter and friendlier by removing the “Number of”
nuisance. The equivalent dialog in Office 2013 also lacks it.
Brevity is a Good Thing™ in UIs.

Change-Id: Ia44f02cbcbba22a3161cac206511de4fe4daedcc
Reviewed-on: https://gerrit.libreoffice.org/11222
Reviewed-by: Joren De Cuyper <jorendc@libreoffice.org>
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
2014-09-01 03:51:13 -05:00
4e4ae20ab2 Revert "fdo#83302 don't display read-only infobar for Base form in normal mode"
This reverts commit 542ae4e06f9f70e328a3e85f1272ead558b36766, which
breaks the build without 15cea073e7ed4970e60967fe036fc492e2052203, which
had to reverted.
2014-09-01 10:43:47 +02:00