godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

tinyexr: Update to 1.0.12

Browse Source
This commit is contained in:
Jakub Marcowski
2025-02-18 15:39:06 +01:00
parent 6c9765d87e
commit 57569085d9
2 changed files with 132 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
thirdparty/README.md vendored
View File

@@ -987,7 +987,7 @@ Patches:
## tinyexr ## tinyexr
- Upstream: https://github.com/syoyo/tinyexr - Upstream: https://github.com/syoyo/tinyexr
- Version: 1.0.9 (5fcb4dcb6e3abf96214b67e5c54db1ceec6a455c, 2024) - Version: 1.0.12 (735ff73ce5959cf005eb99ce517c9bcecab89dfb, 2025)
- License: BSD-3-Clause - License: BSD-3-Clause
Files extracted from upstream source: Files extracted from upstream source:

166
thirdparty/tinyexr/tinyexr.h vendored
View File

@@ -131,7 +131,11 @@ extern "C" {
#ifndef TINYEXR_USE_THREAD #ifndef TINYEXR_USE_THREAD
#define TINYEXR_USE_THREAD (0) // No threaded loading. #define TINYEXR_USE_THREAD (0) // No threaded loading.
// http://computation.llnl.gov/projects/floating-point-compression #else
// When using threading a reduced custom upperbound can be specified by setting TINYEXR_MAX_THREADS
#ifndef TINYEXR_MAX_THREADS // if not defined define it as 0 meaning upper limit is taken from hardware_concurrency()
#define TINYEXR_MAX_THREADS (0)
#endif
#endif #endif
#ifndef TINYEXR_USE_OPENMP #ifndef TINYEXR_USE_OPENMP
@@ -142,6 +146,41 @@ extern "C" {
#endif #endif
#endif #endif
#ifndef TINYEXR_USE_COMPILER_FP16
#define TINYEXR_USE_COMPILER_FP16 (0)
#endif
#if TINYEXR_USE_COMPILER_FP16
#ifndef _MSC_VER
#if defined( __GNUC__ ) || defined( __clang__ )
#if defined( __SSE2__ )
#if ( __GNUC__ > 11 ) || ( __clang_major__ > 14 )
#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__
#define __STDC_WANT_IEC_60559_TYPES_EXT__
#endif
#include <float.h>
#include <math.h>
#define TINYEXR_FP16_COMPILER_TYPE _Float16
#endif
#endif
#if defined( __ARM_NEON__ ) || defined( __ARM_NEON )
#define TINYEXR_FP16_COMPILER_TYPE __fp16
#endif
#endif
#else
#if (defined(_M_IX86) || defined(_M_X64)) && defined(__AVX2__)
#include <intrin.h>
#define TINYEXR_FP16_COMPILER_TYPE uint16_t
#endif
#endif
#endif
#ifdef TINYEXR_FP16_COMPILER_TYPE
#define TINYEXR_HAS_FP16_COMPILER_TYPE (1)
#else
#define TINYEXR_HAS_FP16_COMPILER_TYPE (0)
#endif
#define TINYEXR_SUCCESS (0) #define TINYEXR_SUCCESS (0)
#define TINYEXR_ERROR_INVALID_MAGIC_NUMBER (-1) #define TINYEXR_ERROR_INVALID_MAGIC_NUMBER (-1)
#define TINYEXR_ERROR_INVALID_EXR_VERSION (-2) #define TINYEXR_ERROR_INVALID_EXR_VERSION (-2)
@@ -771,7 +810,7 @@ static void SetWarningMessage(const std::string &msg, const char **warn) {
static const int kEXRVersionSize = 8; static const int kEXRVersionSize = 8;
static void cpy2(unsigned short *dst_val, const unsigned short *src_val) { static void inline cpy2(unsigned short *dst_val, const unsigned short *src_val) {
unsigned char *dst = reinterpret_cast<unsigned char *>(dst_val); unsigned char *dst = reinterpret_cast<unsigned char *>(dst_val);
const unsigned char *src = reinterpret_cast<const unsigned char *>(src_val); const unsigned char *src = reinterpret_cast<const unsigned char *>(src_val);
@@ -779,7 +818,7 @@ static void cpy2(unsigned short *dst_val, const unsigned short *src_val) {
dst[1] = src[1]; dst[1] = src[1];
} }
static void swap2(unsigned short *val) { static void inline swap2(unsigned short *val) {
#if TINYEXR_LITTLE_ENDIAN #if TINYEXR_LITTLE_ENDIAN
(void)val; (void)val;
#else #else
@@ -801,7 +840,7 @@ static void swap2(unsigned short *val) {
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-function"
#endif #endif
static void cpy4(int *dst_val, const int *src_val) { static void inline cpy4(int *dst_val, const int *src_val) {
unsigned char *dst = reinterpret_cast<unsigned char *>(dst_val); unsigned char *dst = reinterpret_cast<unsigned char *>(dst_val);
const unsigned char *src = reinterpret_cast<const unsigned char *>(src_val); const unsigned char *src = reinterpret_cast<const unsigned char *>(src_val);
@@ -811,7 +850,7 @@ static void cpy4(int *dst_val, const int *src_val) {
dst[3] = src[3]; dst[3] = src[3];
} }
static void cpy4(unsigned int *dst_val, const unsigned int *src_val) { static void inline cpy4(unsigned int *dst_val, const unsigned int *src_val) {
unsigned char *dst = reinterpret_cast<unsigned char *>(dst_val); unsigned char *dst = reinterpret_cast<unsigned char *>(dst_val);
const unsigned char *src = reinterpret_cast<const unsigned char *>(src_val); const unsigned char *src = reinterpret_cast<const unsigned char *>(src_val);
@@ -821,7 +860,7 @@ static void cpy4(unsigned int *dst_val, const unsigned int *src_val) {
dst[3] = src[3]; dst[3] = src[3];
} }
static void cpy4(float *dst_val, const float *src_val) { static void inline cpy4(float *dst_val, const float *src_val) {
unsigned char *dst = reinterpret_cast<unsigned char *>(dst_val); unsigned char *dst = reinterpret_cast<unsigned char *>(dst_val);
const unsigned char *src = reinterpret_cast<const unsigned char *>(src_val); const unsigned char *src = reinterpret_cast<const unsigned char *>(src_val);
@@ -838,7 +877,7 @@ static void cpy4(float *dst_val, const float *src_val) {
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif
static void swap4(unsigned int *val) { static void inline swap4(unsigned int *val) {
#if TINYEXR_LITTLE_ENDIAN #if TINYEXR_LITTLE_ENDIAN
(void)val; (void)val;
#else #else
@@ -853,7 +892,7 @@ static void swap4(unsigned int *val) {
#endif #endif
} }
static void swap4(int *val) { static void inline swap4(int *val) {
#if TINYEXR_LITTLE_ENDIAN #if TINYEXR_LITTLE_ENDIAN
(void)val; (void)val;
#else #else
@@ -868,7 +907,7 @@ static void swap4(int *val) {
#endif #endif
} }
static void swap4(float *val) { static void inline swap4(float *val) {
#if TINYEXR_LITTLE_ENDIAN #if TINYEXR_LITTLE_ENDIAN
(void)val; (void)val;
#else #else
@@ -884,7 +923,7 @@ static void swap4(float *val) {
} }
#if 0 #if 0
static void cpy8(tinyexr::tinyexr_uint64 *dst_val, const tinyexr::tinyexr_uint64 *src_val) { static void inline cpy8(tinyexr::tinyexr_uint64 *dst_val, const tinyexr::tinyexr_uint64 *src_val) {
unsigned char *dst = reinterpret_cast<unsigned char *>(dst_val); unsigned char *dst = reinterpret_cast<unsigned char *>(dst_val);
const unsigned char *src = reinterpret_cast<const unsigned char *>(src_val); const unsigned char *src = reinterpret_cast<const unsigned char *>(src_val);
@@ -899,7 +938,7 @@ static void cpy8(tinyexr::tinyexr_uint64 *dst_val, const tinyexr::tinyexr_uint64
} }
#endif #endif
static void swap8(tinyexr::tinyexr_uint64 *val) { static void inline swap8(tinyexr::tinyexr_uint64 *val) {
#if TINYEXR_LITTLE_ENDIAN #if TINYEXR_LITTLE_ENDIAN
(void)val; (void)val;
#else #else
@@ -919,6 +958,11 @@ static void swap8(tinyexr::tinyexr_uint64 *val) {
} }
// https://gist.github.com/rygorous/2156668 // https://gist.github.com/rygorous/2156668
#if TINYEXR_HAS_FP16_COMPILER_TYPE && (TINYEXR_USE_COMPILER_FP16 > 0)
union FP32 {
float f;
};
#else
union FP32 { union FP32 {
unsigned int u; unsigned int u;
float f; float f;
@@ -934,12 +978,21 @@ union FP32 {
#endif #endif
} s; } s;
}; };
#endif
#ifdef __clang__ #ifdef __clang__
#pragma clang diagnostic push #pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wpadded" #pragma clang diagnostic ignored "-Wpadded"
#endif #endif
#if TINYEXR_HAS_FP16_COMPILER_TYPE && (TINYEXR_USE_COMPILER_FP16 > 0)
union FP16 {
TINYEXR_FP16_COMPILER_TYPE f;
unsigned short u;
};
#else
union FP16 { union FP16 {
unsigned short u; unsigned short u;
struct { struct {
@@ -954,11 +1007,32 @@ union FP16 {
#endif #endif
} s; } s;
}; };
#endif
#ifdef __clang__ #ifdef __clang__
#pragma clang diagnostic pop #pragma clang diagnostic pop
#endif #endif
#if TINYEXR_HAS_FP16_COMPILER_TYPE && (TINYEXR_USE_COMPILER_FP16 > 0)
static inline FP32 half_to_float(FP16 h) {
FP32 o;
#if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64)) && defined(__AVX2__)
o.f =_mm_cvtss_f32(_mm_cvtph_ps(_mm_cvtsi32_si128(static_cast<int> (h.u))));
#else
o.f = static_cast<float> (h.f);
#endif
return o;
}
static inline FP16 float_to_half_full(FP32 f) {
FP16 o;
#if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64)) && defined(__AVX2__)
o.f = static_cast<TINYEXR_FP16_COMPILER_TYPE> (_mm_cvtsi128_si32(_mm_cvtps_ph(_mm_set_ss(f.f), _MM_FROUND_CUR_DIRECTION)));
#else
o.f = static_cast<TINYEXR_FP16_COMPILER_TYPE> (f.f);
#endif
return o;
}
#else
static FP32 half_to_float(FP16 h) { static FP32 half_to_float(FP16 h) {
static const FP32 magic = {113 << 23}; static const FP32 magic = {113 << 23};
static const unsigned int shifted_exp = 0x7c00 static const unsigned int shifted_exp = 0x7c00
@@ -1018,7 +1092,7 @@ static FP16 float_to_half_full(FP32 f) {
o.s.Sign = f.s.Sign; o.s.Sign = f.s.Sign;
return o; return o;
} }
#endif
// NOTE: From OpenEXR code // NOTE: From OpenEXR code
// #define IMF_INCREASING_Y 0 // #define IMF_INCREASING_Y 0
// #define IMF_DECREASING_Y 1 // #define IMF_DECREASING_Y 1
@@ -4212,7 +4286,7 @@ static bool DecodePixelData(/* out */ unsigned char **out_images,
static bool DecodeTiledPixelData( static bool DecodeTiledPixelData(
unsigned char **out_images, int *width, int *height, unsigned char **out_images, int *width, int *height,
const int *requested_pixel_types, const unsigned char *data_ptr, const int *requested_pixel_types, const unsigned char *data_ptr,
size_t data_len, int compression_type, int line_order, int data_width, size_t data_len, int compression_type, int data_width,
int data_height, int tile_offset_x, int tile_offset_y, int tile_size_x, int data_height, int tile_offset_x, int tile_offset_y, int tile_size_x,
int tile_size_y, size_t pixel_data_size, size_t num_attributes, int tile_size_y, size_t pixel_data_size, size_t num_attributes,
const EXRAttribute *attributes, size_t num_channels, const EXRAttribute *attributes, size_t num_channels,
@@ -4238,8 +4312,9 @@ static bool DecodeTiledPixelData(
} }
// Image size = tile size. // Image size = tile size.
// Line order within tiles is always increasing.
return DecodePixelData(out_images, requested_pixel_types, data_ptr, data_len, return DecodePixelData(out_images, requested_pixel_types, data_ptr, data_len,
compression_type, line_order, (*width), tile_size_y, compression_type, /* line_order*/ 0, (*width), tile_size_y,
/* stride */ tile_size_x, /* y */ 0, /* line_no */ 0, /* stride */ tile_size_x, /* y */ 0, /* line_no */ 0,
(*height), pixel_data_size, num_attributes, attributes, (*height), pixel_data_size, num_attributes, attributes,
num_channels, channels, channel_offset_list); num_channels, channels, channel_offset_list);
@@ -4930,10 +5005,12 @@ static int DecodeTiledLevel(EXRImage* exr_image, const EXRHeader* exr_header,
std::atomic<int> tile_count(0); std::atomic<int> tile_count(0);
int num_threads = std::max(1, int(std::thread::hardware_concurrency())); int num_threads = std::max(1, int(std::thread::hardware_concurrency()));
#if (TINYEXR_MAX_THREADS > 0)
num_threads = std::min(num_threads,TINYEXR_MAX_THREADS);
#endif
if (num_threads > int(num_tiles)) { if (num_threads > int(num_tiles)) {
num_threads = int(num_tiles); num_threads = int(num_tiles);
} }
for (int t = 0; t < num_threads; t++) { for (int t = 0; t < num_threads; t++) {
workers.emplace_back(std::thread([&]() workers.emplace_back(std::thread([&]()
{ {
@@ -5012,7 +5089,6 @@ static int DecodeTiledLevel(EXRImage* exr_image, const EXRHeader* exr_header,
&(exr_image->tiles[tile_idx].height), &(exr_image->tiles[tile_idx].height),
exr_header->requested_pixel_types, data_ptr, exr_header->requested_pixel_types, data_ptr,
static_cast<size_t>(data_len), exr_header->compression_type, static_cast<size_t>(data_len), exr_header->compression_type,
exr_header->line_order,
exr_image->width, exr_image->height, exr_image->width, exr_image->height,
tile_coordinates[0], tile_coordinates[1], exr_header->tile_size_x, tile_coordinates[0], tile_coordinates[1], exr_header->tile_size_x,
exr_header->tile_size_y, static_cast<size_t>(pixel_data_size), exr_header->tile_size_y, static_cast<size_t>(pixel_data_size),
@@ -5286,10 +5362,12 @@ static int DecodeChunk(EXRImage *exr_image, const EXRHeader *exr_header,
std::atomic<int> y_count(0); std::atomic<int> y_count(0);
int num_threads = std::max(1, int(std::thread::hardware_concurrency())); int num_threads = std::max(1, int(std::thread::hardware_concurrency()));
#if (TINYEXR_MAX_THREADS > 0)
num_threads = std::min(num_threads,TINYEXR_MAX_THREADS);
#endif
if (num_threads > int(num_blocks)) { if (num_threads > int(num_blocks)) {
num_threads = int(num_blocks); num_threads = int(num_blocks);
} }
for (int t = 0; t < num_threads; t++) { for (int t = 0; t < num_threads; t++) {
workers.emplace_back(std::thread([&]() { workers.emplace_back(std::thread([&]() {
int y = 0; int y = 0;
@@ -5364,10 +5442,11 @@ static int DecodeChunk(EXRImage *exr_image, const EXRHeader *exr_header,
if (line_no < 0) { if (line_no < 0) {
invalid_data = true; invalid_data = true;
} else { } else {
// Line order is increasing because we read in line offset table order.
if (!tinyexr::DecodePixelData( if (!tinyexr::DecodePixelData(
exr_image->images, exr_header->requested_pixel_types, exr_image->images, exr_header->requested_pixel_types,
data_ptr, static_cast<size_t>(data_len), data_ptr, static_cast<size_t>(data_len),
exr_header->compression_type, exr_header->line_order, exr_header->compression_type, /* line_order*/ 0,
int(data_width), int(data_height), int(data_width), y, line_no, int(data_width), int(data_height), int(data_width), y, line_no,
num_lines, static_cast<size_t>(pixel_data_size), num_lines, static_cast<size_t>(pixel_data_size),
static_cast<size_t>( static_cast<size_t>(
@@ -7268,6 +7347,9 @@ static int EncodeTiledLevel(const EXRImage* level_image, const EXRHeader* exr_he
std::atomic<int> tile_count(0); std::atomic<int> tile_count(0);
int num_threads = std::max(1, int(std::thread::hardware_concurrency())); int num_threads = std::max(1, int(std::thread::hardware_concurrency()));
#if (TINYEXR_MAX_THREADS > 0)
num_threads = std::min(num_threads,TINYEXR_MAX_THREADS);
#endif
if (num_threads > int(num_tiles)) { if (num_threads > int(num_tiles)) {
num_threads = int(num_tiles); num_threads = int(num_tiles);
} }
@@ -7517,7 +7599,9 @@ static int EncodeChunk(const EXRImage* exr_image, const EXRHeader* exr_header,
std::atomic<int> block_count(0); std::atomic<int> block_count(0);
int num_threads = std::min(std::max(1, int(std::thread::hardware_concurrency())), num_blocks); int num_threads = std::min(std::max(1, int(std::thread::hardware_concurrency())), num_blocks);
#if (TINYEXR_MAX_THREADS > 0)
num_threads = std::min(num_threads,TINYEXR_MAX_THREADS);
#endif
for (int t = 0; t < num_threads; t++) { for (int t = 0; t < num_threads; t++) {
workers.emplace_back(std::thread([&]() { workers.emplace_back(std::thread([&]() {
int i = 0; int i = 0;
@@ -8066,7 +8150,7 @@ size_t SaveEXRMultipartImageToMemory(const EXRImage* exr_images,
const EXRHeader** exr_headers, const EXRHeader** exr_headers,
unsigned int num_parts, unsigned int num_parts,
unsigned char** memory_out, const char** err) { unsigned char** memory_out, const char** err) {
if (exr_images == NULL || exr_headers == NULL || num_parts < 2 || if (exr_images == NULL || exr_headers == NULL || num_parts == 0 ||
memory_out == NULL) { memory_out == NULL) {
tinyexr::SetErrorMessage("Invalid argument for SaveEXRNPartImageToMemory", tinyexr::SetErrorMessage("Invalid argument for SaveEXRNPartImageToMemory",
err); err);
@@ -8080,7 +8164,7 @@ int SaveEXRMultipartImageToFile(const EXRImage* exr_images,
unsigned int num_parts, unsigned int num_parts,
const char* filename, const char* filename,
const char** err) { const char** err) {
if (exr_images == NULL || exr_headers == NULL || num_parts < 2) { if (exr_images == NULL || exr_headers == NULL || num_parts == 0) {
tinyexr::SetErrorMessage("Invalid argument for SaveEXRMultipartImageToFile", tinyexr::SetErrorMessage("Invalid argument for SaveEXRMultipartImageToFile",
err); err);
return TINYEXR_ERROR_INVALID_ARGUMENT; return TINYEXR_ERROR_INVALID_ARGUMENT;
@@ -9047,13 +9131,19 @@ int SaveEXRToMemory(const float *data, int width, int height, int components,
images[3].resize(static_cast<size_t>(width * height)); images[3].resize(static_cast<size_t>(width * height));
// Split RGB(A)RGB(A)RGB(A)... into R, G and B(and A) layers // Split RGB(A)RGB(A)RGB(A)... into R, G and B(and A) layers
for (size_t i = 0; i < static_cast<size_t>(width * height); i++) { if (components == 4) {
images[0][i] = data[static_cast<size_t>(components) * i + 0]; for (size_t i = 0; i < static_cast<size_t>(width * height); i++) {
images[1][i] = data[static_cast<size_t>(components) * i + 1]; images[0][i] = data[static_cast<size_t>(components) * i + 0];
images[2][i] = data[static_cast<size_t>(components) * i + 2]; images[1][i] = data[static_cast<size_t>(components) * i + 1];
if (components == 4) { images[2][i] = data[static_cast<size_t>(components) * i + 2];
images[3][i] = data[static_cast<size_t>(components) * i + 3]; images[3][i] = data[static_cast<size_t>(components) * i + 3];
} }
} else {
for (size_t i = 0; i < static_cast<size_t>(width * height); i++) {
images[0][i] = data[static_cast<size_t>(components) * i + 0];
images[1][i] = data[static_cast<size_t>(components) * i + 1];
images[2][i] = data[static_cast<size_t>(components) * i + 2];
}
} }
} }
@@ -9198,13 +9288,19 @@ int SaveEXR(const float *data, int width, int height, int components,
images[3].resize(pixel_count); images[3].resize(pixel_count);
// Split RGB(A)RGB(A)RGB(A)... into R, G and B(and A) layers // Split RGB(A)RGB(A)RGB(A)... into R, G and B(and A) layers
for (size_t i = 0; i < pixel_count; i++) { if (components == 4) {
images[0][i] = data[static_cast<size_t>(components) * i + 0]; for (size_t i = 0; i < pixel_count; i++) {
images[1][i] = data[static_cast<size_t>(components) * i + 1]; images[0][i] = data[static_cast<size_t>(components) * i + 0];
images[2][i] = data[static_cast<size_t>(components) * i + 2]; images[1][i] = data[static_cast<size_t>(components) * i + 1];
if (components == 4) { images[2][i] = data[static_cast<size_t>(components) * i + 2];
images[3][i] = data[static_cast<size_t>(components) * i + 3]; images[3][i] = data[static_cast<size_t>(components) * i + 3];
} }
} else {
for (size_t i = 0; i < pixel_count; i++) {
images[0][i] = data[static_cast<size_t>(components) * i + 0];
images[1][i] = data[static_cast<size_t>(components) * i + 1];
images[2][i] = data[static_cast<size_t>(components) * i + 2];
}
} }
} }