@@ -1820,6 +1820,19 @@ TEST(GeometryTest, ToIColor) {
18201820 ASSERT_EQ (Color::ToIColor (Color (0.5 , 0.5 , 1.0 , 1.0 )), 0xFF8080FF );
18211821}
18221822
1823+ TEST (GeometryTest, ColorIsWideGamut) {
1824+ EXPECT_FALSE (Color::Red ().IsWideGamut ());
1825+ EXPECT_FALSE (Color::White ().IsWideGamut ());
1826+ EXPECT_FALSE (Color::BlackTransparent ().IsWideGamut ());
1827+ EXPECT_FALSE (Color (0 .5f , 0 .5f , 0 .5f , 1 .0f ).IsWideGamut ());
1828+
1829+ // Wide gamut Display P3 values in extended linear sRGB
1830+ EXPECT_TRUE (Color (1 .0931f , -0 .2268f , -0 .1501f , 1 .0f ).IsWideGamut ());
1831+ EXPECT_TRUE (Color (-0 .5116f , 1 .0183f , -0 .3107f , 1 .0f ).IsWideGamut ());
1832+ EXPECT_TRUE (Color (1 .5f , 0 .5f , 0 .5f , 1 .0f ).IsWideGamut ());
1833+ EXPECT_TRUE (Color (-0 .1f , 0 .5f , 0 .5f , 1 .0f ).IsWideGamut ());
1834+ }
1835+
18231836TEST (GeometryTest, Gradient) {
18241837 {
18251838 // Simple 2 color gradient produces color buffer containing exactly those
@@ -1829,8 +1842,8 @@ TEST(GeometryTest, Gradient) {
18291842
18301843 auto gradient = CreateGradientBuffer (colors, stops);
18311844
1832- ASSERT_COLOR_BUFFER_NEAR (gradient.color_bytes , colors);
1833- ASSERT_EQ (gradient.texture_size , 2u );
1845+ EXPECT_COLORS_NEAR (gradient.colors , colors);
1846+ EXPECT_EQ (gradient.colors . size () , 2u );
18341847 }
18351848
18361849 {
@@ -1840,7 +1853,7 @@ TEST(GeometryTest, Gradient) {
18401853 std::vector<Scalar> stops = {0.0 , 0.25 , 0.25 , 1.0 };
18411854
18421855 auto gradient = CreateGradientBuffer (colors, stops);
1843- ASSERT_EQ (gradient.texture_size , 1024u );
1856+ EXPECT_EQ (gradient.colors . size () , 1024u );
18441857
18451858 std::vector<Color> expected_colors (1024 );
18461859 for (size_t i = 0 ; i < 1024 ; i++) {
@@ -1855,7 +1868,7 @@ TEST(GeometryTest, Gradient) {
18551868 Color::Lerp (Color::Black (), Color::Blue (), (t - 0.25 ) / 0.75 );
18561869 }
18571870 }
1858- ASSERT_COLOR_BUFFER_NEAR (gradient.color_bytes , expected_colors);
1871+ EXPECT_COLORS_NEAR (gradient.colors , expected_colors);
18591872 }
18601873
18611874 {
@@ -1867,8 +1880,8 @@ TEST(GeometryTest, Gradient) {
18671880
18681881 auto gradient = CreateGradientBuffer (colors, stops);
18691882
1870- ASSERT_COLOR_BUFFER_NEAR (gradient.color_bytes , colors);
1871- ASSERT_EQ (gradient.texture_size , 4u );
1883+ EXPECT_COLORS_NEAR (gradient.colors , colors);
1884+ EXPECT_EQ (gradient.colors . size () , 4u );
18721885 }
18731886
18741887 {
@@ -1885,8 +1898,8 @@ TEST(GeometryTest, Gradient) {
18851898 Color::Lerp (Color::Blue (), Color::Green (), 0.6666 ),
18861899 Color::Green (),
18871900 };
1888- ASSERT_COLOR_BUFFER_NEAR (gradient.color_bytes , lerped_colors);
1889- ASSERT_EQ (gradient.texture_size , 5u );
1901+ EXPECT_COLORS_NEAR (gradient.colors , lerped_colors);
1902+ EXPECT_EQ (gradient.colors . size () , 5u );
18901903 }
18911904
18921905 {
@@ -1900,8 +1913,34 @@ TEST(GeometryTest, Gradient) {
19001913
19011914 auto gradient = CreateGradientBuffer (colors, stops);
19021915
1903- ASSERT_EQ (gradient.texture_size , 1024u );
1904- ASSERT_EQ (gradient.color_bytes .size (), 1024u * 4 );
1916+ EXPECT_EQ (gradient.colors .size (), 1024u );
1917+ }
1918+
1919+ {
1920+ // Gradient with wide-gamut (out of [0, 1]) colors produces wide-gamut
1921+ // values.
1922+ Color p3_red = Color (1 .0931f , -0 .2268f , -0 .1501f , 1 .0f );
1923+ Color p3_green = Color (-0 .5116f , 1 .0183f , -0 .3107f , 1 .0f );
1924+ std::vector<Color> colors = {p3_red, p3_green};
1925+ std::vector<Scalar> stops = {0 .0f , 1 .0f };
1926+
1927+ auto gradient = CreateGradientBuffer (colors, stops);
1928+
1929+ EXPECT_EQ (gradient.colors .size (), 2u );
1930+ EXPECT_COLORS_NEAR (gradient.colors , colors);
1931+ }
1932+
1933+ {
1934+ // Multi-stop wide-gamut gradient interpolates floats accurately.
1935+ Color p3_red = Color (1 .0931f , -0 .2268f , -0 .1501f , 1 .0f );
1936+ Color p3_green = Color (-0 .5116f , 1 .0183f , -0 .3107f , 1 .0f );
1937+ std::vector<Color> colors = {p3_red, Color::White (), p3_green};
1938+ std::vector<Scalar> stops = {0 .0f , 0 .5f , 1 .0f };
1939+
1940+ auto gradient = CreateGradientBuffer (colors, stops);
1941+
1942+ EXPECT_EQ (gradient.colors .size (), 3u );
1943+ EXPECT_COLORS_NEAR (gradient.colors , colors);
19051944 }
19061945}
19071946
0 commit comments