Merge pull request #670 from microsoft/develop

Bring HDR chromaticity naming fix to master
microsoft · Nov 6, 2020 · b8334cc · b8334cc
2 parents 69c728e + ab453c0
commit b8334cc
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/Samples/Desktop/D3D12HDR/src/D3D12HDR.cpp b/Samples/Desktop/D3D12HDR/src/D3D12HDR.cpp
@@ -953,7 +953,7 @@ void D3D12HDR::SetHDRMetaData(float MaxOutputNits /*=1000.0f*/, float MinOutputN
         return;
     }
 
-    static const DisplayChromacities DisplayChromacityList[] =
+    static const DisplayChromaticities DisplayChromaticityList[] =
     {
         { 0.64000f, 0.33000f, 0.30000f, 0.60000f, 0.15000f, 0.06000f, 0.31270f, 0.32900f }, // Display Gamut Rec709 
         { 0.70800f, 0.29200f, 0.17000f, 0.79700f, 0.13100f, 0.04600f, 0.31270f, 0.32900f }, // Display Gamut Rec2020
@@ -977,7 +977,7 @@ void D3D12HDR::SetHDRMetaData(float MaxOutputNits /*=1000.0f*/, float MinOutputN
     }
 
     // Set HDR meta data
-    const DisplayChromacities& Chroma = DisplayChromacityList[selectedChroma];
+    const DisplayChromaticities& Chroma = DisplayChromaticityList[selectedChroma];
     DXGI_HDR_METADATA_HDR10 HDR10MetaData = {};
     HDR10MetaData.RedPrimary[0] = static_cast<UINT16>(Chroma.RedX * 50000.0f);
     HDR10MetaData.RedPrimary[1] = static_cast<UINT16>(Chroma.RedY * 50000.0f);

diff --git a/Samples/Desktop/D3D12HDR/src/D3D12HDR.h b/Samples/Desktop/D3D12HDR/src/D3D12HDR.h
@@ -79,7 +79,7 @@ class D3D12HDR : public DXSample
         XMFLOAT2 uv;
     };
 
-    struct DisplayChromacities
+    struct DisplayChromaticities
     {
         float RedX;
         float RedY;

diff --git a/Samples/UWP/D3D12HDR/src/D3D12HDR.cpp b/Samples/UWP/D3D12HDR/src/D3D12HDR.cpp
@@ -923,7 +923,7 @@ void D3D12HDR::SetHDRMetaData(float MaxOutputNits /*=1000.0f*/, float MinOutputN
         return;
     }
 
-    static const DisplayChromacities DisplayChromacityList[] =
+    static const DisplayChromaticities DisplayChromaticityList[] =
     {
         { 0.64000f, 0.33000f, 0.30000f, 0.60000f, 0.15000f, 0.06000f, 0.31270f, 0.32900f }, // Display Gamut Rec709 
         { 0.70800f, 0.29200f, 0.17000f, 0.79700f, 0.13100f, 0.04600f, 0.31270f, 0.32900f }, // Display Gamut Rec2020
@@ -947,7 +947,7 @@ void D3D12HDR::SetHDRMetaData(float MaxOutputNits /*=1000.0f*/, float MinOutputN
     }
 
     // Set HDR meta data
-    const DisplayChromacities& Chroma = DisplayChromacityList[selectedChroma];
+    const DisplayChromaticities& Chroma = DisplayChromaticityList[selectedChroma];
     DXGI_HDR_METADATA_HDR10 HDR10MetaData = {};
     HDR10MetaData.RedPrimary[0] = static_cast<UINT16>(Chroma.RedX * 50000.0f);
     HDR10MetaData.RedPrimary[1] = static_cast<UINT16>(Chroma.RedY * 50000.0f);

diff --git a/Samples/UWP/D3D12HDR/src/D3D12HDR.h b/Samples/UWP/D3D12HDR/src/D3D12HDR.h
@@ -79,7 +79,7 @@ class D3D12HDR : public DXSample
         XMFLOAT2 uv;
     };
 
-    struct DisplayChromacities
+    struct DisplayChromaticities
     {
         float RedX;
         float RedY;