| Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest_3_autogen.h
|
| diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_3_autogen.h b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_3_autogen.h
|
| index 8721458cd9a5f059baf9e8ef730ee00c1fb1611d..ca6f2fa3d12bb136950850c39620d1c90558235a 100644
|
| --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_3_autogen.h
|
| +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_3_autogen.h
|
| @@ -21,10 +21,10 @@ TEST_P(GLES2DecoderTest3, UniformMatrix2x4fvImmediateValidArgs) {
|
| };
|
| EXPECT_CALL(*gl_, UniformMatrix2x4fv(1, 2, true, PointsToArray(temp, 8)));
|
| cmd.Init(1, 2, true, &temp[0]);
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(temp)));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| - decoder_->set_unsafe_es3_apis_enabled(false);
|
| + decoder_->set_es3_apis_enabled(false);
|
| EXPECT_EQ(error::kUnknownCommand, ExecuteImmediateCmd(cmd, sizeof(temp)));
|
| }
|
|
|
| @@ -37,10 +37,10 @@ TEST_P(GLES2DecoderTest3, UniformMatrix3x2fvImmediateValidArgs) {
|
| };
|
| EXPECT_CALL(*gl_, UniformMatrix3x2fv(1, 2, true, PointsToArray(temp, 6)));
|
| cmd.Init(1, 2, true, &temp[0]);
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(temp)));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| - decoder_->set_unsafe_es3_apis_enabled(false);
|
| + decoder_->set_es3_apis_enabled(false);
|
| EXPECT_EQ(error::kUnknownCommand, ExecuteImmediateCmd(cmd, sizeof(temp)));
|
| }
|
|
|
| @@ -53,10 +53,10 @@ TEST_P(GLES2DecoderTest3, UniformMatrix3x4fvImmediateValidArgs) {
|
| };
|
| EXPECT_CALL(*gl_, UniformMatrix3x4fv(1, 2, true, PointsToArray(temp, 12)));
|
| cmd.Init(1, 2, true, &temp[0]);
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(temp)));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| - decoder_->set_unsafe_es3_apis_enabled(false);
|
| + decoder_->set_es3_apis_enabled(false);
|
| EXPECT_EQ(error::kUnknownCommand, ExecuteImmediateCmd(cmd, sizeof(temp)));
|
| }
|
|
|
| @@ -69,10 +69,10 @@ TEST_P(GLES2DecoderTest3, UniformMatrix4x2fvImmediateValidArgs) {
|
| };
|
| EXPECT_CALL(*gl_, UniformMatrix4x2fv(1, 2, true, PointsToArray(temp, 8)));
|
| cmd.Init(1, 2, true, &temp[0]);
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(temp)));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| - decoder_->set_unsafe_es3_apis_enabled(false);
|
| + decoder_->set_es3_apis_enabled(false);
|
| EXPECT_EQ(error::kUnknownCommand, ExecuteImmediateCmd(cmd, sizeof(temp)));
|
| }
|
|
|
| @@ -85,10 +85,10 @@ TEST_P(GLES2DecoderTest3, UniformMatrix4x3fvImmediateValidArgs) {
|
| };
|
| EXPECT_CALL(*gl_, UniformMatrix4x3fv(1, 2, true, PointsToArray(temp, 12)));
|
| cmd.Init(1, 2, true, &temp[0]);
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(temp)));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| - decoder_->set_unsafe_es3_apis_enabled(false);
|
| + decoder_->set_es3_apis_enabled(false);
|
| EXPECT_EQ(error::kUnknownCommand, ExecuteImmediateCmd(cmd, sizeof(temp)));
|
| }
|
|
|
| @@ -212,10 +212,10 @@ TEST_P(GLES2DecoderTest3, VertexAttribI4iValidArgs) {
|
| SpecializedSetup<cmds::VertexAttribI4i, 0>(true);
|
| cmds::VertexAttribI4i cmd;
|
| cmd.Init(1, 2, 3, 4, 5);
|
| - 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));
|
| }
|
|
|
| @@ -228,10 +228,10 @@ TEST_P(GLES2DecoderTest3, VertexAttribI4ivImmediateValidArgs) {
|
| };
|
| cmd.Init(1, &temp[0]);
|
| EXPECT_CALL(*gl_, VertexAttribI4iv(1, PointsToArray(temp, 4)));
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(temp)));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| - decoder_->set_unsafe_es3_apis_enabled(false);
|
| + decoder_->set_es3_apis_enabled(false);
|
| EXPECT_EQ(error::kUnknownCommand, ExecuteImmediateCmd(cmd, sizeof(temp)));
|
| }
|
|
|
| @@ -240,10 +240,10 @@ TEST_P(GLES2DecoderTest3, VertexAttribI4uiValidArgs) {
|
| SpecializedSetup<cmds::VertexAttribI4ui, 0>(true);
|
| cmds::VertexAttribI4ui cmd;
|
| cmd.Init(1, 2, 3, 4, 5);
|
| - 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));
|
| }
|
|
|
| @@ -256,10 +256,10 @@ TEST_P(GLES2DecoderTest3, VertexAttribI4uivImmediateValidArgs) {
|
| };
|
| cmd.Init(1, &temp[0]);
|
| EXPECT_CALL(*gl_, VertexAttribI4uiv(1, PointsToArray(temp, 4)));
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(temp)));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| - decoder_->set_unsafe_es3_apis_enabled(false);
|
| + decoder_->set_es3_apis_enabled(false);
|
| EXPECT_EQ(error::kUnknownCommand, ExecuteImmediateCmd(cmd, sizeof(temp)));
|
| }
|
|
|
|
|