Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(176)

Unified Diff: gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc

Issue 12461002: android: Add basic support for Broadcom GPUs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix unit test failures. Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/command_buffer/service/async_pixel_transfer_delegate_android.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
index 65925351969071ecd4110c890ebe81fd6346bbfc..3d458b26e370c91e948e5089c54ff7479a46a416 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
@@ -236,6 +236,14 @@ void GLES2DecoderTestBase::InitDecoder(
.Times(1)
.RetiresOnSaturation();
+#if defined(OS_ANDROID)
epenner 2013/05/23 18:13:42 You can get rid of this by making a function IsQua
+ // The Android AsyncPixelTransferDelegate can disable itself based on the GL
+ // vendor.
+ EXPECT_CALL(*gl_, GetString(GL_VENDOR))
+ .WillOnce(Return(reinterpret_cast<const uint8*>("")))
+ .RetiresOnSaturation();
+#endif
+
engine_.reset(new StrictMock<MockCommandBufferEngine>());
gpu::Buffer buffer = engine_->GetSharedMemoryBuffer(kSharedMemoryId);
shared_memory_offset_ = kSharedMemoryOffset;
« no previous file with comments | « gpu/command_buffer/service/async_pixel_transfer_delegate_android.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698