From c1bde75768e1374d4f094936d52ed29f6f5d3cba Mon Sep 17 00:00:00 2001 From: RunitaiLinden Date: Fri, 8 Mar 2024 12:01:20 -0600 Subject: HDRI Local Preview (#953) * #926 WIP - HDRI import prototype v0 * #926 WIP -- add OpenEXR to autobuild.xml * #926 WIP -- Add OpenEXR cmake * #926 WIP -- Attempt at using OpenEXR autobuild package and don't hard code .exr file to load * #926 Unmangle autobuild.xml and get dll's in the right place (thanks, Caladbolg!) * implement mac shared libs plumbing for OpenEXR for secondlife/viewer#926 * Fix Xcode/clang compile error regarding new[]/delete[] mismatch * #926 HDRI Preview finishing touches. - Full ACES when HDRI is enabled - Fix for probes getting stuck paused - Add exposure and rotation controls --------- Co-authored-by: Brad Linden --- indra/cmake/Copy3rdPartyLibs.cmake | 12 ++++++++++++ indra/cmake/OpenEXR.cmake | 18 ++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 indra/cmake/OpenEXR.cmake (limited to 'indra/cmake') diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 9f79c13a97..415641f65f 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -60,6 +60,12 @@ if(WINDOWS) nghttp2.dll libhunspell.dll uriparser.dll + Iex-3_2.dll + IlmThread-3_2.dll + Imath-3_1.dll + OpenEXR-3_2.dll + OpenEXRCore-3_2.dll + OpenEXRUtil-3_2.dll ) # ICU4C (same filenames for 32 and 64 bit builds) @@ -184,6 +190,12 @@ elseif(DARWIN) liburiparser.dylib liburiparser.1.dylib liburiparser.1.0.27.dylib + libIex-3_2.dylib + libIlmThread-3_2.dylib + libImath-3_1.dylib + libOpenEXR-3_2.dylib + libOpenEXRCore-3_2.dylib + libOpenEXRUtil-3_2.dylib ) if (TARGET ll::fmodstudio) diff --git a/indra/cmake/OpenEXR.cmake b/indra/cmake/OpenEXR.cmake new file mode 100644 index 0000000000..ee21fac541 --- /dev/null +++ b/indra/cmake/OpenEXR.cmake @@ -0,0 +1,18 @@ +# -*- cmake -*- + +include(Prebuilt) + +include_guard() +add_library( ll::openexr INTERFACE IMPORTED ) + +if(USE_CONAN ) + target_link_libraries( ll::openexr INTERFACE CONAN_PKG::openexr ) + return() +endif() + +use_prebuilt_binary(openexr) + +target_link_libraries( ll::openexr INTERFACE Iex-3_2 IlmThread-3_2 Imath-3_1 OpenEXR-3_2 OpenEXRCore-3_2 OpenEXRUtil-3_2) + +target_include_directories( ll::openexr SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/OpenEXR ${LIBS_PREBUILT_DIR}/include/Imath) + -- cgit v1.2.3 From ab5ea5d13479c5a419c982433a1052bf3b2d8322 Mon Sep 17 00:00:00 2001 From: Brad Linden Date: Tue, 12 Mar 2024 16:49:20 -0700 Subject: secondlife/viewer#926 switching cmake config for mac openexr to use new static libs --- indra/cmake/Copy3rdPartyLibs.cmake | 6 ------ 1 file changed, 6 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 415641f65f..873253b419 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -190,12 +190,6 @@ elseif(DARWIN) liburiparser.dylib liburiparser.1.dylib liburiparser.1.0.27.dylib - libIex-3_2.dylib - libIlmThread-3_2.dylib - libImath-3_1.dylib - libOpenEXR-3_2.dylib - libOpenEXRCore-3_2.dylib - libOpenEXRUtil-3_2.dylib ) if (TARGET ll::fmodstudio) -- cgit v1.2.3 From e361671018068000a8b63b3cdc2ad87468def9a3 Mon Sep 17 00:00:00 2001 From: Rye Mutt Date: Fri, 19 Apr 2024 15:39:28 -0400 Subject: Port from OpenEXR to TinyEXR for reduced installer and library size (#1287) --- indra/cmake/CMakeLists.txt | 2 ++ indra/cmake/Copy3rdPartyLibs.cmake | 6 ------ indra/cmake/OpenEXR.cmake | 18 ------------------ indra/cmake/TinyEXR.cmake | 7 +++++++ 4 files changed, 9 insertions(+), 24 deletions(-) delete mode 100644 indra/cmake/OpenEXR.cmake create mode 100644 indra/cmake/TinyEXR.cmake (limited to 'indra/cmake') diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt index 05c51c018d..da7e4be464 100644 --- a/indra/cmake/CMakeLists.txt +++ b/indra/cmake/CMakeLists.txt @@ -56,6 +56,8 @@ set(cmake_SOURCE_FILES PulseAudio.cmake Python.cmake TemplateCheck.cmake + TinyEXR.cmake + TinyGLTF.cmake Tut.cmake UI.cmake UnixInstall.cmake diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 873253b419..9f79c13a97 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -60,12 +60,6 @@ if(WINDOWS) nghttp2.dll libhunspell.dll uriparser.dll - Iex-3_2.dll - IlmThread-3_2.dll - Imath-3_1.dll - OpenEXR-3_2.dll - OpenEXRCore-3_2.dll - OpenEXRUtil-3_2.dll ) # ICU4C (same filenames for 32 and 64 bit builds) diff --git a/indra/cmake/OpenEXR.cmake b/indra/cmake/OpenEXR.cmake deleted file mode 100644 index ee21fac541..0000000000 --- a/indra/cmake/OpenEXR.cmake +++ /dev/null @@ -1,18 +0,0 @@ -# -*- cmake -*- - -include(Prebuilt) - -include_guard() -add_library( ll::openexr INTERFACE IMPORTED ) - -if(USE_CONAN ) - target_link_libraries( ll::openexr INTERFACE CONAN_PKG::openexr ) - return() -endif() - -use_prebuilt_binary(openexr) - -target_link_libraries( ll::openexr INTERFACE Iex-3_2 IlmThread-3_2 Imath-3_1 OpenEXR-3_2 OpenEXRCore-3_2 OpenEXRUtil-3_2) - -target_include_directories( ll::openexr SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/OpenEXR ${LIBS_PREBUILT_DIR}/include/Imath) - diff --git a/indra/cmake/TinyEXR.cmake b/indra/cmake/TinyEXR.cmake new file mode 100644 index 0000000000..e6d142d19d --- /dev/null +++ b/indra/cmake/TinyEXR.cmake @@ -0,0 +1,7 @@ +# -*- cmake -*- +include(Prebuilt) + +use_prebuilt_binary(tinyexr) + +set(TINYEXR_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/tinyexr) + -- cgit v1.2.3