| Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
|
| diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
|
| index 05fbcd89b56fdd2bcd49c62c371bc4f9e47f3399..baaa0983148d1ae8286e558db523c6cd441563a3 100644
|
| --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
|
| +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
|
| @@ -103,7 +103,7 @@ void GLES3DecoderTest::SetUp() {
|
|
|
| TEST_P(GLES3DecoderTest, Basic) {
|
| // Make sure the setup is correct for ES3.
|
| - EXPECT_TRUE(decoder_->unsafe_es3_apis_enabled());
|
| + EXPECT_TRUE(decoder_->es3_apis_enabled());
|
| EXPECT_TRUE(feature_info()->validators()->texture_bind_target.IsValid(
|
| GL_TEXTURE_3D));
|
| }
|
| @@ -306,11 +306,11 @@ TEST_P(GLES3DecoderTest, GetInternalformativValidArgsSamples) {
|
| GetInternalformativ cmd;
|
| cmd.Init(GL_RENDERBUFFER, GL_RGBA8, GL_SAMPLES,
|
| shared_memory_id_, shared_memory_offset_);
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(kNumSampleCounts, result->GetNumResults());
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| - decoder_->set_unsafe_es3_apis_enabled(false);
|
| + decoder_->set_es3_apis_enabled(false);
|
| EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));
|
| }
|
|
|
| @@ -326,12 +326,12 @@ TEST_P(GLES3DecoderTest, GetInternalformativValidArgsNumSampleCounts) {
|
| GetInternalformativ cmd;
|
| cmd.Init(GL_RENDERBUFFER, GL_RGBA8, GL_NUM_SAMPLE_COUNTS,
|
| shared_memory_id_, shared_memory_offset_);
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(1, result->GetNumResults());
|
| EXPECT_EQ(kNumSampleCounts, result->GetData()[0]);
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| - decoder_->set_unsafe_es3_apis_enabled(false);
|
| + decoder_->set_es3_apis_enabled(false);
|
| EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));
|
| }
|
|
|
| @@ -347,11 +347,11 @@ TEST_P(GLES3DecoderTest, ClientWaitSyncValid) {
|
| .WillOnce(Return(GL_CONDITION_SATISFIED))
|
| .RetiresOnSaturation();
|
| *result = GL_WAIT_FAILED;
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(static_cast<GLenum>(GL_CONDITION_SATISFIED), *result);
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| - decoder_->set_unsafe_es3_apis_enabled(false);
|
| + decoder_->set_es3_apis_enabled(false);
|
| EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));
|
| }
|
|
|
| @@ -368,11 +368,11 @@ TEST_P(GLES2DecoderTest, ClientWaitSyncNonZeroTimeoutValid) {
|
| .WillOnce(Return(GL_CONDITION_SATISFIED))
|
| .RetiresOnSaturation();
|
| *result = GL_WAIT_FAILED;
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(static_cast<GLenum>(GL_CONDITION_SATISFIED), *result);
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| - decoder_->set_unsafe_es3_apis_enabled(false);
|
| + decoder_->set_es3_apis_enabled(false);
|
| EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));
|
| }
|
|
|
| @@ -380,7 +380,7 @@ TEST_P(GLES2DecoderTest, ClientWaitSyncInvalidSyncFails) {
|
| typedef ClientWaitSync::Result Result;
|
| Result* result = static_cast<Result*>(shared_memory_address_);
|
| ClientWaitSync cmd;
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| cmd.Init(kInvalidClientId, GL_SYNC_FLUSH_COMMANDS_BIT, 0,
|
| shared_memory_id_, shared_memory_offset_);
|
| *result = GL_WAIT_FAILED;
|
| @@ -393,7 +393,7 @@ TEST_P(GLES2DecoderTest, ClientWaitSyncResultNotInitFails) {
|
| typedef ClientWaitSync::Result Result;
|
| Result* result = static_cast<Result*>(shared_memory_address_);
|
| ClientWaitSync cmd;
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| cmd.Init(client_sync_id_, GL_SYNC_FLUSH_COMMANDS_BIT, 0,
|
| shared_memory_id_, shared_memory_offset_);
|
| *result = 1; // Any value other than GL_WAIT_FAILED
|
| @@ -404,7 +404,7 @@ TEST_P(GLES2DecoderTest, ClientWaitSyncBadSharedMemoryFails) {
|
| typedef ClientWaitSync::Result Result;
|
| Result* result = static_cast<Result*>(shared_memory_address_);
|
| ClientWaitSync cmd;
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| *result = GL_WAIT_FAILED;
|
| cmd.Init(client_sync_id_, GL_SYNC_FLUSH_COMMANDS_BIT, 0,
|
| kInvalidSharedMemoryId, shared_memory_offset_);
|
| @@ -425,10 +425,10 @@ TEST_P(GLES2DecoderTest, WaitSyncValidArgs) {
|
|
|
| WaitSync cmd;
|
| cmd.Init(client_sync_id_, 0, kTimeout);
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| - decoder_->set_unsafe_es3_apis_enabled(false);
|
| + decoder_->set_es3_apis_enabled(false);
|
| EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));
|
| }
|
|
|
|
|