@@ -1629,44 +1629,55 @@ static void expectSoftwareRenderingOutputMatches(
16291629 std::vector<uint8_t >(bytes, bytes + sizeof (T)));
16301630}
16311631
1632- #define SW_PIXFMT_TEST_F (dart_entrypoint, pixfmt, matcher ) \
1633- TEST_F (EmbedderTest, \
1634- SoftwareRenderingPixelFormats_##dart_entrypoint##_##pixfmt) { \
1632+ #define SW_PIXFMT_TEST_F (test_name, dart_entrypoint, pixfmt, matcher ) \
1633+ TEST_F (EmbedderTest, SoftwareRenderingPixelFormats##test_name) { \
16351634 expectSoftwareRenderingOutputMatches (*this , #dart_entrypoint, pixfmt, \
16361635 matcher); \
16371636 }
16381637
16391638// Don't test the pixel formats that contain padding (so an X) and the kNative32
16401639// pixel format here, so we don't add any flakiness.
1641- SW_PIXFMT_TEST_F (draw_solid_red, kRGB565 , (uint16_t )0xF800 );
1642- SW_PIXFMT_TEST_F (draw_solid_red, kRGBA4444 , (uint16_t )0xF00F );
1643- SW_PIXFMT_TEST_F (draw_solid_red,
1640+ SW_PIXFMT_TEST_F (RedRGBA565xF800, draw_solid_red, kRGB565 , (uint16_t )0xF800 );
1641+ SW_PIXFMT_TEST_F (RedRGBA4444xF00F, draw_solid_red, kRGBA4444 , (uint16_t )0xF00F );
1642+ SW_PIXFMT_TEST_F (RedRGBA8888xFFx00x00xFF,
1643+ draw_solid_red,
16441644 kRGBA8888 ,
16451645 (std::vector<uint8_t >{0xFF , 0x00 , 0x00 , 0xFF }));
1646- SW_PIXFMT_TEST_F (draw_solid_red,
1646+ SW_PIXFMT_TEST_F (RedBGRA8888x00x00xFFxFF,
1647+ draw_solid_red,
16471648 kBGRA8888 ,
16481649 (std::vector<uint8_t >{0x00 , 0x00 , 0xFF , 0xFF }));
1649- SW_PIXFMT_TEST_F (draw_solid_red, kGray8 , (uint8_t )0x36 );
1650-
1651- SW_PIXFMT_TEST_F (draw_solid_green, kRGB565 , (uint16_t )0x07E0 );
1652- SW_PIXFMT_TEST_F (draw_solid_green, kRGBA4444 , (uint16_t )0x0F0F );
1653- SW_PIXFMT_TEST_F (draw_solid_green,
1650+ SW_PIXFMT_TEST_F (RedGray8x36, draw_solid_red, kGray8 , (uint8_t )0x36 );
1651+
1652+ SW_PIXFMT_TEST_F (GreenRGB565x07E0, draw_solid_green, kRGB565 , (uint16_t )0x07E0 );
1653+ SW_PIXFMT_TEST_F (GreenRGBA4444x0F0F,
1654+ draw_solid_green,
1655+ kRGBA4444 ,
1656+ (uint16_t )0x0F0F );
1657+ SW_PIXFMT_TEST_F (GreenRGBA8888x00xFFx00xFF,
1658+ draw_solid_green,
16541659 kRGBA8888 ,
16551660 (std::vector<uint8_t >{0x00 , 0xFF , 0x00 , 0xFF }));
1656- SW_PIXFMT_TEST_F (draw_solid_green,
1661+ SW_PIXFMT_TEST_F (GreenBGRA8888x00xFFx00xFF,
1662+ draw_solid_green,
16571663 kBGRA8888 ,
16581664 (std::vector<uint8_t >{0x00 , 0xFF , 0x00 , 0xFF }));
1659- SW_PIXFMT_TEST_F (draw_solid_green, kGray8 , (uint8_t )0xB6 );
1660-
1661- SW_PIXFMT_TEST_F (draw_solid_blue, kRGB565 , (uint16_t )0x001F );
1662- SW_PIXFMT_TEST_F (draw_solid_blue, kRGBA4444 , (uint16_t )0x00FF );
1663- SW_PIXFMT_TEST_F (draw_solid_blue,
1665+ SW_PIXFMT_TEST_F (GreenGray8xB6, draw_solid_green, kGray8 , (uint8_t )0xB6 );
1666+
1667+ SW_PIXFMT_TEST_F (BlueRGB565x001F, draw_solid_blue, kRGB565 , (uint16_t )0x001F );
1668+ SW_PIXFMT_TEST_F (BlueRGBA4444x00FF,
1669+ draw_solid_blue,
1670+ kRGBA4444 ,
1671+ (uint16_t )0x00FF );
1672+ SW_PIXFMT_TEST_F (BlueRGBA8888x00x00xFFxFF,
1673+ draw_solid_blue,
16641674 kRGBA8888 ,
16651675 (std::vector<uint8_t >{0x00 , 0x00 , 0xFF , 0xFF }));
1666- SW_PIXFMT_TEST_F (draw_solid_blue,
1676+ SW_PIXFMT_TEST_F (BlueBGRA8888xFFx00x00xFF,
1677+ draw_solid_blue,
16671678 kBGRA8888 ,
16681679 (std::vector<uint8_t >{0xFF , 0x00 , 0x00 , 0xFF }));
1669- SW_PIXFMT_TEST_F (draw_solid_blue, kGray8 , (uint8_t )0x12 );
1680+ SW_PIXFMT_TEST_F (BlueGray8x12, draw_solid_blue, kGray8 , (uint8_t )0x12 );
16701681
16711682// ------------------------------------------------------------------------------
16721683// Key Data
0 commit comments