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

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

Issue 1498033003: Implement SamplerManager in the command buffer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: One more tweak from zmo@'s feedback Created 5 years 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
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 c704c285820ed0ae98fa700f59888b0a2f3c7600..6351bf2b84f12df3299cfe27a5582bb61fb713fe 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
@@ -314,6 +314,13 @@ void GLES2DecoderTestBase::InitDecoderWithCommandLine(
use_default_textures ? TestHelper::kServiceDefaultTexture2dId : 0))
.Times(1)
.RetiresOnSaturation();
+
+ if (group_->feature_info()->feature_flags().enable_samplers) {
+ EXPECT_CALL(*gl_,
+ BindSampler(tt, 0))
+ .Times(1)
+ .RetiresOnSaturation();
+ }
}
EXPECT_CALL(*gl_, ActiveTexture(GL_TEXTURE0))
.Times(1)

Powered by Google App Engine
This is Rietveld 408576698