summaryrefslogtreecommitdiffstats
path: root/external/libgltf
Commit message (Collapse)AuthorAgeFilesLines
* Avoid mesa_headers on X11, also link with -lGL only where necesssaryTor Lillqvist2015-11-121-1/+1
| | | | | | | | | | | | The GLEW headers are enough, and what we actually use in these places. In addition to handling GL extension things in its dynamic fashion, GLEW headers also have declarations for standard, non-extension, OpenGL API, including xgl and wgl ones. Most likely we don't need mesa_headers on Windows or OS X either, and can drop them completely. Change-Id: Ic0d8d6238c862f8fe4a74e99e95344dcbf540980
* externals: remove various obsolete MSVC2012 specific flagsMichael Stahl2015-09-091-1/+0
| | | | Change-Id: I8848d042a008c21e407d9610161b5c67d2137a18
* Fix libgltf on MSVC 14.0David Ostrovsky2015-09-021-2/+2
| | | | | | | Change-Id: I3fda18b1d26e8c7ff509cdd33e44e75671c6157d Reviewed-on: https://gerrit.libreoffice.org/18212 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
* libgltf: Fix build on windows x64 bitDavid Ostrovsky2015-02-193-1/+112
| | | | | | | Change-Id: Ie467540f17b9c7240cada6b55daa96820c6c02a1 Reviewed-on: https://gerrit.libreoffice.org/14542 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
* external: fortunately boost no longer requires config_host.mkMichael Stahl2014-11-101-2/+1
| | | | Change-Id: I8f2176500bf620cd5e4cdf434e6122b6163b3e0f
* fdo#82430: MSVC build: avoid using SSE2 instructions in some externalsMichael Stahl2014-10-022-0/+11
| | | | | | Hopefully this should fix up the most important external libraries. Change-Id: I744cb5a2ce7fafb10852059050cf24589d6ca400
* Bye bye VS2010Tor Lillqvist2014-09-171-2/+0
| | | | Change-Id: I9d16f4f0df42ae4b046bc1e4ac4fba95c4b9d785
* Simplify some $ENABLE_DEBUG expressionsStephan Bergmann2014-08-291-1/+1
| | | | Change-Id: I9f60fd317f3a2995a182d51d06059bd994cf837c
* Upgrade libgltf to 0.0.1Zolnai Tamás2014-08-293-50/+0
| | | | | | | | | | | | 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>
* libgltf: check for #version string in the shader before add an own one.Zolnai Tamás2014-08-181-12/+19
| | | | Change-Id: I69dbbabc5774cbce7943e77f41bb42ed7a118bcf
* libgltf: Append shader language version to the shader filesZolnai Tamás2014-08-172-0/+31
| | | | | | | | | | | | | In general glTF shader files does not contain version directives and in some case it make shader compiler using GLSL 1.1 which leads to that the shader compiler fails. So we need to append the choosen version number which is GLSL 1.3 in case of libgltf, but this also means that from that point OpenGL 3.0 is the new reuirements since GLSL 1.3 is available only from that version. Change-Id: Ic4382266432ea474aeb3e603b32a998b9aeed280
* VS2013: Override ToolsVersion settingThomas Arnhold2014-08-091-1/+1
| | | | | | | | | Otherwise those external projects will fail, because with only VS2013 installed there is no ToolsVersion 4.0 (which is set inside the VC projects files). http://msdn.microsoft.com/en-us/library/bb383985.aspx Change-Id: I144ba1ef95372226ebadb082e3a78155cca316fd
* Drop unneeded libgltf autotools changesJan-Marek Glogowski2014-08-063-3923/+0
| | | | | | | | | | | For whatever reason the tinderboxes still try to regenerate the autotools based files, even after applying the generated file change after the template changes. These patches aren't needed, as the original problem is the CPPFLAGS environment visibility, so we drop them. Change-Id: Idb5caf662c997221337416686313101ad2193e40
* Fix libgltf dbgutil buildJan-Marek Glogowski2014-08-064-4/+3929
| | | | | | | | | | | | The libgltf configure.ac script changes the autotools user variables CFLAGS and CXXFLAGS, which is not allowed and can overwrite user settings (which it does for the -D_GLIBCXX_DEBUG flag). So this moves the special compile settings to seperate variables and passes them to AM_CXXFLAGS and AM_CPPFLAGS, so the library actually gets compiled with libstdc++ debug objects. Change-Id: I00989f5fb629a6aac43ee5a2eb287b0491a3b86d
* libgltf: rename pathces dir to patchesSimon Danner2014-08-052-1/+1
| | | | | | | Change-Id: Ibd28dcdab17b1248d62205e5bf94d0c92c3f8841 Reviewed-on: https://gerrit.libreoffice.org/10750 Reviewed-by: Zolnai Tamás <tamas.zolnai@collabora.com> Tested-by: Zolnai Tamás <tamas.zolnai@collabora.com>
* libgltf: remove obsolete patchZolnai Tamás2014-08-051-71/+0
| | | | Change-Id: Iec8a026f43cdcf1801f530e6303a9557374c92c7
* libgltf: missing <cstdio> includeZolnai Tamás2014-08-052-0/+12
| | | | Change-Id: I69ac77f954434c080a70ae9833ee60a99d7f9eef
* libgltf: fix dbgutil buildZolnai Tamás2014-08-051-0/+6
| | | | Change-Id: Icc5105d0668d5e4e3eb58bbaed6b2f059c30be99
* make libgltf compile on OSXMarkus Mohrhard2014-07-232-1/+2
| | | | Change-Id: Ie39292137f931bfd557f66c485e104cf5d5089b8
* fdo#81182: glTF window size does not match with the scene size after resizingZolnai Tamás2014-07-162-0/+72
| | | | | | | | When viewport changed it is necessary to resize the whole scene. Calling releasFbo removes size dependent objects and triggers creating the new ones with the new size. Change-Id: Ibd8be1e92be92da31add4a30aa799f0995b1cc88
* Update libgltf: various fixes, memory usage optimization (second try)Zolnai Tamás2014-07-1418-527/+0
| | | | | | | | | | | | | | | Fixes in the new tarball (beside the upstreamed bug fixes): - In walkthrough mode camera is moved relative to the current camera position and not relative to the initial camera position. - The right FPS numbers are displayed under Linux. - Some memory optimization to avoid running out of memory in case of huge models. - Other freedesktop bugs: fdo#81205, fdo#81207, fdo#81250 Change-Id: Ie0f65be3312688196fcca634eb396c577f991073 Reviewed-on: https://gerrit.libreoffice.org/10274 Reviewed-by: Zolnai Tamás <zolnaitamas2000@gmail.com> Tested-by: Zolnai Tamás <zolnaitamas2000@gmail.com>
* Revert "Update libgltf: various fixes, memory usage optimization"Zolnai Tamás2014-07-1418-0/+527
| | | | | | | This reverts commit fc40081993d29c422fd19bb80f4d9db06b4dce0d. Some files are missing from the new tarball, so revert this until this is fixed.
* Update libgltf: various fixes, memory usage optimizationZolnai Tamás2014-07-1418-527/+0
| | | | | | | | | | | | | Fixes in the new tarball (beside the upstreamed bug fixes): - In walkthrough mode camera is moved relative to the current camera position and not relative to the initial camera position. - The right FPS numbers are displayed under Linux. - Some memory optimization to avoid running out of memory in case of huge models. - Other freedesktop bugs: fdo#81205, fdo#81207, fdo#81250 Change-Id: Iba90d43e13dac7792072877d83d17fb1bcbfaae4
* enable debug informations for gltf in debug buildsMarkus Mohrhard2014-07-121-1/+1
| | | | Change-Id: I81fc7ebc77a67d2d64dd74e1dec0ce7ffbb1b19b
* VS2013: Adjust libgltf to 12.0 vcproj versionDavid Ostrovsky2014-07-111-0/+1
| | | | | | | Change-Id: I076c998f5c843b60ac5624381e51271a0924043f Reviewed-on: https://gerrit.libreoffice.org/10161 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
* Revert "fix OpenGL error in libgltf"Markus Mohrhard2014-07-062-13/+0
| | | | | | New tarball already contains the fix for it. This reverts commit 6f855fed653d6cdbfb30f8cd579d5d8d7f108aba.
* fix OpenGL error in libgltfMarkus Mohrhard2014-07-062-0/+13
| | | | | | The code tried to free a program as a shader Change-Id: I47de706044a5756cf972d9fdb38cac2ca1355414
* libgltf: Stop a memory leakZolnai Tamás2014-07-042-0/+28
| | | | Change-Id: I7f3f5cfcdc368907670d58b07300889ea8452340
* libgltf: fix Linux-with-check buildZolnai Tamás2014-06-283-0/+71
| | | | | | | It seems some of the warnings are treated as errors in Linux-with-check builds. Change-Id: I9ed876ba634d944c022838a625164f06f100a7df
* libgltf: make 'Requires' valid in libgltf-0.0.pc fileZolnai Tamás2014-06-272-0/+14
| | | | | | | | Thanks to Rene Engelhard for help to make it valid. Plus glu is not used, so remove it. Change-Id: I5e3631e9b3d24c2b1d9044192d7c0a55c234f7c0
* libgltf: use WHITESPACEZolnai Tamás2014-06-271-4/+1
| | | | Change-Id: I47ca82d5f08431c8af8b8a85cfbfd083ebd6fda0
* libgltf: fix wrong include path to config_$(gb_Side)Zolnai Tamás2014-06-271-1/+1
| | | | Change-Id: I63d1822fd08c997a9432ed09ada6d5299bc658b1
* libgltf: it seems gb_SPACE is not that we need hereZolnai Tamás2014-06-271-1/+4
| | | | Change-Id: I099f2bb007cdd29db25a99ca84e53115a12379bd
* libgltf: compiler error fixes: missing include and missing namespaceZolnai Tamás2014-06-262-0/+42
| | | | | | Thanks to Rene Engelhard for the report and the fixes. Change-Id: Ia14980bdbcd9e714b1e9cd41f04af9371aa22371
* Revert "external/libgltf: Hack in missing -fPIC"Stephan Bergmann2014-06-261-1/+0
| | | | | | This reverts commit 5da85a21241f09a0b2d7796bc952806a1a863592, bb9078e3dee48afc4c2bd8006a892924f8b38b39 "libgltf: use --with-pick [sic]" had already added --with-pic.
* external/libgltf: Hack in missing -fPICStephan Bergmann2014-06-261-0/+1
| | | | Change-Id: Ied0fe5f376bf17bd931f440e57d15b22ab6db86e
* libgltf: remove dependencies of config.h.inZolnai Tamás2014-06-252-0/+13
| | | | | | | | | It seems something is wrong with the files in the libgltf tarball (maybe wrong timestamps?), because config.h.in is always regenerated by make (autoheader). It causes build problems so just remove the deps for this time. Change-Id: I404c29673987d7c8f75ec8fe4978173593c75a2f
* libgltf: try again with this configure patchZolnai Tamás2014-06-251-41/+0
| | | | | | Touch only the configure but not the configure.ac Change-Id: Iee93036f2378f29530ffae9be8b4324e8425d2ec
* libgltf: replace configure patch to avoid using autoreconfZolnai Tamás2014-06-254-42/+103
| | | | Change-Id: Idcab012af9c27c4fed31c07ce230816d1c61d605
* libgltf: use --with-pickZolnai Tamás2014-06-251-0/+1
| | | | Change-Id: Ide01491460c9c81ed044be762c7dd07e8a5ca575
* libgltf: try to fix the MSVC2010 buildMichael Stahl2014-06-251-1/+3
| | | | Change-Id: I8dde439d19be45d5039904b6e917b17ca0ee4758
* libgltf: add patch to find the headers in WORKDIRMichael Stahl2014-06-253-1/+43
| | | | Change-Id: I8570511be7c1d6de94ee82e18bad5b00b36d99bb
* libgltf: variable names need module prefixMichael Stahl2014-06-251-9/+6
| | | | Change-Id: Id144a483fe5576cdd546ac5da87890dc61f964b3
* Update libgltf: new build system and various fixesZolnai Tamás2014-06-2519-201/+313
| | | | | | | | | | | | | | | | | | | | | | | | | | | Building: - The new tarball has reasonable build system so build libgltf as external package instead of compiling source files directly. - Freetype dependancy is removed Improvements comes with the new libgltf - Can rotate the models too (orbit mode) - Two camera handling mode: walkthrough and orbit (press M to change). - gltf_animation_set_time() works - FPS can be displayed without freetype (press F) Additional notes: - There were some bugs/regressions which are fixed during the integration (see patches). - License files are uddated now. - libgltf building is enabled only on those platforms on which gltf support actually works (windows and linux) Change-Id: Ia6c9c4da53a9b4fedba0d73aa5791489f8ad424b Reviewed-on: https://gerrit.libreoffice.org/9895 Reviewed-by: Zolnai Tamás <zolnaitamas2000@gmail.com> Tested-by: Zolnai Tamás <zolnaitamas2000@gmail.com>
* libgltf: fix up this patch, some forgotten changesZolnai Tamás2014-06-131-7/+19
| | | | Change-Id: I0fe3ee06d8112207f3ae3e0e8e40fa74d043ce11
* glTF: Avoid segmentation fault when one of the input files can't be loadedZolnai Tamás2014-06-132-0/+87
| | | | | | | | | | libgltf: Parser releases the glTFHandle, but it was not connected to the corresponding handle by RenderScene::initScene. So when rendering stopped during file loading because of missing file, Parser's handle member was an uninitialized pointer so it crashed by calling release method. Change-Id: I80099195341766f474143014d5949703d47a6fd8
* Patching libgltf: fix wrong deallocation methodZolnai Tamás2014-05-282-0/+13
| | | | | Change-Id: I05c5650c1e43cf9ac4156e8d74073bf92ac0c4df (cherry picked from commit 3ce0f83cec6d2ee1467523209df633c5a2487f71)
* libgltf: solve this memory leak problem on a better way 2Zolnai Tamás2014-05-282-59/+0
| | | | | | | | | | Handle those cases when file loading failes. Release *.json file on a different way since it is allocated by libgltf (inside the glTFHandle). (cherry picked from commit fafc1e29c1f060c1a44361a0445300f9786ad6f4) Change-Id: Idf6c6971a8ac1b342d89dc4f61a62624183e01d0
* Patching libgltf: the passed texture bitmaps are RGBA buffersZolnai Tamás2014-05-272-0/+13
| | | | Change-Id: I53f6a97820da12e89d567e1bc10226fa27cafd84
* patching libgltf: stop a huge memory leakZolnai Tamás2014-05-262-0/+59
| | | | | | | | | | | | | It is ambiguos where we should free file buffers because they are allocated by the caller code, but since gltfHandle is deallocated inside libgltf and libgltf has a gltf_renderer_release method for deallocation it seems better to free them by libgltf. Conflicts: external/libgltf/UnpackedTarball_libgltf.mk Change-Id: If3d9abed0514128c13cde8c1967ea80c4d27bf59