@@ -90,11 +90,24 @@ BlitCopyTextureToBufferCommandGLES CreateCopyTextureToBufferCommand(
9090
9191} // namespace
9292
93- TEST (BlitCommandGLESTest, BlitCopyBufferToTextureCommandGLESRGBA) {
93+ struct TextureUploadPrebindCase {
94+ const char * name;
95+ const char * renderer;
96+ const char * version;
97+ bool needs_prebind;
98+ };
99+
100+ class TextureUploadPrebindTest
101+ : public ::testing::TestWithParam<TextureUploadPrebindCase> {};
102+
103+ TEST_P (TextureUploadPrebindTest, RebindsOnlyAffectedDriversBeforeUpload) {
94104 auto mock_gles_impl = std::make_unique<MockGLESImpl>();
95105 auto & mock_gles_impl_ref = *mock_gles_impl;
96106
97- std::shared_ptr<MockGLES> mock_gl = MockGLES::Init (std::move (mock_gles_impl));
107+ const auto & test_case = GetParam ();
108+ std::shared_ptr<MockGLES> mock_gl =
109+ MockGLES::Init (std::move (mock_gles_impl), std::nullopt , test_case.version ,
110+ test_case.renderer );
98111 auto reactor = std::make_shared<TestReactorGLES>();
99112 auto worker = std::make_shared<MockWorker>();
100113 reactor->AddWorker (worker);
@@ -108,9 +121,14 @@ TEST(BlitCommandGLESTest, BlitCopyBufferToTextureCommandGLESRGBA) {
108121 BlitCopyBufferToTextureCommandGLES command =
109122 CreateCopyBufferToTextureCommand (source_buffer, dest_texture);
110123
124+ if (!test_case.needs_prebind ) {
125+ EXPECT_CALL (mock_gles_impl_ref, BindTexture (GL_TEXTURE_2D , 0u )).Times (0 );
126+ }
111127 {
112128 ::testing::InSequence sequence;
113- EXPECT_CALL (mock_gles_impl_ref, BindTexture (GL_TEXTURE_2D , 0u ));
129+ if (test_case.needs_prebind ) {
130+ EXPECT_CALL (mock_gles_impl_ref, BindTexture (GL_TEXTURE_2D , 0u ));
131+ }
114132 EXPECT_CALL (mock_gles_impl_ref, BindTexture (GL_TEXTURE_2D , 7u ));
115133 // Upload only after the texture has been rebound.
116134 EXPECT_CALL (mock_gles_impl_ref,
@@ -121,6 +139,53 @@ TEST(BlitCommandGLESTest, BlitCopyBufferToTextureCommandGLESRGBA) {
121139 EXPECT_TRUE (command.Encode (*reactor));
122140}
123141
142+ INSTANTIATE_TEST_SUITE_P (
143+ ArmErratum1792661,
144+ TextureUploadPrebindTest,
145+ ::testing::Values (
146+ TextureUploadPrebindCase{" BeforeAffectedRange" , " Mali-G71" ,
147+ " OpenGL ES 3.2 v1.r16p0-01rel0" , false },
148+ TextureUploadPrebindCase{" FirstAffectedRelease" , " Mali-G71" ,
149+ " OpenGL ES 3.2 v1.r17p0-01rel0" , true },
150+ TextureUploadPrebindCase{" AffectedG72" , " Mali-G72 MP18" ,
151+ " OpenGL ES 3.2 v1.r18p0-01rel0" , true },
152+ TextureUploadPrebindCase{" LastAffectedRelease" , " Mali-G76" ,
153+ " OpenGL ES 3.2 v1.r23p0-01rel0" , true },
154+ TextureUploadPrebindCase{" AffectedValhall" , " Mali-G77" ,
155+ " OpenGL ES 3.2 v1.r19p0-01rel0" , true },
156+ TextureUploadPrebindCase{" FixedRelease" , " Mali-G72" ,
157+ " OpenGL ES 3.2 v1.r24p0-01rel0" , false },
158+ TextureUploadPrebindCase{" NewerRelease" , " Mali-G78" ,
159+ " OpenGL ES 3.2 v1.r36p0-01rel0" , false },
160+ TextureUploadPrebindCase{" Midgard" , " Mali-T880" ,
161+ " OpenGL ES 3.2 v1.r18p0-01rel0" , false },
162+ TextureUploadPrebindCase{" OtherVendor" , " Adreno (TM) 530" ,
163+ " OpenGL ES 3.2 [email protected] " ,
false },
164+ TextureUploadPrebindCase{" UnknownArmDriver" , " Mali-G72" ,
165+ " OpenGL ES 3.2" , true },
166+ TextureUploadPrebindCase{" MalformedArmDriver" , " Mali-G72" ,
167+ " OpenGL ES 3.2 v1.r24p-01rel0" , true },
168+ TextureUploadPrebindCase{" Angle" , " Mali-G72" ,
169+ " OpenGL ES 3.2 (ANGLE 2.1) v1.r18p0" , false },
170+ TextureUploadPrebindCase{" DesktopGL" , " Mali-G72" , " 4.6 v1.r18p0" ,
171+ false },
172+ TextureUploadPrebindCase{" LaterPatchBeforeFix" , " Mali-G76" ,
173+ " OpenGL ES 3.2 v1.r23p1-01rel0" , true },
174+ TextureUploadPrebindCase{" NoBuildSuffix" , " Mali-G72" ,
175+ " OpenGL ES 3.2 v1.r18p0" , true },
176+ TextureUploadPrebindCase{" CompleteReleaseNumber" , " Mali-G720" ,
177+ " OpenGL ES 3.2 v1.r170p0-01rel0" , false },
178+ TextureUploadPrebindCase{" ImmortalisFixedDriver" , " Immortalis-G715" ,
179+ " OpenGL ES 3.2 v1.r42p0-01rel0" , false },
180+ TextureUploadPrebindCase{" OverflowRelease" , " Mali-G72" ,
181+ " OpenGL ES 3.2 v1.r99999999999999999999p0" ,
182+ true },
183+ TextureUploadPrebindCase{" MalformedPatchSuffix" , " Mali-G72" ,
184+ " OpenGL ES 3.2 v1.r24p0invalid" , true }),
185+ [](const ::testing::TestParamInfo<TextureUploadPrebindCase>& info) {
186+ return info.param .name ;
187+ });
188+
124189TEST (BlitCommandGLESTest, BlitCopyBufferToTextureCommandGLESBGRA) {
125190 auto mock_gles_impl = std::make_unique<MockGLESImpl>();
126191 auto & mock_gles_impl_ref = *mock_gles_impl;
@@ -511,7 +576,7 @@ TEST(BlitCommandGLESTest,
511576
512577 // The bind target is the cubemap parent, even though allocation/upload
513578 // calls use the per-face target.
514- EXPECT_CALL (mock_gles_impl_ref, BindTexture (GL_TEXTURE_CUBE_MAP , _)).Times (2 );
579+ EXPECT_CALL (mock_gles_impl_ref, BindTexture (GL_TEXTURE_CUBE_MAP , _)).Times (1 );
515580 EXPECT_CALL (mock_gles_impl_ref,
516581 TexImage2D (face_target, 0 , _, 4 , 4 , _, _, _, nullptr ))
517582 .Times (1 );
0 commit comments