Merge pull request #670 from microsoft/develop

sebmerry · web-flow · commit b8334ccadc31 · 2020-11-05T16:35:46.000-08:00
Bring HDR chromaticity naming fix to master
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;

Original file line number	Diff line number	Diff line change
`@@ -953,7 +953,7 @@ void D3D12HDR::SetHDRMetaData(float MaxOutputNits /=1000.0f/, float MinOutputN`
`953`	`953`	`return;`
`954`	`954`	`}`
`955`	`955`
`956`		`- static const DisplayChromacities DisplayChromacityList[] =`
	`956`	`+ static const DisplayChromaticities DisplayChromaticityList[] =`
`957`	`957`	`{`
`958`	`958`	`{ 0.64000f, 0.33000f, 0.30000f, 0.60000f, 0.15000f, 0.06000f, 0.31270f, 0.32900f }, // Display Gamut Rec709`
`959`	`959`	`{ 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`
`977`	`977`	`}`
`978`	`978`
`979`	`979`	`// Set HDR meta data`
`980`		`- const DisplayChromacities& Chroma = DisplayChromacityList[selectedChroma];`
	`980`	`+ const DisplayChromaticities& Chroma = DisplayChromaticityList[selectedChroma];`
`981`	`981`	`DXGI_HDR_METADATA_HDR10 HDR10MetaData = {};`
`982`	`982`	`HDR10MetaData.RedPrimary[0] = static_cast<UINT16>(Chroma.RedX * 50000.0f);`
`983`	`983`	`HDR10MetaData.RedPrimary[1] = static_cast<UINT16>(Chroma.RedY * 50000.0f);`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ class D3D12HDR : public DXSample`
`79`	`79`	`XMFLOAT2 uv;`
`80`	`80`	`};`
`81`	`81`
`82`		`- struct DisplayChromacities`
	`82`	`+ struct DisplayChromaticities`
`83`	`83`	`{`
`84`	`84`	`float RedX;`
`85`	`85`	`float RedY;`
Original file line number	Diff line number	Diff line change
`@@ -923,7 +923,7 @@ void D3D12HDR::SetHDRMetaData(float MaxOutputNits /=1000.0f/, float MinOutputN`
`923`	`923`	`return;`
`924`	`924`	`}`
`925`	`925`
`926`		`- static const DisplayChromacities DisplayChromacityList[] =`
	`926`	`+ static const DisplayChromaticities DisplayChromaticityList[] =`
`927`	`927`	`{`
`928`	`928`	`{ 0.64000f, 0.33000f, 0.30000f, 0.60000f, 0.15000f, 0.06000f, 0.31270f, 0.32900f }, // Display Gamut Rec709`
`929`	`929`	`{ 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`
`947`	`947`	`}`
`948`	`948`
`949`	`949`	`// Set HDR meta data`
`950`		`- const DisplayChromacities& Chroma = DisplayChromacityList[selectedChroma];`
	`950`	`+ const DisplayChromaticities& Chroma = DisplayChromaticityList[selectedChroma];`
`951`	`951`	`DXGI_HDR_METADATA_HDR10 HDR10MetaData = {};`
`952`	`952`	`HDR10MetaData.RedPrimary[0] = static_cast<UINT16>(Chroma.RedX * 50000.0f);`
`953`	`953`	`HDR10MetaData.RedPrimary[1] = static_cast<UINT16>(Chroma.RedY * 50000.0f);`