@@ -97,28 +97,38 @@ TEST_F(AndroidContextGLImpellerTest, FallbackForEmulator) {
9797 auto display = std::make_unique<MockDisplay>();
9898 EXPECT_CALL (*display, IsValid).WillRepeatedly (Return (true ));
9999 std::unique_ptr<Config> first_result;
100- auto second_result =
101- std::make_unique<Config>(ConfigDescriptor (), window_egl_config);
100+ std::unique_ptr<Config> second_result;
102101 auto third_result =
102+ std::make_unique<Config>(ConfigDescriptor (), window_egl_config);
103+ auto fourth_result =
103104 std::make_unique<Config>(ConfigDescriptor (), pbuffer_egl_config);
104105 EXPECT_CALL (
105106 *display,
106107 ChooseConfig (Matcher<ConfigDescriptor>(AllOf (
108+ Field (&ConfigDescriptor::api, impeller::egl::API::kOpenGLES3 ),
107109 Field (&ConfigDescriptor::samples, impeller::egl::Samples::kFour ),
108110 Field (&ConfigDescriptor::surface_type,
109111 impeller::egl::SurfaceType::kWindow )))))
110112 .WillOnce (Return (ByMove (std::move (first_result))));
113+ EXPECT_CALL (
114+ *display,
115+ ChooseConfig (Matcher<ConfigDescriptor>(AllOf (
116+ Field (&ConfigDescriptor::api, impeller::egl::API::kOpenGLES2 ),
117+ Field (&ConfigDescriptor::samples, impeller::egl::Samples::kFour ),
118+ Field (&ConfigDescriptor::surface_type,
119+ impeller::egl::SurfaceType::kWindow )))))
120+ .WillOnce (Return (ByMove (std::move (second_result))));
111121 EXPECT_CALL (
112122 *display,
113123 ChooseConfig (Matcher<ConfigDescriptor>(
114124 AllOf (Field (&ConfigDescriptor::samples, impeller::egl::Samples::kOne ),
115125 Field (&ConfigDescriptor::surface_type,
116126 impeller::egl::SurfaceType::kWindow )))))
117- .WillOnce (Return (ByMove (std::move (second_result ))));
127+ .WillOnce (Return (ByMove (std::move (third_result ))));
118128 EXPECT_CALL (*display, ChooseConfig (Matcher<ConfigDescriptor>(
119129 Field (&ConfigDescriptor::surface_type,
120130 impeller::egl::SurfaceType::kPBuffer ))))
121- .WillOnce (Return (ByMove (std::move (third_result ))));
131+ .WillOnce (Return (ByMove (std::move (fourth_result ))));
122132 ON_CALL (*display, ChooseConfig (_))
123133 .WillByDefault (Return (ByMove (std::unique_ptr<Config>())));
124134 auto context =
0 commit comments