Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR: Add DISPLAY - CIE-XYZ-D65_to_DisplayP3-HDR builtin transform. #2095

Merged

Conversation

KelSolaar
Copy link
Contributor

This PR adds the DISPLAY - CIE-XYZ-D65_to_DisplayP3-HDR builtin transform: The intent is to provide a new display that can help partition better the SDR and HDR view transforms for Display P3. This will be especially useful for the OpenColorIO-Config-ACES generator.

References AcademySoftwareFoundation/OpenColorIO-Config-ACES#130

@doug-walker
Copy link
Collaborator

@KelSolaar , this looks good, but please duplicate this test with the new built-in name so that the unit tests pass:

{ "DISPLAY - CIE-XYZ-D65_to_DisplayP3",

@KelSolaar
Copy link
Contributor Author

Thanks, just did!

Copy link
Collaborator

@doug-walker doug-walker left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Collaborator

@carolalynn carolalynn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks Thomas :)

@KelSolaar KelSolaar merged commit f37ca55 into AcademySoftwareFoundation:main Nov 18, 2024
25 checks passed
@KelSolaar KelSolaar deleted the display-p3-hdr branch November 18, 2024 22:07
doug-walker pushed a commit to autodesk-forks/OpenColorIO that referenced this pull request Dec 12, 2024
doug-walker added a commit that referenced this pull request Dec 12, 2024
* Match ACES 2.0 shader resource suffix format to regular luts. (#2077)

Signed-off-by: Eric Renaud-Houde <[email protected]>
(cherry picked from commit 59d6a86)
Signed-off-by: Doug Walker <[email protected]>

* Build: enable parallel source file compilation on MSVC (#2072)

By default Visual Studio projects do not compile source files in
parallel. Add "/MP" flag to enable that.

From scratch OCIO build on Ryzen 5950X, VS2022: 580sec -> 208sec.
Most of remaining single-threaded time is cloning external libraries
or building external libraries (most of them don't do parallel
compilation either). But within building OCIO itself, CPU usage
goes close to 100% instead of 5%.

Signed-off-by: Aras Pranckevicius <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit 707734d)
Signed-off-by: Doug Walker <[email protected]>

* Move GPU LUT files into the tests dir (#2069)

Instead of creating temporary LUT files for GPU tests,
read them from the testdata directory instead.
This removes the need to clean them up after each run.

Signed-off-by: Ananth Bhaskararaman <[email protected]>
(cherry picked from commit b3900df)
Signed-off-by: Doug Walker <[email protected]>

* Photoshop now supports OCIO (#2084)

* ocio gm in photoshop

Signed-off-by: Dave Sawyer <[email protected]>

* Update supported_apps.yml

Signed-off-by: Dave Sawyer <[email protected]>

* ps and fnordware text

Signed-off-by: Dave Sawyer <[email protected]>

---------

Signed-off-by: Dave Sawyer <[email protected]>
(cherry picked from commit 81c07fd)
Signed-off-by: Doug Walker <[email protected]>

* Update doc building instructions (#2085)

* Update doc building instructions

Signed-off-by: Craig Zerouni <[email protected]>

* Remove stray comment line

Signed-off-by: Craig Zerouni <[email protected]>

---------

Signed-off-by: Craig Zerouni <[email protected]>
(cherry picked from commit 800efd8)
Signed-off-by: Doug Walker <[email protected]>

* add Disguise to list of supported applications (#2088)

Signed-off-by: Chris Nash <[email protected]>
Co-authored-by: zachlewis <[email protected]>
(cherry picked from commit 9bc5b8e)
Signed-off-by: Doug Walker <[email protected]>

* Add `DISPLAY - CIE-XYZ-D65_to_DisplayP3-HDR` builtin transform. (#2095)

(cherry picked from commit f37ca55)
Signed-off-by: Doug Walker <[email protected]>

* Fix broken Linux and Mac CI workflow (#2102)

* Fix broken Linux and Mac CI workflow

Signed-off-by: Doug Walker <[email protected]>

* Update job name

Signed-off-by: Doug Walker <[email protected]>

---------

Signed-off-by: Doug Walker <[email protected]>
(cherry picked from commit c7ad2a9)
Signed-off-by: Doug Walker <[email protected]>

* Text format (e.g. IridasCube) parsing optimizations (#2074)

* Iridas .cube and other text format parsing optimizations

Primarily driven by a wish to increase performance of parsing .cube
files. But the functions that are added or changed are used across
parsing of all/most of text based formats.

With these changes, parsing "Khronos PBR Neutral" .cube file (5.4MB)
on Ryzen 5950X / VS2022 Release build: 167ms -> 123ms.

- Add locale independent IsSpace(char). Somewhat similar to 3aab90d,
  whitespace trimming perhaps should not be locale dependent.
- Add IsEmptyOrWhiteSpace() and use that inside ParseUtils::nextline,
  instead of doing Trim(line).empty().
- Add StringUtils::StartsWith(char) and use that in various parsers
  that were constructing whole std::string object just to check for a
  single character.
- When building for C++17 or later, NumberUtils can use standard
  <charconv> from_chars functions (except on Apple platforms, where
  those are not implemented for floating point types as of Xcode 15).
  This has advantage of not having to deal with errno or locales. Saves
  some thread local storage accesses and function calls (e.g. on Windows
  errno is actually a function call).
- There's a CMake setup change that adds /Zc:__cplusplus flag for MSVC;
  for backwards compat reasons it does not report proper C++ version
  detection defines otherwise.

Signed-off-by: Aras Pranckevicius <[email protected]>

* Fix test failures (char can be signed, doh)

Signed-off-by: Aras Pranckevicius <[email protected]>

* Tests: add unit test coverage for NumberUtils::from_chars directly

Currently it was only tested indirectly via XMLReaderUtils_tests and
file format tests

Signed-off-by: Aras Pranckevicius <[email protected]>

* Fix from_chars in C++17 code path to understand hex prefix (0x) and skip optional whitespace

To match the pre-C++17 behavior that was there before

Signed-off-by: Aras Pranckevicius <[email protected]>

* Fix detection of <charconv> float from_chars availability

Signed-off-by: Aras Pranckevicius <[email protected]>

* Tests: Fix missing <limits> include for gcc

Signed-off-by: Aras Pranckevicius <[email protected]>

* Tests: fix uninitialized variable warning-as-error on gcc

Signed-off-by: Aras Pranckevicius <[email protected]>

---------

Signed-off-by: Aras Pranckevicius <[email protected]>
Co-authored-by: Rémi Achard <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit f2dc147)
Signed-off-by: Doug Walker <[email protected]>

* [2057] - Fix views/display submenus in OCIODisplay app (#2068)

* fix views/display submenus

Signed-off-by: Hannah <[email protected]>

* fix global variable name

Signed-off-by: Hannah <[email protected]>

---------

Signed-off-by: Hannah <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit 5c2fa57)
Signed-off-by: Doug Walker <[email protected]>

* Fix bit-depth attr for inv luts for CTF writing (#2090)

Signed-off-by: Doug Walker <[email protected]>
(cherry picked from commit dafefe6)
Signed-off-by: Doug Walker <[email protected]>

* Fixed range function error in nuke colorlookup examples (#2096)

* Error found: ocio_to_colorlookup_all.py

Signed-off-by: Seif Ashraf <[email protected]>

* Update colorlookup_to_spi1d.py

Signed-off-by: Seif Ashraf <[email protected]>

* Update ocio_to_colorlookup_rgb.py

Signed-off-by: Seif Ashraf <[email protected]>

---------

Signed-off-by: Seif Ashraf <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit 0f06f04)
Signed-off-by: Doug Walker <[email protected]>

* Replaced DX11 HLSL shading language with the more accurate shading model 5.0 (SM_5_0). (#2078)

Signed-off-by: Eric Renaud-Houde <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit 3132579)
Signed-off-by: Doug Walker <[email protected]>

* Adsk Contrib - Optimizer should detect pair inverses before combining multiple op pairs (#2104)

* Fix opt combine issue

Signed-off-by: Doug Walker <[email protected]>

* Improve gamma test

Signed-off-by: Doug Walker <[email protected]>

* Add check for DisplayP3-HDR built-in

Signed-off-by: Doug Walker <[email protected]>

---------

Signed-off-by: Doug Walker <[email protected]>
(cherry picked from commit 1890b7d)
Signed-off-by: Doug Walker <[email protected]>

* Fix Python wheel macOS workflow and make OCIO_PYTHON_LOAD_DLLS_FROM_PATH opt-in (#2106)

Signed-off-by: Rémi Achard <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit 6fa40a4)
Signed-off-by: Doug Walker <[email protected]>

* Increment library version to 2.4.1

Signed-off-by: Doug Walker <[email protected]>

---------

Signed-off-by: Eric Renaud-Houde <[email protected]>
Signed-off-by: Doug Walker <[email protected]>
Signed-off-by: Aras Pranckevicius <[email protected]>
Signed-off-by: Ananth Bhaskararaman <[email protected]>
Signed-off-by: Dave Sawyer <[email protected]>
Signed-off-by: Craig Zerouni <[email protected]>
Signed-off-by: Chris Nash <[email protected]>
Signed-off-by: Hannah <[email protected]>
Signed-off-by: Seif Ashraf <[email protected]>
Signed-off-by: Rémi Achard <[email protected]>
Co-authored-by: Éric Renaud-Houde <[email protected]>
Co-authored-by: Aras Pranckevičius <[email protected]>
Co-authored-by: Ananth <[email protected]>
Co-authored-by: Dave Sawyer <[email protected]>
Co-authored-by: Craig Zerouni <[email protected]>
Co-authored-by: Chris Nash <[email protected]>
Co-authored-by: zachlewis <[email protected]>
Co-authored-by: Thomas Mansencal <[email protected]>
Co-authored-by: Rémi Achard <[email protected]>
Co-authored-by: hannahmkrasnick <[email protected]>
Co-authored-by: Seif Ashraf <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants