| Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h
|
| diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h
|
| index fc9485640c6969696191d41ec44d354a27808004..fd61bef42987ed7712f6cc320f01fa079816505e 100644
|
| --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h
|
| +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h
|
| @@ -117,10 +117,10 @@ TEST_P(GLES2DecoderTest1, BindSamplerValidArgs) {
|
| SpecializedSetup<cmds::BindSampler, 0>(true);
|
| cmds::BindSampler cmd;
|
| cmd.Init(1, client_sampler_id_);
|
| - 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));
|
| }
|
|
|
| @@ -423,7 +423,7 @@ TEST_P(GLES2DecoderTest1, DeleteSamplersImmediateValidArgs) {
|
| *GetImmediateAs<cmds::DeleteSamplersImmediate>();
|
| SpecializedSetup<cmds::DeleteSamplersImmediate, 0>(true);
|
| cmd.Init(1, &client_sampler_id_);
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| EXPECT_EQ(error::kNoError,
|
| ExecuteImmediateCmd(cmd, sizeof(client_sampler_id_)));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -436,9 +436,9 @@ TEST_P(GLES2DecoderTest1, DeleteSamplersImmediateInvalidArgs) {
|
| SpecializedSetup<cmds::DeleteSamplersImmediate, 0>(false);
|
| GLuint temp = kInvalidClientId;
|
| cmd.Init(1, &temp);
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(temp)));
|
| - decoder_->set_unsafe_es3_apis_enabled(false);
|
| + decoder_->set_es3_apis_enabled(false);
|
| EXPECT_EQ(error::kUnknownCommand, ExecuteImmediateCmd(cmd, sizeof(temp)));
|
| }
|
|
|
| @@ -447,10 +447,10 @@ TEST_P(GLES2DecoderTest1, DeleteSyncValidArgs) {
|
| SpecializedSetup<cmds::DeleteSync, 0>(true);
|
| cmds::DeleteSync cmd;
|
| cmd.Init(client_sync_id_);
|
| - 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));
|
| }
|
|
|
| @@ -598,13 +598,13 @@ TEST_P(GLES2DecoderTest1, FenceSyncValidArgs) {
|
| SpecializedSetup<cmds::FenceSync, 0>(true);
|
| cmds::FenceSync cmd;
|
| cmd.Init(kNewClientId);
|
| - 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());
|
| GLsync service_id = 0;
|
| EXPECT_TRUE(GetSyncServiceId(kNewClientId, &service_id));
|
| EXPECT_EQ(kNewServiceIdGLuint, service_id);
|
| - decoder_->set_unsafe_es3_apis_enabled(false);
|
| + decoder_->set_es3_apis_enabled(false);
|
| EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));
|
| }
|
|
|
| @@ -815,7 +815,7 @@ TEST_P(GLES2DecoderTest1, GenSamplersImmediateValidArgs) {
|
| GetImmediateAs<cmds::GenSamplersImmediate>();
|
| GLuint temp = kNewClientId;
|
| SpecializedSetup<cmds::GenSamplersImmediate, 0>(true);
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| cmd->Init(1, &temp);
|
| EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(*cmd, sizeof(temp)));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -828,7 +828,7 @@ TEST_P(GLES2DecoderTest1, GenSamplersImmediateDuplicateOrNullIds) {
|
| GetImmediateAs<cmds::GenSamplersImmediate>();
|
| GLuint temp[3] = {kNewClientId, kNewClientId + 1, kNewClientId};
|
| SpecializedSetup<cmds::GenSamplersImmediate, 1>(true);
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| cmd->Init(3, temp);
|
| EXPECT_EQ(error::kInvalidArguments, ExecuteImmediateCmd(*cmd, sizeof(temp)));
|
| EXPECT_TRUE(GetSampler(kNewClientId) == NULL);
|
| @@ -845,10 +845,10 @@ TEST_P(GLES2DecoderTest1, GenSamplersImmediateInvalidArgs) {
|
| GetImmediateAs<cmds::GenSamplersImmediate>();
|
| SpecializedSetup<cmds::GenSamplersImmediate, 0>(false);
|
| cmd->Init(1, &client_sampler_id_);
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| EXPECT_EQ(error::kInvalidArguments,
|
| ExecuteImmediateCmd(*cmd, sizeof(&client_sampler_id_)));
|
| - decoder_->set_unsafe_es3_apis_enabled(false);
|
| + decoder_->set_es3_apis_enabled(false);
|
| }
|
|
|
| TEST_P(GLES2DecoderTest1, GenTexturesImmediateValidArgs) {
|
| @@ -897,7 +897,7 @@ TEST_P(GLES2DecoderTest1, GenTransformFeedbacksImmediateValidArgs) {
|
| GetImmediateAs<cmds::GenTransformFeedbacksImmediate>();
|
| GLuint temp = kNewClientId;
|
| SpecializedSetup<cmds::GenTransformFeedbacksImmediate, 0>(true);
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| cmd->Init(1, &temp);
|
| EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(*cmd, sizeof(temp)));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -910,7 +910,7 @@ TEST_P(GLES2DecoderTest1, GenTransformFeedbacksImmediateDuplicateOrNullIds) {
|
| GetImmediateAs<cmds::GenTransformFeedbacksImmediate>();
|
| GLuint temp[3] = {kNewClientId, kNewClientId + 1, kNewClientId};
|
| SpecializedSetup<cmds::GenTransformFeedbacksImmediate, 1>(true);
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| cmd->Init(3, temp);
|
| EXPECT_EQ(error::kInvalidArguments, ExecuteImmediateCmd(*cmd, sizeof(temp)));
|
| EXPECT_TRUE(GetTransformFeedback(kNewClientId) == NULL);
|
| @@ -927,10 +927,10 @@ TEST_P(GLES2DecoderTest1, GenTransformFeedbacksImmediateInvalidArgs) {
|
| GetImmediateAs<cmds::GenTransformFeedbacksImmediate>();
|
| SpecializedSetup<cmds::GenTransformFeedbacksImmediate, 0>(false);
|
| cmd->Init(1, &client_transformfeedback_id_);
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| EXPECT_EQ(error::kInvalidArguments,
|
| ExecuteImmediateCmd(*cmd, sizeof(&client_transformfeedback_id_)));
|
| - decoder_->set_unsafe_es3_apis_enabled(false);
|
| + decoder_->set_es3_apis_enabled(false);
|
| }
|
|
|
| TEST_P(GLES2DecoderTest1, GetBooleanvValidArgs) {
|
| @@ -993,12 +993,12 @@ TEST_P(GLES2DecoderTest1, GetBufferParameteri64vValidArgs) {
|
| cmds::GetBufferParameteri64v cmd;
|
| cmd.Init(GL_ARRAY_BUFFER, GL_BUFFER_SIZE, 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(decoder_->GetGLES2Util()->GLGetNumValuesReturned(GL_BUFFER_SIZE),
|
| 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));
|
| }
|
|
|
| @@ -1218,12 +1218,12 @@ TEST_P(GLES2DecoderTest1, GetInteger64vValidArgs) {
|
| result->size = 0;
|
| cmds::GetInteger64v cmd;
|
| cmd.Init(GL_ACTIVE_TEXTURE, 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(decoder_->GetGLES2Util()->GLGetNumValuesReturned(GL_ACTIVE_TEXTURE),
|
| 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));
|
| }
|
|
|
|
|