tinyexr: Sync with upstream 1.0.1
Removes miniz as a bundled dependency, relies on our own zlib instead.
Includes a couple commits ahead of `v1.0.1` tag to fix MinGW builds.
(cherry picked from commit 46d3effa99
)
This commit is contained in:
parent
ee82085925
commit
31dbc59c39
7 changed files with 1934 additions and 7188 deletions
|
@ -367,7 +367,7 @@ License: Expat
|
|||
|
||||
Files: ./thirdparty/tinyexr/
|
||||
Comment: TinyEXR
|
||||
Copyright: 2014-2020, Syoyo Fujita
|
||||
Copyright: 2014-2021, Syoyo Fujita
|
||||
2002, Industrial Light & Magic, a division of Lucas Digital Ltd. LLC
|
||||
License: BSD-3-clause
|
||||
|
||||
|
|
|
@ -20,6 +20,9 @@ env_tinyexr.Prepend(CPPPATH=[thirdparty_dir])
|
|||
|
||||
# Enable threaded loading with C++11.
|
||||
env_tinyexr.Append(CPPDEFINES=["TINYEXR_USE_THREAD"])
|
||||
# miniz is an external dependency, we could add it but we can instead rely
|
||||
# on our existing bundled zlib.
|
||||
env_tinyexr.Append(CPPDEFINES=[("TINYEXR_USE_MINIZ", 0)])
|
||||
|
||||
env_thirdparty = env_tinyexr.Clone()
|
||||
env_thirdparty.disable_warnings()
|
||||
|
|
|
@ -33,6 +33,8 @@
|
|||
#include "core/os/os.h"
|
||||
#include "core/print_string.h"
|
||||
|
||||
#include <zlib.h> // Should come before including tinyexr.
|
||||
|
||||
#include "thirdparty/tinyexr/tinyexr.h"
|
||||
|
||||
Error ImageLoaderTinyEXR::load_image(Ref<Image> p_image, FileAccess *f, bool p_force_linear, float p_scale) {
|
||||
|
|
|
@ -31,6 +31,8 @@
|
|||
#include "image_saver_tinyexr.h"
|
||||
#include "core/math/math_funcs.h"
|
||||
|
||||
#include <zlib.h> // Should come before including tinyexr.
|
||||
|
||||
#include "thirdparty/tinyexr/tinyexr.h"
|
||||
|
||||
#include <cstdlib>
|
||||
|
|
5
thirdparty/README.md
vendored
5
thirdparty/README.md
vendored
|
@ -498,13 +498,16 @@ comments and a patch is provided in the squish/ folder.
|
|||
## tinyexr
|
||||
|
||||
- Upstream: https://github.com/syoyo/tinyexr
|
||||
- Version: 1.0.0 (e4b7840d9448b7d57a88384ce26143004f3c0c71, 2020)
|
||||
- Version: 1.0.1 (67010eae802211202d0797f4df2b809f4ba7442c, 2021)
|
||||
- License: BSD-3-Clause
|
||||
|
||||
Files extracted from upstream source:
|
||||
|
||||
- `tinyexr.{cc,h}`
|
||||
|
||||
The `tinyexr.cc` file was modified to include `zlib.h` which we provide,
|
||||
instead of `miniz.h` as an external dependency.
|
||||
|
||||
|
||||
## vhacd
|
||||
|
||||
|
|
4
thirdparty/tinyexr/tinyexr.cc
vendored
4
thirdparty/tinyexr/tinyexr.cc
vendored
|
@ -4,5 +4,9 @@
|
|||
#endif
|
||||
#endif
|
||||
|
||||
// -- GODOT start --
|
||||
#include <zlib.h> // Should come before including tinyexr.
|
||||
// -- GODOT end --
|
||||
|
||||
#define TINYEXR_IMPLEMENTATION
|
||||
#include "tinyexr.h"
|
||||
|
|
9104
thirdparty/tinyexr/tinyexr.h
vendored
9104
thirdparty/tinyexr/tinyexr.h
vendored
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue