| 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 e8b9eb6ade446aacdf76efcbd0c9e1a394875cb2..9045f5c9c3f5322eca0cee3b0909001987512eeb 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
|
| @@ -16,13 +16,13 @@ TEST_P(GLES2DecoderTest3, UniformMatrix2x4fvImmediateValidArgs) {
|
| cmds::UniformMatrix2x4fvImmediate& cmd =
|
| *GetImmediateAs<cmds::UniformMatrix2x4fvImmediate>();
|
| EXPECT_CALL(*gl_,
|
| - UniformMatrix2x4fv(1, 2, false, reinterpret_cast<GLfloat*>(
|
| - ImmediateDataAddress(&cmd))));
|
| + UniformMatrix2x4fv(1, 2, true, reinterpret_cast<GLfloat*>(
|
| + ImmediateDataAddress(&cmd))));
|
| SpecializedSetup<cmds::UniformMatrix2x4fvImmediate, 0>(true);
|
| GLfloat temp[8 * 2] = {
|
| 0,
|
| };
|
| - cmd.Init(1, 2, &temp[0]);
|
| + cmd.Init(1, 2, true, &temp[0]);
|
| decoder_->set_unsafe_es3_apis_enabled(true);
|
| EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(temp)));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -30,32 +30,17 @@ TEST_P(GLES2DecoderTest3, UniformMatrix2x4fvImmediateValidArgs) {
|
| EXPECT_EQ(error::kUnknownCommand, ExecuteImmediateCmd(cmd, sizeof(temp)));
|
| }
|
|
|
| -TEST_P(GLES2DecoderTest3, UniformMatrix3fvImmediateValidArgs) {
|
| - cmds::UniformMatrix3fvImmediate& cmd =
|
| - *GetImmediateAs<cmds::UniformMatrix3fvImmediate>();
|
| - EXPECT_CALL(*gl_,
|
| - UniformMatrix3fv(1, 2, false, reinterpret_cast<GLfloat*>(
|
| - ImmediateDataAddress(&cmd))));
|
| - SpecializedSetup<cmds::UniformMatrix3fvImmediate, 0>(true);
|
| - GLfloat temp[9 * 2] = {
|
| - 0,
|
| - };
|
| - cmd.Init(1, 2, &temp[0]);
|
| - EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(temp)));
|
| - EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| -}
|
| -
|
| TEST_P(GLES2DecoderTest3, UniformMatrix3x2fvImmediateValidArgs) {
|
| cmds::UniformMatrix3x2fvImmediate& cmd =
|
| *GetImmediateAs<cmds::UniformMatrix3x2fvImmediate>();
|
| EXPECT_CALL(*gl_,
|
| - UniformMatrix3x2fv(1, 2, false, reinterpret_cast<GLfloat*>(
|
| - ImmediateDataAddress(&cmd))));
|
| + UniformMatrix3x2fv(1, 2, true, reinterpret_cast<GLfloat*>(
|
| + ImmediateDataAddress(&cmd))));
|
| SpecializedSetup<cmds::UniformMatrix3x2fvImmediate, 0>(true);
|
| GLfloat temp[6 * 2] = {
|
| 0,
|
| };
|
| - cmd.Init(1, 2, &temp[0]);
|
| + cmd.Init(1, 2, true, &temp[0]);
|
| decoder_->set_unsafe_es3_apis_enabled(true);
|
| EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(temp)));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -67,13 +52,13 @@ TEST_P(GLES2DecoderTest3, UniformMatrix3x4fvImmediateValidArgs) {
|
| cmds::UniformMatrix3x4fvImmediate& cmd =
|
| *GetImmediateAs<cmds::UniformMatrix3x4fvImmediate>();
|
| EXPECT_CALL(*gl_,
|
| - UniformMatrix3x4fv(1, 2, false, reinterpret_cast<GLfloat*>(
|
| - ImmediateDataAddress(&cmd))));
|
| + UniformMatrix3x4fv(1, 2, true, reinterpret_cast<GLfloat*>(
|
| + ImmediateDataAddress(&cmd))));
|
| SpecializedSetup<cmds::UniformMatrix3x4fvImmediate, 0>(true);
|
| GLfloat temp[12 * 2] = {
|
| 0,
|
| };
|
| - cmd.Init(1, 2, &temp[0]);
|
| + cmd.Init(1, 2, true, &temp[0]);
|
| decoder_->set_unsafe_es3_apis_enabled(true);
|
| EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(temp)));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -81,32 +66,17 @@ TEST_P(GLES2DecoderTest3, UniformMatrix3x4fvImmediateValidArgs) {
|
| EXPECT_EQ(error::kUnknownCommand, ExecuteImmediateCmd(cmd, sizeof(temp)));
|
| }
|
|
|
| -TEST_P(GLES2DecoderTest3, UniformMatrix4fvImmediateValidArgs) {
|
| - cmds::UniformMatrix4fvImmediate& cmd =
|
| - *GetImmediateAs<cmds::UniformMatrix4fvImmediate>();
|
| - EXPECT_CALL(*gl_,
|
| - UniformMatrix4fv(1, 2, false, reinterpret_cast<GLfloat*>(
|
| - ImmediateDataAddress(&cmd))));
|
| - SpecializedSetup<cmds::UniformMatrix4fvImmediate, 0>(true);
|
| - GLfloat temp[16 * 2] = {
|
| - 0,
|
| - };
|
| - cmd.Init(1, 2, &temp[0]);
|
| - EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(temp)));
|
| - EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| -}
|
| -
|
| TEST_P(GLES2DecoderTest3, UniformMatrix4x2fvImmediateValidArgs) {
|
| cmds::UniformMatrix4x2fvImmediate& cmd =
|
| *GetImmediateAs<cmds::UniformMatrix4x2fvImmediate>();
|
| EXPECT_CALL(*gl_,
|
| - UniformMatrix4x2fv(1, 2, false, reinterpret_cast<GLfloat*>(
|
| - ImmediateDataAddress(&cmd))));
|
| + UniformMatrix4x2fv(1, 2, true, reinterpret_cast<GLfloat*>(
|
| + ImmediateDataAddress(&cmd))));
|
| SpecializedSetup<cmds::UniformMatrix4x2fvImmediate, 0>(true);
|
| GLfloat temp[8 * 2] = {
|
| 0,
|
| };
|
| - cmd.Init(1, 2, &temp[0]);
|
| + cmd.Init(1, 2, true, &temp[0]);
|
| decoder_->set_unsafe_es3_apis_enabled(true);
|
| EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(temp)));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -118,13 +88,13 @@ TEST_P(GLES2DecoderTest3, UniformMatrix4x3fvImmediateValidArgs) {
|
| cmds::UniformMatrix4x3fvImmediate& cmd =
|
| *GetImmediateAs<cmds::UniformMatrix4x3fvImmediate>();
|
| EXPECT_CALL(*gl_,
|
| - UniformMatrix4x3fv(1, 2, false, reinterpret_cast<GLfloat*>(
|
| - ImmediateDataAddress(&cmd))));
|
| + UniformMatrix4x3fv(1, 2, true, reinterpret_cast<GLfloat*>(
|
| + ImmediateDataAddress(&cmd))));
|
| SpecializedSetup<cmds::UniformMatrix4x3fvImmediate, 0>(true);
|
| GLfloat temp[12 * 2] = {
|
| 0,
|
| };
|
| - cmd.Init(1, 2, &temp[0]);
|
| + cmd.Init(1, 2, true, &temp[0]);
|
| decoder_->set_unsafe_es3_apis_enabled(true);
|
| EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(temp)));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
|
|