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 3f83f21a26496fd17bc9e363ae99fa784d0065ec..07d1eaf2a4945b372d030ae4a557880bcb7f42de 100644 |
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc |
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc |
@@ -100,6 +100,7 @@ GLES2DecoderTestBase::GLES2DecoderTestBase() |
client_vertexarray_id_(124), |
client_valuebuffer_id_(125), |
client_transformfeedback_id_(126), |
+ client_sync_id_(127), |
service_renderbuffer_id_(0), |
service_renderbuffer_valid_(false), |
ignore_cached_state_for_test_(GetParam()), |
@@ -430,6 +431,7 @@ void GLES2DecoderTestBase::InitDecoderWithCommandLine( |
.WillOnce(SetArgumentPointee<1>(kServiceTransformFeedbackId)) |
.RetiresOnSaturation(); |
GenHelper<cmds::GenTransformFeedbacksImmediate>(client_transformfeedback_id_); |
+ DoFenceSync(client_sync_id_, kServiceSyncId); |
if (reset_unsafe_es3_apis_enabled) { |
decoder_->set_unsafe_es3_apis_enabled(false); |
} |
@@ -536,6 +538,17 @@ void GLES2DecoderTestBase::DoDeleteProgram( |
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); |
} |
+void GLES2DecoderTestBase::DoFenceSync( |
+ GLuint client_id, GLuint service_id) { |
+ EXPECT_CALL(*gl_, FenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0)) |
+ .Times(1) |
+ .WillOnce(Return(reinterpret_cast<GLsync>(service_id))) |
+ .RetiresOnSaturation(); |
+ cmds::FenceSync cmd; |
+ cmd.Init(client_id); |
+ EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); |
+} |
+ |
void GLES2DecoderTestBase::SetBucketAsCString( |
uint32 bucket_id, const char* str) { |
uint32 size = str ? (strlen(str) + 1) : 0; |
@@ -1307,6 +1320,7 @@ const GLuint GLES2DecoderTestBase::kServiceElementBufferId; |
const GLuint GLES2DecoderTestBase::kServiceQueryId; |
const GLuint GLES2DecoderTestBase::kServiceVertexArrayId; |
const GLuint GLES2DecoderTestBase::kServiceTransformFeedbackId; |
+const GLuint GLES2DecoderTestBase::kServiceSyncId; |
const int32 GLES2DecoderTestBase::kSharedMemoryId; |
const size_t GLES2DecoderTestBase::kSharedBufferSize; |