]>
Commit | Line | Data |
---|---|---|
d8a28990 JB |
1 | --- luminance-hdr-2.5.1/src/TonemappingOperators/mantiuk08/display_function.h.orig 2017-05-10 21:14:06.000000000 +0200 |
2 | +++ luminance-hdr-2.5.1/src/TonemappingOperators/mantiuk08/display_function.h 2017-06-25 08:34:32.605245903 +0200 | |
3 | @@ -38,6 +38,10 @@ | |
4 | #include "Libpfs/utils/sse.h" | |
5 | #include <Libpfs/exception.h> | |
6 | ||
7 | +#ifdef LUMINANCE_USE_SSE | |
8 | +using pfs::utils::v4sf; | |
9 | +#endif | |
10 | + | |
11 | class DisplayFunction | |
12 | { | |
13 | public: | |
14 | --- luminance-hdr-2.5.1/src/Libpfs/utils/sse.cpp.orig 2017-05-10 21:14:06.000000000 +0200 | |
15 | +++ luminance-hdr-2.5.1/src/Libpfs/utils/sse.cpp 2017-06-25 09:17:55.551882851 +0200 | |
16 | @@ -23,6 +23,7 @@ | |
17 | //! @author Davide Anastasia, <davideanastasia@users.sourceforge.net> | |
18 | ||
19 | #include <Libpfs/utils/numeric.h> | |
20 | +#include <Libpfs/utils/sse.h> | |
21 | ||
22 | namespace pfs { | |
23 | namespace utils { | |
24 | --- luminance-hdr-2.5.1/src/Libpfs/utils/sse.h.orig 2017-05-10 21:14:06.000000000 +0200 | |
25 | +++ luminance-hdr-2.5.1/src/Libpfs/utils/sse.h 2017-06-25 09:32:27.331872888 +0200 | |
26 | @@ -25,9 +25,6 @@ | |
27 | #ifndef PFS_UTILS_SSE_H | |
28 | #define PFS_UTILS_SSE_H | |
29 | ||
30 | -namespace pfs { | |
31 | -namespace utils { | |
32 | - | |
33 | #ifdef __SSE__ | |
34 | ||
35 | //#if __ppc__ || __ppc7400__ || __ppc64__ || __ppc970__ | |
36 | @@ -46,6 +43,9 @@ | |
37 | ||
38 | #endif // __SSE__ | |
39 | ||
40 | +namespace pfs { | |
41 | +namespace utils { | |
42 | + | |
43 | #ifdef LUMINANCE_USE_SSE | |
44 | typedef __v4sf v4sf; | |
45 | v4sf _mm_log2_ps(v4sf); | |
46 | --- luminance-hdr-2.5.1/src/TonemappingOperators/mantiuk08/display_adaptive_tmo.cpp.orig 2017-05-10 21:14:06.000000000 +0200 | |
47 | +++ luminance-hdr-2.5.1/src/TonemappingOperators/mantiuk08/display_adaptive_tmo.cpp 2017-06-25 09:43:53.761865057 +0200 | |
48 | @@ -156,6 +156,9 @@ | |
49 | ||
50 | #ifdef LUMINANCE_USE_SSE | |
51 | ||
52 | +using pfs::utils::_mm_log2_ps; | |
53 | +using pfs::utils::_mm_pow_ps; | |
54 | + | |
55 | #define LOG2_10 3.3219280948874f | |
56 | #define LOG2_10__1 (1.0f/LOG2_10) | |
57 | static inline v4sf safe_log10( v4sf x, const float min_x = MIN_PHVAL, const float max_x = MAX_PHVAL ) | |
58 | --- luminance-hdr-2.5.1/src/TonemappingOperators/mantiuk08/display_function.cpp.orig 2017-05-10 21:14:06.000000000 +0200 | |
59 | +++ luminance-hdr-2.5.1/src/TonemappingOperators/mantiuk08/display_function.cpp 2017-06-25 09:44:55.215197686 +0200 | |
60 | @@ -95,6 +95,8 @@ | |
61 | ||
62 | #ifdef LUMINANCE_USE_SSE | |
63 | ||
64 | +using pfs::utils::_mm_pow_ps; | |
65 | + | |
66 | v4sf DisplayFunctionGGBA::inv_display( v4sf L ) | |
67 | { | |
68 | const v4sf voffset = _mm_set1_ps(L_offset); |