birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PR feedback

Browse Source
This commit is contained in:
mnaumov
2021-05-19 16:18:02 -07:00
parent 19664dccd2
commit e510446185
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ACES/AcesDisplayMapperFeatureProcessor.h
+6 -6
View File
@@ -60,6 +60,12 @@ namespace AZ
: public DisplayMapperFeatureProcessorInterface
{
public:
enum OutputDeviceTransformFlags
{
AlterSurround = 0x1, // Apply gamma adjustment to compensate for dim surround
ApplyDesaturation = 0x2, // Apply desaturation to compensate for luminance difference
ApplyCATD60toD65 = 0x4, // Apply Color appearance transform (CAT) from ACES white point to assumed observer adapted white point
};
AZ_RTTI(AZ::Render::AcesDisplayMapperFeatureProcessor, "{995C2B93-8B08-4313-89B0-02394F90F1B8}", AZ::Render::DisplayMapperFeatureProcessorInterface);
@@ -92,12 +98,6 @@ namespace AZ
static void ApplyLdrOdtParameters(DisplayMapperParameters* pOutParameters);
static void ApplyHdrOdtParameters(DisplayMapperParameters* pOutParameters, const OutputDeviceTransformType& odtType);
enum OutputDeviceTransformFlags {
AlterSurround = 0x1, // Apply gamma adjustment to compensate for dim surround
ApplyDesaturation = 0x2, // Apply desaturation to compensate for luminance difference
ApplyCATD60toD65 = 0x4, // Apply Color appearance transform (CAT) from ACES white point to assumed observer adapted white point
};
enum OutputDeviceTransformMode {
Srgb = 0,
PerceptualQuantizer,
Gems/Atom/Feature/Common/Code/Source/DisplayMapper/AcesOutputTransformPass.cpp
+3 -3
View File
@@ -108,15 +108,15 @@ namespace AZ
m_displayMapperParameters.m_OutputDisplayTransformFlags = 0;
if (m_acesParameterOverrides.m_alterSurround)
{
m_displayMapperParameters.m_OutputDisplayTransformFlags |= 0x1;
m_displayMapperParameters.m_OutputDisplayTransformFlags |= AcesDisplayMapperFeatureProcessor::AlterSurround;
}
if (m_acesParameterOverrides.m_applyDesaturation)
{
m_displayMapperParameters.m_OutputDisplayTransformFlags |= 0x2;
m_displayMapperParameters.m_OutputDisplayTransformFlags |= AcesDisplayMapperFeatureProcessor::ApplyDesaturation;
}
if (m_acesParameterOverrides.m_applyCATD60toD65)
{
m_displayMapperParameters.m_OutputDisplayTransformFlags |= 0x4;
m_displayMapperParameters.m_OutputDisplayTransformFlags |= AcesDisplayMapperFeatureProcessor::ApplyCATD60toD65;
}
m_displayMapperParameters.m_cinemaLimits[0] = m_acesParameterOverrides.m_cinemaLimitsBlack;
Gems/Atom/Feature/Common/Code/Source/DisplayMapper/DisplayMapperConfigurationDescriptor.cpp
+3 -3
View File
@@ -45,9 +45,9 @@ namespace AZ
DisplayMapperParameters displayMapperParameters;
AcesDisplayMapperFeatureProcessor::GetAcesDisplayMapperParameters(&displayMapperParameters, m_preset);
m_alterSurround = (displayMapperParameters.m_OutputDisplayTransformFlags & 0x1) != 0;
m_applyDesaturation = (displayMapperParameters.m_OutputDisplayTransformFlags & 0x2) != 0;
m_applyCATD60toD65 = (displayMapperParameters.m_OutputDisplayTransformFlags & 0x4) != 0;
m_alterSurround = (displayMapperParameters.m_OutputDisplayTransformFlags & AcesDisplayMapperFeatureProcessor::AlterSurround) != 0;
m_applyDesaturation = (displayMapperParameters.m_OutputDisplayTransformFlags & AcesDisplayMapperFeatureProcessor::ApplyDesaturation) != 0;
m_applyCATD60toD65 = (displayMapperParameters.m_OutputDisplayTransformFlags & AcesDisplayMapperFeatureProcessor::ApplyCATD60toD65) != 0;
m_cinemaLimitsBlack = displayMapperParameters.m_cinemaLimits[0];
m_cinemaLimitsWhite = displayMapperParameters.m_cinemaLimits[1];
m_minPoint = displayMapperParameters.m_acesSplineParams.minPoint[0];