| 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 914ced8d2c2f5bec6adc93729c39252de657933e..fc77e17d82a0a165e8cf56f02e63b3e40e3eaad0 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
|
| @@ -14,8 +14,8 @@
|
|
|
| TEST_F(GLES2DecoderTest1, AttachShaderValidArgs) {
|
| EXPECT_CALL(*gl_, AttachShader(kServiceProgramId, kServiceShaderId));
|
| - SpecializedSetup<AttachShader, 0>(true);
|
| - AttachShader cmd;
|
| + SpecializedSetup<cmds::AttachShader, 0>(true);
|
| + cmds::AttachShader cmd;
|
| cmd.Init(client_program_id_, client_shader_id_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -28,8 +28,8 @@ TEST_F(GLES2DecoderTest1, AttachShaderValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest1, BindBufferValidArgs) {
|
| EXPECT_CALL(*gl_, BindBuffer(GL_ARRAY_BUFFER, kServiceBufferId));
|
| - SpecializedSetup<BindBuffer, 0>(true);
|
| - BindBuffer cmd;
|
| + SpecializedSetup<cmds::BindBuffer, 0>(true);
|
| + cmds::BindBuffer cmd;
|
| cmd.Init(GL_ARRAY_BUFFER, client_buffer_id_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -39,18 +39,18 @@ TEST_F(GLES2DecoderTest1, BindBufferValidArgsNewId) {
|
| EXPECT_CALL(*gl_, BindBuffer(GL_ARRAY_BUFFER, kNewServiceId));
|
| EXPECT_CALL(*gl_, GenBuffersARB(1, _))
|
| .WillOnce(SetArgumentPointee<1>(kNewServiceId));
|
| - SpecializedSetup<BindBuffer, 0>(true);
|
| - BindBuffer cmd;
|
| + SpecializedSetup<cmds::BindBuffer, 0>(true);
|
| + cmds::BindBuffer cmd;
|
| cmd.Init(GL_ARRAY_BUFFER, kNewClientId);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| - EXPECT_TRUE(GetBufferInfo(kNewClientId) != NULL);
|
| + EXPECT_TRUE(GetBuffer(kNewClientId) != NULL);
|
| }
|
|
|
| TEST_F(GLES2DecoderTest1, BindBufferInvalidArgs0_0) {
|
| EXPECT_CALL(*gl_, BindBuffer(_, _)).Times(0);
|
| - SpecializedSetup<BindBuffer, 0>(false);
|
| - BindBuffer cmd;
|
| + SpecializedSetup<cmds::BindBuffer, 0>(false);
|
| + cmds::BindBuffer cmd;
|
| cmd.Init(GL_RENDERBUFFER, client_buffer_id_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
|
| @@ -58,8 +58,8 @@ TEST_F(GLES2DecoderTest1, BindBufferInvalidArgs0_0) {
|
|
|
| TEST_F(GLES2DecoderTest1, BindFramebufferValidArgs) {
|
| EXPECT_CALL(*gl_, BindFramebufferEXT(GL_FRAMEBUFFER, kServiceFramebufferId));
|
| - SpecializedSetup<BindFramebuffer, 0>(true);
|
| - BindFramebuffer cmd;
|
| + SpecializedSetup<cmds::BindFramebuffer, 0>(true);
|
| + cmds::BindFramebuffer cmd;
|
| cmd.Init(GL_FRAMEBUFFER, client_framebuffer_id_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -69,18 +69,18 @@ TEST_F(GLES2DecoderTest1, BindFramebufferValidArgsNewId) {
|
| EXPECT_CALL(*gl_, BindFramebufferEXT(GL_FRAMEBUFFER, kNewServiceId));
|
| EXPECT_CALL(*gl_, GenFramebuffersEXT(1, _))
|
| .WillOnce(SetArgumentPointee<1>(kNewServiceId));
|
| - SpecializedSetup<BindFramebuffer, 0>(true);
|
| - BindFramebuffer cmd;
|
| + SpecializedSetup<cmds::BindFramebuffer, 0>(true);
|
| + cmds::BindFramebuffer cmd;
|
| cmd.Init(GL_FRAMEBUFFER, kNewClientId);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| - EXPECT_TRUE(GetFramebufferInfo(kNewClientId) != NULL);
|
| + EXPECT_TRUE(GetFramebuffer(kNewClientId) != NULL);
|
| }
|
|
|
| TEST_F(GLES2DecoderTest1, BindFramebufferInvalidArgs0_0) {
|
| EXPECT_CALL(*gl_, BindFramebufferEXT(_, _)).Times(0);
|
| - SpecializedSetup<BindFramebuffer, 0>(false);
|
| - BindFramebuffer cmd;
|
| + SpecializedSetup<cmds::BindFramebuffer, 0>(false);
|
| + cmds::BindFramebuffer cmd;
|
| cmd.Init(GL_DRAW_FRAMEBUFFER, client_framebuffer_id_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
|
| @@ -88,8 +88,8 @@ TEST_F(GLES2DecoderTest1, BindFramebufferInvalidArgs0_0) {
|
|
|
| TEST_F(GLES2DecoderTest1, BindFramebufferInvalidArgs0_1) {
|
| EXPECT_CALL(*gl_, BindFramebufferEXT(_, _)).Times(0);
|
| - SpecializedSetup<BindFramebuffer, 0>(false);
|
| - BindFramebuffer cmd;
|
| + SpecializedSetup<cmds::BindFramebuffer, 0>(false);
|
| + cmds::BindFramebuffer cmd;
|
| cmd.Init(GL_READ_FRAMEBUFFER, client_framebuffer_id_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
|
| @@ -98,8 +98,8 @@ TEST_F(GLES2DecoderTest1, BindFramebufferInvalidArgs0_1) {
|
| TEST_F(GLES2DecoderTest1, BindRenderbufferValidArgs) {
|
| EXPECT_CALL(
|
| *gl_, BindRenderbufferEXT(GL_RENDERBUFFER, kServiceRenderbufferId));
|
| - SpecializedSetup<BindRenderbuffer, 0>(true);
|
| - BindRenderbuffer cmd;
|
| + SpecializedSetup<cmds::BindRenderbuffer, 0>(true);
|
| + cmds::BindRenderbuffer cmd;
|
| cmd.Init(GL_RENDERBUFFER, client_renderbuffer_id_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -109,18 +109,18 @@ TEST_F(GLES2DecoderTest1, BindRenderbufferValidArgsNewId) {
|
| EXPECT_CALL(*gl_, BindRenderbufferEXT(GL_RENDERBUFFER, kNewServiceId));
|
| EXPECT_CALL(*gl_, GenRenderbuffersEXT(1, _))
|
| .WillOnce(SetArgumentPointee<1>(kNewServiceId));
|
| - SpecializedSetup<BindRenderbuffer, 0>(true);
|
| - BindRenderbuffer cmd;
|
| + SpecializedSetup<cmds::BindRenderbuffer, 0>(true);
|
| + cmds::BindRenderbuffer cmd;
|
| cmd.Init(GL_RENDERBUFFER, kNewClientId);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| - EXPECT_TRUE(GetRenderbufferInfo(kNewClientId) != NULL);
|
| + EXPECT_TRUE(GetRenderbuffer(kNewClientId) != NULL);
|
| }
|
|
|
| TEST_F(GLES2DecoderTest1, BindRenderbufferInvalidArgs0_0) {
|
| EXPECT_CALL(*gl_, BindRenderbufferEXT(_, _)).Times(0);
|
| - SpecializedSetup<BindRenderbuffer, 0>(false);
|
| - BindRenderbuffer cmd;
|
| + SpecializedSetup<cmds::BindRenderbuffer, 0>(false);
|
| + cmds::BindRenderbuffer cmd;
|
| cmd.Init(GL_FRAMEBUFFER, client_renderbuffer_id_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
|
| @@ -128,8 +128,8 @@ TEST_F(GLES2DecoderTest1, BindRenderbufferInvalidArgs0_0) {
|
|
|
| TEST_F(GLES2DecoderTest1, BindTextureValidArgs) {
|
| EXPECT_CALL(*gl_, BindTexture(GL_TEXTURE_2D, kServiceTextureId));
|
| - SpecializedSetup<BindTexture, 0>(true);
|
| - BindTexture cmd;
|
| + SpecializedSetup<cmds::BindTexture, 0>(true);
|
| + cmds::BindTexture cmd;
|
| cmd.Init(GL_TEXTURE_2D, client_texture_id_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -139,18 +139,18 @@ TEST_F(GLES2DecoderTest1, BindTextureValidArgsNewId) {
|
| EXPECT_CALL(*gl_, BindTexture(GL_TEXTURE_2D, kNewServiceId));
|
| EXPECT_CALL(*gl_, GenTextures(1, _))
|
| .WillOnce(SetArgumentPointee<1>(kNewServiceId));
|
| - SpecializedSetup<BindTexture, 0>(true);
|
| - BindTexture cmd;
|
| + SpecializedSetup<cmds::BindTexture, 0>(true);
|
| + cmds::BindTexture cmd;
|
| cmd.Init(GL_TEXTURE_2D, kNewClientId);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| - EXPECT_TRUE(GetTextureInfo(kNewClientId) != NULL);
|
| + EXPECT_TRUE(GetTexture(kNewClientId) != NULL);
|
| }
|
|
|
| TEST_F(GLES2DecoderTest1, BindTextureInvalidArgs0_0) {
|
| EXPECT_CALL(*gl_, BindTexture(_, _)).Times(0);
|
| - SpecializedSetup<BindTexture, 0>(false);
|
| - BindTexture cmd;
|
| + SpecializedSetup<cmds::BindTexture, 0>(false);
|
| + cmds::BindTexture cmd;
|
| cmd.Init(GL_TEXTURE_1D, client_texture_id_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
|
| @@ -158,8 +158,8 @@ TEST_F(GLES2DecoderTest1, BindTextureInvalidArgs0_0) {
|
|
|
| TEST_F(GLES2DecoderTest1, BindTextureInvalidArgs0_1) {
|
| EXPECT_CALL(*gl_, BindTexture(_, _)).Times(0);
|
| - SpecializedSetup<BindTexture, 0>(false);
|
| - BindTexture cmd;
|
| + SpecializedSetup<cmds::BindTexture, 0>(false);
|
| + cmds::BindTexture cmd;
|
| cmd.Init(GL_TEXTURE_3D, client_texture_id_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
|
| @@ -167,8 +167,8 @@ TEST_F(GLES2DecoderTest1, BindTextureInvalidArgs0_1) {
|
|
|
| TEST_F(GLES2DecoderTest1, BlendColorValidArgs) {
|
| EXPECT_CALL(*gl_, BlendColor(1, 2, 3, 4));
|
| - SpecializedSetup<BlendColor, 0>(true);
|
| - BlendColor cmd;
|
| + SpecializedSetup<cmds::BlendColor, 0>(true);
|
| + cmds::BlendColor cmd;
|
| cmd.Init(1, 2, 3, 4);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -176,8 +176,8 @@ TEST_F(GLES2DecoderTest1, BlendColorValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest1, BlendEquationValidArgs) {
|
| EXPECT_CALL(*gl_, BlendEquation(GL_FUNC_SUBTRACT));
|
| - SpecializedSetup<BlendEquation, 0>(true);
|
| - BlendEquation cmd;
|
| + SpecializedSetup<cmds::BlendEquation, 0>(true);
|
| + cmds::BlendEquation cmd;
|
| cmd.Init(GL_FUNC_SUBTRACT);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -185,8 +185,8 @@ TEST_F(GLES2DecoderTest1, BlendEquationValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest1, BlendEquationInvalidArgs0_0) {
|
| EXPECT_CALL(*gl_, BlendEquation(_)).Times(0);
|
| - SpecializedSetup<BlendEquation, 0>(false);
|
| - BlendEquation cmd;
|
| + SpecializedSetup<cmds::BlendEquation, 0>(false);
|
| + cmds::BlendEquation cmd;
|
| cmd.Init(GL_MIN);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
|
| @@ -194,8 +194,8 @@ TEST_F(GLES2DecoderTest1, BlendEquationInvalidArgs0_0) {
|
|
|
| TEST_F(GLES2DecoderTest1, BlendEquationInvalidArgs0_1) {
|
| EXPECT_CALL(*gl_, BlendEquation(_)).Times(0);
|
| - SpecializedSetup<BlendEquation, 0>(false);
|
| - BlendEquation cmd;
|
| + SpecializedSetup<cmds::BlendEquation, 0>(false);
|
| + cmds::BlendEquation cmd;
|
| cmd.Init(GL_MAX);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
|
| @@ -203,8 +203,8 @@ TEST_F(GLES2DecoderTest1, BlendEquationInvalidArgs0_1) {
|
|
|
| TEST_F(GLES2DecoderTest1, BlendEquationSeparateValidArgs) {
|
| EXPECT_CALL(*gl_, BlendEquationSeparate(GL_FUNC_SUBTRACT, GL_FUNC_ADD));
|
| - SpecializedSetup<BlendEquationSeparate, 0>(true);
|
| - BlendEquationSeparate cmd;
|
| + SpecializedSetup<cmds::BlendEquationSeparate, 0>(true);
|
| + cmds::BlendEquationSeparate cmd;
|
| cmd.Init(GL_FUNC_SUBTRACT, GL_FUNC_ADD);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -212,8 +212,8 @@ TEST_F(GLES2DecoderTest1, BlendEquationSeparateValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest1, BlendEquationSeparateInvalidArgs0_0) {
|
| EXPECT_CALL(*gl_, BlendEquationSeparate(_, _)).Times(0);
|
| - SpecializedSetup<BlendEquationSeparate, 0>(false);
|
| - BlendEquationSeparate cmd;
|
| + SpecializedSetup<cmds::BlendEquationSeparate, 0>(false);
|
| + cmds::BlendEquationSeparate cmd;
|
| cmd.Init(GL_MIN, GL_FUNC_ADD);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
|
| @@ -221,8 +221,8 @@ TEST_F(GLES2DecoderTest1, BlendEquationSeparateInvalidArgs0_0) {
|
|
|
| TEST_F(GLES2DecoderTest1, BlendEquationSeparateInvalidArgs0_1) {
|
| EXPECT_CALL(*gl_, BlendEquationSeparate(_, _)).Times(0);
|
| - SpecializedSetup<BlendEquationSeparate, 0>(false);
|
| - BlendEquationSeparate cmd;
|
| + SpecializedSetup<cmds::BlendEquationSeparate, 0>(false);
|
| + cmds::BlendEquationSeparate cmd;
|
| cmd.Init(GL_MAX, GL_FUNC_ADD);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
|
| @@ -230,8 +230,8 @@ TEST_F(GLES2DecoderTest1, BlendEquationSeparateInvalidArgs0_1) {
|
|
|
| TEST_F(GLES2DecoderTest1, BlendEquationSeparateInvalidArgs1_0) {
|
| EXPECT_CALL(*gl_, BlendEquationSeparate(_, _)).Times(0);
|
| - SpecializedSetup<BlendEquationSeparate, 0>(false);
|
| - BlendEquationSeparate cmd;
|
| + SpecializedSetup<cmds::BlendEquationSeparate, 0>(false);
|
| + cmds::BlendEquationSeparate cmd;
|
| cmd.Init(GL_FUNC_SUBTRACT, GL_MIN);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
|
| @@ -239,8 +239,8 @@ TEST_F(GLES2DecoderTest1, BlendEquationSeparateInvalidArgs1_0) {
|
|
|
| TEST_F(GLES2DecoderTest1, BlendEquationSeparateInvalidArgs1_1) {
|
| EXPECT_CALL(*gl_, BlendEquationSeparate(_, _)).Times(0);
|
| - SpecializedSetup<BlendEquationSeparate, 0>(false);
|
| - BlendEquationSeparate cmd;
|
| + SpecializedSetup<cmds::BlendEquationSeparate, 0>(false);
|
| + cmds::BlendEquationSeparate cmd;
|
| cmd.Init(GL_FUNC_SUBTRACT, GL_MAX);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
|
| @@ -248,8 +248,8 @@ TEST_F(GLES2DecoderTest1, BlendEquationSeparateInvalidArgs1_1) {
|
|
|
| TEST_F(GLES2DecoderTest1, BlendFuncValidArgs) {
|
| EXPECT_CALL(*gl_, BlendFunc(GL_ZERO, GL_ZERO));
|
| - SpecializedSetup<BlendFunc, 0>(true);
|
| - BlendFunc cmd;
|
| + SpecializedSetup<cmds::BlendFunc, 0>(true);
|
| + cmds::BlendFunc cmd;
|
| cmd.Init(GL_ZERO, GL_ZERO);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -257,8 +257,8 @@ TEST_F(GLES2DecoderTest1, BlendFuncValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest1, BlendFuncSeparateValidArgs) {
|
| EXPECT_CALL(*gl_, BlendFuncSeparate(GL_ZERO, GL_ZERO, GL_ZERO, GL_ZERO));
|
| - SpecializedSetup<BlendFuncSeparate, 0>(true);
|
| - BlendFuncSeparate cmd;
|
| + SpecializedSetup<cmds::BlendFuncSeparate, 0>(true);
|
| + cmds::BlendFuncSeparate cmd;
|
| cmd.Init(GL_ZERO, GL_ZERO, GL_ZERO, GL_ZERO);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -274,8 +274,8 @@ TEST_F(GLES2DecoderTest1, BlendFuncSeparateValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest1, CheckFramebufferStatusValidArgs) {
|
| EXPECT_CALL(*gl_, CheckFramebufferStatusEXT(GL_FRAMEBUFFER));
|
| - SpecializedSetup<CheckFramebufferStatus, 0>(true);
|
| - CheckFramebufferStatus cmd;
|
| + SpecializedSetup<cmds::CheckFramebufferStatus, 0>(true);
|
| + cmds::CheckFramebufferStatus cmd;
|
| cmd.Init(GL_FRAMEBUFFER, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -283,8 +283,8 @@ TEST_F(GLES2DecoderTest1, CheckFramebufferStatusValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest1, CheckFramebufferStatusInvalidArgs0_0) {
|
| EXPECT_CALL(*gl_, CheckFramebufferStatusEXT(_)).Times(0);
|
| - SpecializedSetup<CheckFramebufferStatus, 0>(false);
|
| - CheckFramebufferStatus cmd;
|
| + SpecializedSetup<cmds::CheckFramebufferStatus, 0>(false);
|
| + cmds::CheckFramebufferStatus cmd;
|
| cmd.Init(GL_DRAW_FRAMEBUFFER, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
|
| @@ -292,8 +292,8 @@ TEST_F(GLES2DecoderTest1, CheckFramebufferStatusInvalidArgs0_0) {
|
|
|
| TEST_F(GLES2DecoderTest1, CheckFramebufferStatusInvalidArgs0_1) {
|
| EXPECT_CALL(*gl_, CheckFramebufferStatusEXT(_)).Times(0);
|
| - SpecializedSetup<CheckFramebufferStatus, 0>(false);
|
| - CheckFramebufferStatus cmd;
|
| + SpecializedSetup<cmds::CheckFramebufferStatus, 0>(false);
|
| + cmds::CheckFramebufferStatus cmd;
|
| cmd.Init(GL_READ_FRAMEBUFFER, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
|
| @@ -301,8 +301,8 @@ TEST_F(GLES2DecoderTest1, CheckFramebufferStatusInvalidArgs0_1) {
|
|
|
| TEST_F(GLES2DecoderTest1, CheckFramebufferStatusInvalidArgsBadSharedMemoryId) {
|
| EXPECT_CALL(*gl_, CheckFramebufferStatusEXT(GL_FRAMEBUFFER)).Times(0);
|
| - SpecializedSetup<CheckFramebufferStatus, 0>(false);
|
| - CheckFramebufferStatus cmd;
|
| + SpecializedSetup<cmds::CheckFramebufferStatus, 0>(false);
|
| + cmds::CheckFramebufferStatus cmd;
|
| cmd.Init(GL_FRAMEBUFFER, kInvalidSharedMemoryId, shared_memory_offset_);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| cmd.Init(GL_FRAMEBUFFER, shared_memory_id_, kInvalidSharedMemoryOffset);
|
| @@ -311,8 +311,8 @@ TEST_F(GLES2DecoderTest1, CheckFramebufferStatusInvalidArgsBadSharedMemoryId) {
|
|
|
| TEST_F(GLES2DecoderTest1, ClearValidArgs) {
|
| EXPECT_CALL(*gl_, Clear(1));
|
| - SpecializedSetup<Clear, 0>(true);
|
| - Clear cmd;
|
| + SpecializedSetup<cmds::Clear, 0>(true);
|
| + cmds::Clear cmd;
|
| cmd.Init(1);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -320,8 +320,8 @@ TEST_F(GLES2DecoderTest1, ClearValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest1, ClearColorValidArgs) {
|
| EXPECT_CALL(*gl_, ClearColor(1, 2, 3, 4));
|
| - SpecializedSetup<ClearColor, 0>(true);
|
| - ClearColor cmd;
|
| + SpecializedSetup<cmds::ClearColor, 0>(true);
|
| + cmds::ClearColor cmd;
|
| cmd.Init(1, 2, 3, 4);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -329,8 +329,8 @@ TEST_F(GLES2DecoderTest1, ClearColorValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest1, ClearDepthfValidArgs) {
|
| EXPECT_CALL(*gl_, ClearDepth(0.5f));
|
| - SpecializedSetup<ClearDepthf, 0>(true);
|
| - ClearDepthf cmd;
|
| + SpecializedSetup<cmds::ClearDepthf, 0>(true);
|
| + cmds::ClearDepthf cmd;
|
| cmd.Init(0.5f);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -338,16 +338,16 @@ TEST_F(GLES2DecoderTest1, ClearDepthfValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest1, ClearStencilValidArgs) {
|
| EXPECT_CALL(*gl_, ClearStencil(1));
|
| - SpecializedSetup<ClearStencil, 0>(true);
|
| - ClearStencil cmd;
|
| + SpecializedSetup<cmds::ClearStencil, 0>(true);
|
| + cmds::ClearStencil cmd;
|
| cmd.Init(1);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| }
|
|
|
| TEST_F(GLES2DecoderTest1, ColorMaskValidArgs) {
|
| - SpecializedSetup<ColorMask, 0>(true);
|
| - ColorMask cmd;
|
| + SpecializedSetup<cmds::ColorMask, 0>(true);
|
| + cmds::ColorMask cmd;
|
| cmd.Init(true, true, true, true);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -367,8 +367,8 @@ TEST_F(GLES2DecoderTest1, ColorMaskValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest1, CopyTexSubImage2DValidArgs) {
|
| EXPECT_CALL(*gl_, CopyTexSubImage2D(GL_TEXTURE_2D, 2, 3, 4, 5, 6, 7, 8));
|
| - SpecializedSetup<CopyTexSubImage2D, 0>(true);
|
| - CopyTexSubImage2D cmd;
|
| + SpecializedSetup<cmds::CopyTexSubImage2D, 0>(true);
|
| + cmds::CopyTexSubImage2D cmd;
|
| cmd.Init(GL_TEXTURE_2D, 2, 3, 4, 5, 6, 7, 8);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -376,8 +376,8 @@ TEST_F(GLES2DecoderTest1, CopyTexSubImage2DValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest1, CopyTexSubImage2DInvalidArgs0_0) {
|
| EXPECT_CALL(*gl_, CopyTexSubImage2D(_, _, _, _, _, _, _, _)).Times(0);
|
| - SpecializedSetup<CopyTexSubImage2D, 0>(false);
|
| - CopyTexSubImage2D cmd;
|
| + SpecializedSetup<cmds::CopyTexSubImage2D, 0>(false);
|
| + cmds::CopyTexSubImage2D cmd;
|
| cmd.Init(GL_PROXY_TEXTURE_CUBE_MAP, 2, 3, 4, 5, 6, 7, 8);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
|
| @@ -385,8 +385,8 @@ TEST_F(GLES2DecoderTest1, CopyTexSubImage2DInvalidArgs0_0) {
|
|
|
| TEST_F(GLES2DecoderTest1, CopyTexSubImage2DInvalidArgs6_0) {
|
| EXPECT_CALL(*gl_, CopyTexSubImage2D(_, _, _, _, _, _, _, _)).Times(0);
|
| - SpecializedSetup<CopyTexSubImage2D, 0>(false);
|
| - CopyTexSubImage2D cmd;
|
| + SpecializedSetup<cmds::CopyTexSubImage2D, 0>(false);
|
| + cmds::CopyTexSubImage2D cmd;
|
| cmd.Init(GL_TEXTURE_2D, 2, 3, 4, 5, 6, -1, 8);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_INVALID_VALUE, GetGLError());
|
| @@ -394,8 +394,8 @@ TEST_F(GLES2DecoderTest1, CopyTexSubImage2DInvalidArgs6_0) {
|
|
|
| TEST_F(GLES2DecoderTest1, CopyTexSubImage2DInvalidArgs7_0) {
|
| EXPECT_CALL(*gl_, CopyTexSubImage2D(_, _, _, _, _, _, _, _)).Times(0);
|
| - SpecializedSetup<CopyTexSubImage2D, 0>(false);
|
| - CopyTexSubImage2D cmd;
|
| + SpecializedSetup<cmds::CopyTexSubImage2D, 0>(false);
|
| + cmds::CopyTexSubImage2D cmd;
|
| cmd.Init(GL_TEXTURE_2D, 2, 3, 4, 5, 6, 7, -1);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_INVALID_VALUE, GetGLError());
|
| @@ -404,29 +404,29 @@ TEST_F(GLES2DecoderTest1, CopyTexSubImage2DInvalidArgs7_0) {
|
| TEST_F(GLES2DecoderTest1, CreateProgramValidArgs) {
|
| EXPECT_CALL(*gl_, CreateProgram())
|
| .WillOnce(Return(kNewServiceId));
|
| - SpecializedSetup<CreateProgram, 0>(true);
|
| - CreateProgram cmd;
|
| + SpecializedSetup<cmds::CreateProgram, 0>(true);
|
| + cmds::CreateProgram cmd;
|
| cmd.Init(kNewClientId);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| - EXPECT_TRUE(GetProgramInfo(kNewClientId) != NULL);
|
| + EXPECT_TRUE(GetProgram(kNewClientId) != NULL);
|
| }
|
|
|
| TEST_F(GLES2DecoderTest1, CreateShaderValidArgs) {
|
| EXPECT_CALL(*gl_, CreateShader(GL_VERTEX_SHADER))
|
| .WillOnce(Return(kNewServiceId));
|
| - SpecializedSetup<CreateShader, 0>(true);
|
| - CreateShader cmd;
|
| + SpecializedSetup<cmds::CreateShader, 0>(true);
|
| + cmds::CreateShader cmd;
|
| cmd.Init(GL_VERTEX_SHADER, kNewClientId);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| - EXPECT_TRUE(GetShaderInfo(kNewClientId) != NULL);
|
| + EXPECT_TRUE(GetShader(kNewClientId) != NULL);
|
| }
|
|
|
| TEST_F(GLES2DecoderTest1, CreateShaderInvalidArgs0_0) {
|
| EXPECT_CALL(*gl_, CreateShader(_)).Times(0);
|
| - SpecializedSetup<CreateShader, 0>(false);
|
| - CreateShader cmd;
|
| + SpecializedSetup<cmds::CreateShader, 0>(false);
|
| + cmds::CreateShader cmd;
|
| cmd.Init(GL_GEOMETRY_SHADER, kNewClientId);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
|
| @@ -434,8 +434,8 @@ TEST_F(GLES2DecoderTest1, CreateShaderInvalidArgs0_0) {
|
|
|
| TEST_F(GLES2DecoderTest1, CullFaceValidArgs) {
|
| EXPECT_CALL(*gl_, CullFace(GL_FRONT));
|
| - SpecializedSetup<CullFace, 0>(true);
|
| - CullFace cmd;
|
| + SpecializedSetup<cmds::CullFace, 0>(true);
|
| + cmds::CullFace cmd;
|
| cmd.Init(GL_FRONT);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -447,19 +447,19 @@ TEST_F(GLES2DecoderTest1, DeleteBuffersValidArgs) {
|
| DeleteBuffersARB(1, Pointee(kServiceBufferId)))
|
| .Times(1);
|
| GetSharedMemoryAs<GLuint*>()[0] = client_buffer_id_;
|
| - SpecializedSetup<DeleteBuffers, 0>(true);
|
| - DeleteBuffers cmd;
|
| + SpecializedSetup<cmds::DeleteBuffers, 0>(true);
|
| + cmds::DeleteBuffers cmd;
|
| cmd.Init(1, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| EXPECT_TRUE(
|
| - GetBufferInfo(client_buffer_id_) == NULL);
|
| + GetBuffer(client_buffer_id_) == NULL);
|
| }
|
|
|
| TEST_F(GLES2DecoderTest1, DeleteBuffersInvalidArgs) {
|
| GetSharedMemoryAs<GLuint*>()[0] = kInvalidClientId;
|
| - SpecializedSetup<DeleteBuffers, 0>(false);
|
| - DeleteBuffers cmd;
|
| + SpecializedSetup<cmds::DeleteBuffers, 0>(false);
|
| + cmds::DeleteBuffers cmd;
|
| cmd.Init(1, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| }
|
| @@ -469,19 +469,21 @@ TEST_F(GLES2DecoderTest1, DeleteBuffersImmediateValidArgs) {
|
| *gl_,
|
| DeleteBuffersARB(1, Pointee(kServiceBufferId)))
|
| .Times(1);
|
| - DeleteBuffersImmediate& cmd = *GetImmediateAs<DeleteBuffersImmediate>();
|
| - SpecializedSetup<DeleteBuffersImmediate, 0>(true);
|
| + cmds::DeleteBuffersImmediate& cmd =
|
| + *GetImmediateAs<cmds::DeleteBuffersImmediate>();
|
| + SpecializedSetup<cmds::DeleteBuffersImmediate, 0>(true);
|
| cmd.Init(1, &client_buffer_id_);
|
| EXPECT_EQ(error::kNoError,
|
| ExecuteImmediateCmd(cmd, sizeof(client_buffer_id_)));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| EXPECT_TRUE(
|
| - GetBufferInfo(client_buffer_id_) == NULL);
|
| + GetBuffer(client_buffer_id_) == NULL);
|
| }
|
|
|
| TEST_F(GLES2DecoderTest1, DeleteBuffersImmediateInvalidArgs) {
|
| - DeleteBuffersImmediate& cmd = *GetImmediateAs<DeleteBuffersImmediate>();
|
| - SpecializedSetup<DeleteBuffersImmediate, 0>(false);
|
| + cmds::DeleteBuffersImmediate& cmd =
|
| + *GetImmediateAs<cmds::DeleteBuffersImmediate>();
|
| + SpecializedSetup<cmds::DeleteBuffersImmediate, 0>(false);
|
| GLuint temp = kInvalidClientId;
|
| cmd.Init(1, &temp);
|
| EXPECT_EQ(error::kNoError,
|
| @@ -494,19 +496,19 @@ TEST_F(GLES2DecoderTest1, DeleteFramebuffersValidArgs) {
|
| DeleteFramebuffersEXT(1, Pointee(kServiceFramebufferId)))
|
| .Times(1);
|
| GetSharedMemoryAs<GLuint*>()[0] = client_framebuffer_id_;
|
| - SpecializedSetup<DeleteFramebuffers, 0>(true);
|
| - DeleteFramebuffers cmd;
|
| + SpecializedSetup<cmds::DeleteFramebuffers, 0>(true);
|
| + cmds::DeleteFramebuffers cmd;
|
| cmd.Init(1, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| EXPECT_TRUE(
|
| - GetFramebufferInfo(client_framebuffer_id_) == NULL);
|
| + GetFramebuffer(client_framebuffer_id_) == NULL);
|
| }
|
|
|
| TEST_F(GLES2DecoderTest1, DeleteFramebuffersInvalidArgs) {
|
| GetSharedMemoryAs<GLuint*>()[0] = kInvalidClientId;
|
| - SpecializedSetup<DeleteFramebuffers, 0>(false);
|
| - DeleteFramebuffers cmd;
|
| + SpecializedSetup<cmds::DeleteFramebuffers, 0>(false);
|
| + cmds::DeleteFramebuffers cmd;
|
| cmd.Init(1, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| }
|
| @@ -516,21 +518,21 @@ TEST_F(GLES2DecoderTest1, DeleteFramebuffersImmediateValidArgs) {
|
| *gl_,
|
| DeleteFramebuffersEXT(1, Pointee(kServiceFramebufferId)))
|
| .Times(1);
|
| - DeleteFramebuffersImmediate& cmd =
|
| - *GetImmediateAs<DeleteFramebuffersImmediate>();
|
| - SpecializedSetup<DeleteFramebuffersImmediate, 0>(true);
|
| + cmds::DeleteFramebuffersImmediate& cmd =
|
| + *GetImmediateAs<cmds::DeleteFramebuffersImmediate>();
|
| + SpecializedSetup<cmds::DeleteFramebuffersImmediate, 0>(true);
|
| cmd.Init(1, &client_framebuffer_id_);
|
| EXPECT_EQ(error::kNoError,
|
| ExecuteImmediateCmd(cmd, sizeof(client_framebuffer_id_)));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| EXPECT_TRUE(
|
| - GetFramebufferInfo(client_framebuffer_id_) == NULL);
|
| + GetFramebuffer(client_framebuffer_id_) == NULL);
|
| }
|
|
|
| TEST_F(GLES2DecoderTest1, DeleteFramebuffersImmediateInvalidArgs) {
|
| - DeleteFramebuffersImmediate& cmd =
|
| - *GetImmediateAs<DeleteFramebuffersImmediate>();
|
| - SpecializedSetup<DeleteFramebuffersImmediate, 0>(false);
|
| + cmds::DeleteFramebuffersImmediate& cmd =
|
| + *GetImmediateAs<cmds::DeleteFramebuffersImmediate>();
|
| + SpecializedSetup<cmds::DeleteFramebuffersImmediate, 0>(false);
|
| GLuint temp = kInvalidClientId;
|
| cmd.Init(1, &temp);
|
| EXPECT_EQ(error::kNoError,
|
| @@ -539,8 +541,8 @@ TEST_F(GLES2DecoderTest1, DeleteFramebuffersImmediateInvalidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest1, DeleteProgramValidArgs) {
|
| EXPECT_CALL(*gl_, DeleteProgram(kServiceProgramId));
|
| - SpecializedSetup<DeleteProgram, 0>(true);
|
| - DeleteProgram cmd;
|
| + SpecializedSetup<cmds::DeleteProgram, 0>(true);
|
| + cmds::DeleteProgram cmd;
|
| cmd.Init(client_program_id_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -552,19 +554,19 @@ TEST_F(GLES2DecoderTest1, DeleteRenderbuffersValidArgs) {
|
| DeleteRenderbuffersEXT(1, Pointee(kServiceRenderbufferId)))
|
| .Times(1);
|
| GetSharedMemoryAs<GLuint*>()[0] = client_renderbuffer_id_;
|
| - SpecializedSetup<DeleteRenderbuffers, 0>(true);
|
| - DeleteRenderbuffers cmd;
|
| + SpecializedSetup<cmds::DeleteRenderbuffers, 0>(true);
|
| + cmds::DeleteRenderbuffers cmd;
|
| cmd.Init(1, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| EXPECT_TRUE(
|
| - GetRenderbufferInfo(client_renderbuffer_id_) == NULL);
|
| + GetRenderbuffer(client_renderbuffer_id_) == NULL);
|
| }
|
|
|
| TEST_F(GLES2DecoderTest1, DeleteRenderbuffersInvalidArgs) {
|
| GetSharedMemoryAs<GLuint*>()[0] = kInvalidClientId;
|
| - SpecializedSetup<DeleteRenderbuffers, 0>(false);
|
| - DeleteRenderbuffers cmd;
|
| + SpecializedSetup<cmds::DeleteRenderbuffers, 0>(false);
|
| + cmds::DeleteRenderbuffers cmd;
|
| cmd.Init(1, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| }
|
| @@ -574,21 +576,21 @@ TEST_F(GLES2DecoderTest1, DeleteRenderbuffersImmediateValidArgs) {
|
| *gl_,
|
| DeleteRenderbuffersEXT(1, Pointee(kServiceRenderbufferId)))
|
| .Times(1);
|
| - DeleteRenderbuffersImmediate& cmd =
|
| - *GetImmediateAs<DeleteRenderbuffersImmediate>();
|
| - SpecializedSetup<DeleteRenderbuffersImmediate, 0>(true);
|
| + cmds::DeleteRenderbuffersImmediate& cmd =
|
| + *GetImmediateAs<cmds::DeleteRenderbuffersImmediate>();
|
| + SpecializedSetup<cmds::DeleteRenderbuffersImmediate, 0>(true);
|
| cmd.Init(1, &client_renderbuffer_id_);
|
| EXPECT_EQ(error::kNoError,
|
| ExecuteImmediateCmd(cmd, sizeof(client_renderbuffer_id_)));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| EXPECT_TRUE(
|
| - GetRenderbufferInfo(client_renderbuffer_id_) == NULL);
|
| + GetRenderbuffer(client_renderbuffer_id_) == NULL);
|
| }
|
|
|
| TEST_F(GLES2DecoderTest1, DeleteRenderbuffersImmediateInvalidArgs) {
|
| - DeleteRenderbuffersImmediate& cmd =
|
| - *GetImmediateAs<DeleteRenderbuffersImmediate>();
|
| - SpecializedSetup<DeleteRenderbuffersImmediate, 0>(false);
|
| + cmds::DeleteRenderbuffersImmediate& cmd =
|
| + *GetImmediateAs<cmds::DeleteRenderbuffersImmediate>();
|
| + SpecializedSetup<cmds::DeleteRenderbuffersImmediate, 0>(false);
|
| GLuint temp = kInvalidClientId;
|
| cmd.Init(1, &temp);
|
| EXPECT_EQ(error::kNoError,
|
| @@ -597,8 +599,8 @@ TEST_F(GLES2DecoderTest1, DeleteRenderbuffersImmediateInvalidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest1, DeleteShaderValidArgs) {
|
| EXPECT_CALL(*gl_, DeleteShader(kServiceShaderId));
|
| - SpecializedSetup<DeleteShader, 0>(true);
|
| - DeleteShader cmd;
|
| + SpecializedSetup<cmds::DeleteShader, 0>(true);
|
| + cmds::DeleteShader cmd;
|
| cmd.Init(client_shader_id_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -610,19 +612,19 @@ TEST_F(GLES2DecoderTest1, DeleteTexturesValidArgs) {
|
| DeleteTextures(1, Pointee(kServiceTextureId)))
|
| .Times(1);
|
| GetSharedMemoryAs<GLuint*>()[0] = client_texture_id_;
|
| - SpecializedSetup<DeleteTextures, 0>(true);
|
| - DeleteTextures cmd;
|
| + SpecializedSetup<cmds::DeleteTextures, 0>(true);
|
| + cmds::DeleteTextures cmd;
|
| cmd.Init(1, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| EXPECT_TRUE(
|
| - GetTextureInfo(client_texture_id_) == NULL);
|
| + GetTexture(client_texture_id_) == NULL);
|
| }
|
|
|
| TEST_F(GLES2DecoderTest1, DeleteTexturesInvalidArgs) {
|
| GetSharedMemoryAs<GLuint*>()[0] = kInvalidClientId;
|
| - SpecializedSetup<DeleteTextures, 0>(false);
|
| - DeleteTextures cmd;
|
| + SpecializedSetup<cmds::DeleteTextures, 0>(false);
|
| + cmds::DeleteTextures cmd;
|
| cmd.Init(1, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| }
|
| @@ -632,19 +634,21 @@ TEST_F(GLES2DecoderTest1, DeleteTexturesImmediateValidArgs) {
|
| *gl_,
|
| DeleteTextures(1, Pointee(kServiceTextureId)))
|
| .Times(1);
|
| - DeleteTexturesImmediate& cmd = *GetImmediateAs<DeleteTexturesImmediate>();
|
| - SpecializedSetup<DeleteTexturesImmediate, 0>(true);
|
| + cmds::DeleteTexturesImmediate& cmd =
|
| + *GetImmediateAs<cmds::DeleteTexturesImmediate>();
|
| + SpecializedSetup<cmds::DeleteTexturesImmediate, 0>(true);
|
| cmd.Init(1, &client_texture_id_);
|
| EXPECT_EQ(error::kNoError,
|
| ExecuteImmediateCmd(cmd, sizeof(client_texture_id_)));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| EXPECT_TRUE(
|
| - GetTextureInfo(client_texture_id_) == NULL);
|
| + GetTexture(client_texture_id_) == NULL);
|
| }
|
|
|
| TEST_F(GLES2DecoderTest1, DeleteTexturesImmediateInvalidArgs) {
|
| - DeleteTexturesImmediate& cmd = *GetImmediateAs<DeleteTexturesImmediate>();
|
| - SpecializedSetup<DeleteTexturesImmediate, 0>(false);
|
| + cmds::DeleteTexturesImmediate& cmd =
|
| + *GetImmediateAs<cmds::DeleteTexturesImmediate>();
|
| + SpecializedSetup<cmds::DeleteTexturesImmediate, 0>(false);
|
| GLuint temp = kInvalidClientId;
|
| cmd.Init(1, &temp);
|
| EXPECT_EQ(error::kNoError,
|
| @@ -653,16 +657,16 @@ TEST_F(GLES2DecoderTest1, DeleteTexturesImmediateInvalidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest1, DepthFuncValidArgs) {
|
| EXPECT_CALL(*gl_, DepthFunc(GL_NEVER));
|
| - SpecializedSetup<DepthFunc, 0>(true);
|
| - DepthFunc cmd;
|
| + SpecializedSetup<cmds::DepthFunc, 0>(true);
|
| + cmds::DepthFunc cmd;
|
| cmd.Init(GL_NEVER);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| }
|
|
|
| TEST_F(GLES2DecoderTest1, DepthMaskValidArgs) {
|
| - SpecializedSetup<DepthMask, 0>(true);
|
| - DepthMask cmd;
|
| + SpecializedSetup<cmds::DepthMask, 0>(true);
|
| + cmds::DepthMask cmd;
|
| cmd.Init(true);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -670,8 +674,8 @@ TEST_F(GLES2DecoderTest1, DepthMaskValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest1, DepthRangefValidArgs) {
|
| EXPECT_CALL(*gl_, DepthRange(1, 2));
|
| - SpecializedSetup<DepthRangef, 0>(true);
|
| - DepthRangef cmd;
|
| + SpecializedSetup<cmds::DepthRangef, 0>(true);
|
| + cmds::DepthRangef cmd;
|
| cmd.Init(1, 2);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -679,8 +683,8 @@ TEST_F(GLES2DecoderTest1, DepthRangefValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest1, DetachShaderValidArgs) {
|
| EXPECT_CALL(*gl_, DetachShader(kServiceProgramId, kServiceShaderId));
|
| - SpecializedSetup<DetachShader, 0>(true);
|
| - DetachShader cmd;
|
| + SpecializedSetup<cmds::DetachShader, 0>(true);
|
| + cmds::DetachShader cmd;
|
| cmd.Init(client_program_id_, client_shader_id_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -688,8 +692,8 @@ TEST_F(GLES2DecoderTest1, DetachShaderValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest1, DisableValidArgs) {
|
| EXPECT_CALL(*gl_, Disable(GL_BLEND));
|
| - SpecializedSetup<Disable, 0>(true);
|
| - Disable cmd;
|
| + SpecializedSetup<cmds::Disable, 0>(true);
|
| + cmds::Disable cmd;
|
| cmd.Init(GL_BLEND);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -697,8 +701,8 @@ TEST_F(GLES2DecoderTest1, DisableValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest1, DisableInvalidArgs0_0) {
|
| EXPECT_CALL(*gl_, Disable(_)).Times(0);
|
| - SpecializedSetup<Disable, 0>(false);
|
| - Disable cmd;
|
| + SpecializedSetup<cmds::Disable, 0>(false);
|
| + cmds::Disable cmd;
|
| cmd.Init(GL_CLIP_PLANE0);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
|
| @@ -706,8 +710,8 @@ TEST_F(GLES2DecoderTest1, DisableInvalidArgs0_0) {
|
|
|
| TEST_F(GLES2DecoderTest1, DisableInvalidArgs0_1) {
|
| EXPECT_CALL(*gl_, Disable(_)).Times(0);
|
| - SpecializedSetup<Disable, 0>(false);
|
| - Disable cmd;
|
| + SpecializedSetup<cmds::Disable, 0>(false);
|
| + cmds::Disable cmd;
|
| cmd.Init(GL_POINT_SPRITE);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
|
| @@ -715,8 +719,8 @@ TEST_F(GLES2DecoderTest1, DisableInvalidArgs0_1) {
|
|
|
| TEST_F(GLES2DecoderTest1, DisableVertexAttribArrayValidArgs) {
|
| EXPECT_CALL(*gl_, DisableVertexAttribArray(1));
|
| - SpecializedSetup<DisableVertexAttribArray, 0>(true);
|
| - DisableVertexAttribArray cmd;
|
| + SpecializedSetup<cmds::DisableVertexAttribArray, 0>(true);
|
| + cmds::DisableVertexAttribArray cmd;
|
| cmd.Init(1);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -728,8 +732,8 @@ TEST_F(GLES2DecoderTest1, DisableVertexAttribArrayValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest1, EnableValidArgs) {
|
| EXPECT_CALL(*gl_, Enable(GL_BLEND));
|
| - SpecializedSetup<Enable, 0>(true);
|
| - Enable cmd;
|
| + SpecializedSetup<cmds::Enable, 0>(true);
|
| + cmds::Enable cmd;
|
| cmd.Init(GL_BLEND);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -737,8 +741,8 @@ TEST_F(GLES2DecoderTest1, EnableValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest1, EnableInvalidArgs0_0) {
|
| EXPECT_CALL(*gl_, Enable(_)).Times(0);
|
| - SpecializedSetup<Enable, 0>(false);
|
| - Enable cmd;
|
| + SpecializedSetup<cmds::Enable, 0>(false);
|
| + cmds::Enable cmd;
|
| cmd.Init(GL_CLIP_PLANE0);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
|
| @@ -746,8 +750,8 @@ TEST_F(GLES2DecoderTest1, EnableInvalidArgs0_0) {
|
|
|
| TEST_F(GLES2DecoderTest1, EnableInvalidArgs0_1) {
|
| EXPECT_CALL(*gl_, Enable(_)).Times(0);
|
| - SpecializedSetup<Enable, 0>(false);
|
| - Enable cmd;
|
| + SpecializedSetup<cmds::Enable, 0>(false);
|
| + cmds::Enable cmd;
|
| cmd.Init(GL_POINT_SPRITE);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
|
| @@ -755,8 +759,8 @@ TEST_F(GLES2DecoderTest1, EnableInvalidArgs0_1) {
|
|
|
| TEST_F(GLES2DecoderTest1, EnableVertexAttribArrayValidArgs) {
|
| EXPECT_CALL(*gl_, EnableVertexAttribArray(1));
|
| - SpecializedSetup<EnableVertexAttribArray, 0>(true);
|
| - EnableVertexAttribArray cmd;
|
| + SpecializedSetup<cmds::EnableVertexAttribArray, 0>(true);
|
| + cmds::EnableVertexAttribArray cmd;
|
| cmd.Init(1);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -764,8 +768,8 @@ TEST_F(GLES2DecoderTest1, EnableVertexAttribArrayValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest1, FinishValidArgs) {
|
| EXPECT_CALL(*gl_, Finish());
|
| - SpecializedSetup<Finish, 0>(true);
|
| - Finish cmd;
|
| + SpecializedSetup<cmds::Finish, 0>(true);
|
| + cmds::Finish cmd;
|
| cmd.Init();
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -773,8 +777,8 @@ TEST_F(GLES2DecoderTest1, FinishValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest1, FlushValidArgs) {
|
| EXPECT_CALL(*gl_, Flush());
|
| - SpecializedSetup<Flush, 0>(true);
|
| - Flush cmd;
|
| + SpecializedSetup<cmds::Flush, 0>(true);
|
| + cmds::Flush cmd;
|
| cmd.Init();
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -785,8 +789,8 @@ TEST_F(GLES2DecoderTest1, FramebufferRenderbufferValidArgs) {
|
| *gl_, FramebufferRenderbufferEXT(
|
| GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER,
|
| kServiceRenderbufferId));
|
| - SpecializedSetup<FramebufferRenderbuffer, 0>(true);
|
| - FramebufferRenderbuffer cmd;
|
| + SpecializedSetup<cmds::FramebufferRenderbuffer, 0>(true);
|
| + cmds::FramebufferRenderbuffer cmd;
|
| cmd.Init(
|
| GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER,
|
| client_renderbuffer_id_);
|
| @@ -796,8 +800,8 @@ TEST_F(GLES2DecoderTest1, FramebufferRenderbufferValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest1, FramebufferRenderbufferInvalidArgs0_0) {
|
| EXPECT_CALL(*gl_, FramebufferRenderbufferEXT(_, _, _, _)).Times(0);
|
| - SpecializedSetup<FramebufferRenderbuffer, 0>(false);
|
| - FramebufferRenderbuffer cmd;
|
| + SpecializedSetup<cmds::FramebufferRenderbuffer, 0>(false);
|
| + cmds::FramebufferRenderbuffer cmd;
|
| cmd.Init(
|
| GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER,
|
| client_renderbuffer_id_);
|
| @@ -807,8 +811,8 @@ TEST_F(GLES2DecoderTest1, FramebufferRenderbufferInvalidArgs0_0) {
|
|
|
| TEST_F(GLES2DecoderTest1, FramebufferRenderbufferInvalidArgs0_1) {
|
| EXPECT_CALL(*gl_, FramebufferRenderbufferEXT(_, _, _, _)).Times(0);
|
| - SpecializedSetup<FramebufferRenderbuffer, 0>(false);
|
| - FramebufferRenderbuffer cmd;
|
| + SpecializedSetup<cmds::FramebufferRenderbuffer, 0>(false);
|
| + cmds::FramebufferRenderbuffer cmd;
|
| cmd.Init(
|
| GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER,
|
| client_renderbuffer_id_);
|
| @@ -818,8 +822,8 @@ TEST_F(GLES2DecoderTest1, FramebufferRenderbufferInvalidArgs0_1) {
|
|
|
| TEST_F(GLES2DecoderTest1, FramebufferRenderbufferInvalidArgs2_0) {
|
| EXPECT_CALL(*gl_, FramebufferRenderbufferEXT(_, _, _, _)).Times(0);
|
| - SpecializedSetup<FramebufferRenderbuffer, 0>(false);
|
| - FramebufferRenderbuffer cmd;
|
| + SpecializedSetup<cmds::FramebufferRenderbuffer, 0>(false);
|
| + cmds::FramebufferRenderbuffer cmd;
|
| cmd.Init(
|
| GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_FRAMEBUFFER,
|
| client_renderbuffer_id_);
|
| @@ -832,8 +836,8 @@ TEST_F(GLES2DecoderTest1, FramebufferTexture2DValidArgs) {
|
| *gl_, FramebufferTexture2DEXT(
|
| GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
|
| kServiceTextureId, 0));
|
| - SpecializedSetup<FramebufferTexture2D, 0>(true);
|
| - FramebufferTexture2D cmd;
|
| + SpecializedSetup<cmds::FramebufferTexture2D, 0>(true);
|
| + cmds::FramebufferTexture2D cmd;
|
| cmd.Init(
|
| GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, client_texture_id_,
|
| 0);
|
| @@ -843,8 +847,8 @@ TEST_F(GLES2DecoderTest1, FramebufferTexture2DValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest1, FramebufferTexture2DInvalidArgs0_0) {
|
| EXPECT_CALL(*gl_, FramebufferTexture2DEXT(_, _, _, _, _)).Times(0);
|
| - SpecializedSetup<FramebufferTexture2D, 0>(false);
|
| - FramebufferTexture2D cmd;
|
| + SpecializedSetup<cmds::FramebufferTexture2D, 0>(false);
|
| + cmds::FramebufferTexture2D cmd;
|
| cmd.Init(
|
| GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
|
| client_texture_id_, 0);
|
| @@ -854,8 +858,8 @@ TEST_F(GLES2DecoderTest1, FramebufferTexture2DInvalidArgs0_0) {
|
|
|
| TEST_F(GLES2DecoderTest1, FramebufferTexture2DInvalidArgs0_1) {
|
| EXPECT_CALL(*gl_, FramebufferTexture2DEXT(_, _, _, _, _)).Times(0);
|
| - SpecializedSetup<FramebufferTexture2D, 0>(false);
|
| - FramebufferTexture2D cmd;
|
| + SpecializedSetup<cmds::FramebufferTexture2D, 0>(false);
|
| + cmds::FramebufferTexture2D cmd;
|
| cmd.Init(
|
| GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
|
| client_texture_id_, 0);
|
| @@ -865,8 +869,8 @@ TEST_F(GLES2DecoderTest1, FramebufferTexture2DInvalidArgs0_1) {
|
|
|
| TEST_F(GLES2DecoderTest1, FramebufferTexture2DInvalidArgs2_0) {
|
| EXPECT_CALL(*gl_, FramebufferTexture2DEXT(_, _, _, _, _)).Times(0);
|
| - SpecializedSetup<FramebufferTexture2D, 0>(false);
|
| - FramebufferTexture2D cmd;
|
| + SpecializedSetup<cmds::FramebufferTexture2D, 0>(false);
|
| + cmds::FramebufferTexture2D cmd;
|
| cmd.Init(
|
| GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_PROXY_TEXTURE_CUBE_MAP,
|
| client_texture_id_, 0);
|
| @@ -876,8 +880,8 @@ TEST_F(GLES2DecoderTest1, FramebufferTexture2DInvalidArgs2_0) {
|
|
|
| TEST_F(GLES2DecoderTest1, FramebufferTexture2DInvalidArgs4_0) {
|
| EXPECT_CALL(*gl_, FramebufferTexture2DEXT(_, _, _, _, _)).Times(0);
|
| - SpecializedSetup<FramebufferTexture2D, 0>(false);
|
| - FramebufferTexture2D cmd;
|
| + SpecializedSetup<cmds::FramebufferTexture2D, 0>(false);
|
| + cmds::FramebufferTexture2D cmd;
|
| cmd.Init(
|
| GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, client_texture_id_,
|
| 1);
|
| @@ -887,8 +891,8 @@ TEST_F(GLES2DecoderTest1, FramebufferTexture2DInvalidArgs4_0) {
|
|
|
| TEST_F(GLES2DecoderTest1, FrontFaceValidArgs) {
|
| EXPECT_CALL(*gl_, FrontFace(GL_CW));
|
| - SpecializedSetup<FrontFace, 0>(true);
|
| - FrontFace cmd;
|
| + SpecializedSetup<cmds::FrontFace, 0>(true);
|
| + cmds::FrontFace cmd;
|
| cmd.Init(GL_CW);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -898,19 +902,19 @@ TEST_F(GLES2DecoderTest1, GenBuffersValidArgs) {
|
| EXPECT_CALL(*gl_, GenBuffersARB(1, _))
|
| .WillOnce(SetArgumentPointee<1>(kNewServiceId));
|
| GetSharedMemoryAs<GLuint*>()[0] = kNewClientId;
|
| - SpecializedSetup<GenBuffers, 0>(true);
|
| - GenBuffers cmd;
|
| + SpecializedSetup<cmds::GenBuffers, 0>(true);
|
| + cmds::GenBuffers cmd;
|
| cmd.Init(1, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| - EXPECT_TRUE(GetBufferInfo(kNewClientId) != NULL);
|
| + EXPECT_TRUE(GetBuffer(kNewClientId) != NULL);
|
| }
|
|
|
| TEST_F(GLES2DecoderTest1, GenBuffersInvalidArgs) {
|
| EXPECT_CALL(*gl_, GenBuffersARB(_, _)).Times(0);
|
| GetSharedMemoryAs<GLuint*>()[0] = client_buffer_id_;
|
| - SpecializedSetup<GenBuffers, 0>(false);
|
| - GenBuffers cmd;
|
| + SpecializedSetup<cmds::GenBuffers, 0>(false);
|
| + cmds::GenBuffers cmd;
|
| cmd.Init(1, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kInvalidArguments, ExecuteCmd(cmd));
|
| }
|
| @@ -918,20 +922,20 @@ TEST_F(GLES2DecoderTest1, GenBuffersInvalidArgs) {
|
| TEST_F(GLES2DecoderTest1, GenBuffersImmediateValidArgs) {
|
| EXPECT_CALL(*gl_, GenBuffersARB(1, _))
|
| .WillOnce(SetArgumentPointee<1>(kNewServiceId));
|
| - GenBuffersImmediate* cmd = GetImmediateAs<GenBuffersImmediate>();
|
| + cmds::GenBuffersImmediate* cmd = GetImmediateAs<cmds::GenBuffersImmediate>();
|
| GLuint temp = kNewClientId;
|
| - SpecializedSetup<GenBuffersImmediate, 0>(true);
|
| + SpecializedSetup<cmds::GenBuffersImmediate, 0>(true);
|
| cmd->Init(1, &temp);
|
| EXPECT_EQ(error::kNoError,
|
| ExecuteImmediateCmd(*cmd, sizeof(temp)));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| - EXPECT_TRUE(GetBufferInfo(kNewClientId) != NULL);
|
| + EXPECT_TRUE(GetBuffer(kNewClientId) != NULL);
|
| }
|
|
|
| TEST_F(GLES2DecoderTest1, GenBuffersImmediateInvalidArgs) {
|
| EXPECT_CALL(*gl_, GenBuffersARB(_, _)).Times(0);
|
| - GenBuffersImmediate* cmd = GetImmediateAs<GenBuffersImmediate>();
|
| - SpecializedSetup<GenBuffersImmediate, 0>(false);
|
| + cmds::GenBuffersImmediate* cmd = GetImmediateAs<cmds::GenBuffersImmediate>();
|
| + SpecializedSetup<cmds::GenBuffersImmediate, 0>(false);
|
| cmd->Init(1, &client_buffer_id_);
|
| EXPECT_EQ(error::kInvalidArguments,
|
| ExecuteImmediateCmd(*cmd, sizeof(&client_buffer_id_)));
|
| @@ -939,8 +943,8 @@ TEST_F(GLES2DecoderTest1, GenBuffersImmediateInvalidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest1, GenerateMipmapValidArgs) {
|
| EXPECT_CALL(*gl_, GenerateMipmapEXT(GL_TEXTURE_2D));
|
| - SpecializedSetup<GenerateMipmap, 0>(true);
|
| - GenerateMipmap cmd;
|
| + SpecializedSetup<cmds::GenerateMipmap, 0>(true);
|
| + cmds::GenerateMipmap cmd;
|
| cmd.Init(GL_TEXTURE_2D);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -948,8 +952,8 @@ TEST_F(GLES2DecoderTest1, GenerateMipmapValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest1, GenerateMipmapInvalidArgs0_0) {
|
| EXPECT_CALL(*gl_, GenerateMipmapEXT(_)).Times(0);
|
| - SpecializedSetup<GenerateMipmap, 0>(false);
|
| - GenerateMipmap cmd;
|
| + SpecializedSetup<cmds::GenerateMipmap, 0>(false);
|
| + cmds::GenerateMipmap cmd;
|
| cmd.Init(GL_TEXTURE_1D);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
|
| @@ -957,8 +961,8 @@ TEST_F(GLES2DecoderTest1, GenerateMipmapInvalidArgs0_0) {
|
|
|
| TEST_F(GLES2DecoderTest1, GenerateMipmapInvalidArgs0_1) {
|
| EXPECT_CALL(*gl_, GenerateMipmapEXT(_)).Times(0);
|
| - SpecializedSetup<GenerateMipmap, 0>(false);
|
| - GenerateMipmap cmd;
|
| + SpecializedSetup<cmds::GenerateMipmap, 0>(false);
|
| + cmds::GenerateMipmap cmd;
|
| cmd.Init(GL_TEXTURE_3D);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
|
| @@ -968,19 +972,19 @@ TEST_F(GLES2DecoderTest1, GenFramebuffersValidArgs) {
|
| EXPECT_CALL(*gl_, GenFramebuffersEXT(1, _))
|
| .WillOnce(SetArgumentPointee<1>(kNewServiceId));
|
| GetSharedMemoryAs<GLuint*>()[0] = kNewClientId;
|
| - SpecializedSetup<GenFramebuffers, 0>(true);
|
| - GenFramebuffers cmd;
|
| + SpecializedSetup<cmds::GenFramebuffers, 0>(true);
|
| + cmds::GenFramebuffers cmd;
|
| cmd.Init(1, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| - EXPECT_TRUE(GetFramebufferInfo(kNewClientId) != NULL);
|
| + EXPECT_TRUE(GetFramebuffer(kNewClientId) != NULL);
|
| }
|
|
|
| TEST_F(GLES2DecoderTest1, GenFramebuffersInvalidArgs) {
|
| EXPECT_CALL(*gl_, GenFramebuffersEXT(_, _)).Times(0);
|
| GetSharedMemoryAs<GLuint*>()[0] = client_framebuffer_id_;
|
| - SpecializedSetup<GenFramebuffers, 0>(false);
|
| - GenFramebuffers cmd;
|
| + SpecializedSetup<cmds::GenFramebuffers, 0>(false);
|
| + cmds::GenFramebuffers cmd;
|
| cmd.Init(1, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kInvalidArguments, ExecuteCmd(cmd));
|
| }
|
| @@ -988,20 +992,22 @@ TEST_F(GLES2DecoderTest1, GenFramebuffersInvalidArgs) {
|
| TEST_F(GLES2DecoderTest1, GenFramebuffersImmediateValidArgs) {
|
| EXPECT_CALL(*gl_, GenFramebuffersEXT(1, _))
|
| .WillOnce(SetArgumentPointee<1>(kNewServiceId));
|
| - GenFramebuffersImmediate* cmd = GetImmediateAs<GenFramebuffersImmediate>();
|
| + cmds::GenFramebuffersImmediate* cmd =
|
| + GetImmediateAs<cmds::GenFramebuffersImmediate>();
|
| GLuint temp = kNewClientId;
|
| - SpecializedSetup<GenFramebuffersImmediate, 0>(true);
|
| + SpecializedSetup<cmds::GenFramebuffersImmediate, 0>(true);
|
| cmd->Init(1, &temp);
|
| EXPECT_EQ(error::kNoError,
|
| ExecuteImmediateCmd(*cmd, sizeof(temp)));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| - EXPECT_TRUE(GetFramebufferInfo(kNewClientId) != NULL);
|
| + EXPECT_TRUE(GetFramebuffer(kNewClientId) != NULL);
|
| }
|
|
|
| TEST_F(GLES2DecoderTest1, GenFramebuffersImmediateInvalidArgs) {
|
| EXPECT_CALL(*gl_, GenFramebuffersEXT(_, _)).Times(0);
|
| - GenFramebuffersImmediate* cmd = GetImmediateAs<GenFramebuffersImmediate>();
|
| - SpecializedSetup<GenFramebuffersImmediate, 0>(false);
|
| + cmds::GenFramebuffersImmediate* cmd =
|
| + GetImmediateAs<cmds::GenFramebuffersImmediate>();
|
| + SpecializedSetup<cmds::GenFramebuffersImmediate, 0>(false);
|
| cmd->Init(1, &client_framebuffer_id_);
|
| EXPECT_EQ(error::kInvalidArguments,
|
| ExecuteImmediateCmd(*cmd, sizeof(&client_framebuffer_id_)));
|
| @@ -1011,19 +1017,19 @@ TEST_F(GLES2DecoderTest1, GenRenderbuffersValidArgs) {
|
| EXPECT_CALL(*gl_, GenRenderbuffersEXT(1, _))
|
| .WillOnce(SetArgumentPointee<1>(kNewServiceId));
|
| GetSharedMemoryAs<GLuint*>()[0] = kNewClientId;
|
| - SpecializedSetup<GenRenderbuffers, 0>(true);
|
| - GenRenderbuffers cmd;
|
| + SpecializedSetup<cmds::GenRenderbuffers, 0>(true);
|
| + cmds::GenRenderbuffers cmd;
|
| cmd.Init(1, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| - EXPECT_TRUE(GetRenderbufferInfo(kNewClientId) != NULL);
|
| + EXPECT_TRUE(GetRenderbuffer(kNewClientId) != NULL);
|
| }
|
|
|
| TEST_F(GLES2DecoderTest1, GenRenderbuffersInvalidArgs) {
|
| EXPECT_CALL(*gl_, GenRenderbuffersEXT(_, _)).Times(0);
|
| GetSharedMemoryAs<GLuint*>()[0] = client_renderbuffer_id_;
|
| - SpecializedSetup<GenRenderbuffers, 0>(false);
|
| - GenRenderbuffers cmd;
|
| + SpecializedSetup<cmds::GenRenderbuffers, 0>(false);
|
| + cmds::GenRenderbuffers cmd;
|
| cmd.Init(1, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kInvalidArguments, ExecuteCmd(cmd));
|
| }
|
| @@ -1031,20 +1037,22 @@ TEST_F(GLES2DecoderTest1, GenRenderbuffersInvalidArgs) {
|
| TEST_F(GLES2DecoderTest1, GenRenderbuffersImmediateValidArgs) {
|
| EXPECT_CALL(*gl_, GenRenderbuffersEXT(1, _))
|
| .WillOnce(SetArgumentPointee<1>(kNewServiceId));
|
| - GenRenderbuffersImmediate* cmd = GetImmediateAs<GenRenderbuffersImmediate>();
|
| + cmds::GenRenderbuffersImmediate* cmd =
|
| + GetImmediateAs<cmds::GenRenderbuffersImmediate>();
|
| GLuint temp = kNewClientId;
|
| - SpecializedSetup<GenRenderbuffersImmediate, 0>(true);
|
| + SpecializedSetup<cmds::GenRenderbuffersImmediate, 0>(true);
|
| cmd->Init(1, &temp);
|
| EXPECT_EQ(error::kNoError,
|
| ExecuteImmediateCmd(*cmd, sizeof(temp)));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| - EXPECT_TRUE(GetRenderbufferInfo(kNewClientId) != NULL);
|
| + EXPECT_TRUE(GetRenderbuffer(kNewClientId) != NULL);
|
| }
|
|
|
| TEST_F(GLES2DecoderTest1, GenRenderbuffersImmediateInvalidArgs) {
|
| EXPECT_CALL(*gl_, GenRenderbuffersEXT(_, _)).Times(0);
|
| - GenRenderbuffersImmediate* cmd = GetImmediateAs<GenRenderbuffersImmediate>();
|
| - SpecializedSetup<GenRenderbuffersImmediate, 0>(false);
|
| + cmds::GenRenderbuffersImmediate* cmd =
|
| + GetImmediateAs<cmds::GenRenderbuffersImmediate>();
|
| + SpecializedSetup<cmds::GenRenderbuffersImmediate, 0>(false);
|
| cmd->Init(1, &client_renderbuffer_id_);
|
| EXPECT_EQ(error::kInvalidArguments,
|
| ExecuteImmediateCmd(*cmd, sizeof(&client_renderbuffer_id_)));
|
| @@ -1054,19 +1062,19 @@ TEST_F(GLES2DecoderTest1, GenTexturesValidArgs) {
|
| EXPECT_CALL(*gl_, GenTextures(1, _))
|
| .WillOnce(SetArgumentPointee<1>(kNewServiceId));
|
| GetSharedMemoryAs<GLuint*>()[0] = kNewClientId;
|
| - SpecializedSetup<GenTextures, 0>(true);
|
| - GenTextures cmd;
|
| + SpecializedSetup<cmds::GenTextures, 0>(true);
|
| + cmds::GenTextures cmd;
|
| cmd.Init(1, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| - EXPECT_TRUE(GetTextureInfo(kNewClientId) != NULL);
|
| + EXPECT_TRUE(GetTexture(kNewClientId) != NULL);
|
| }
|
|
|
| TEST_F(GLES2DecoderTest1, GenTexturesInvalidArgs) {
|
| EXPECT_CALL(*gl_, GenTextures(_, _)).Times(0);
|
| GetSharedMemoryAs<GLuint*>()[0] = client_texture_id_;
|
| - SpecializedSetup<GenTextures, 0>(false);
|
| - GenTextures cmd;
|
| + SpecializedSetup<cmds::GenTextures, 0>(false);
|
| + cmds::GenTextures cmd;
|
| cmd.Init(1, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kInvalidArguments, ExecuteCmd(cmd));
|
| }
|
| @@ -1074,20 +1082,22 @@ TEST_F(GLES2DecoderTest1, GenTexturesInvalidArgs) {
|
| TEST_F(GLES2DecoderTest1, GenTexturesImmediateValidArgs) {
|
| EXPECT_CALL(*gl_, GenTextures(1, _))
|
| .WillOnce(SetArgumentPointee<1>(kNewServiceId));
|
| - GenTexturesImmediate* cmd = GetImmediateAs<GenTexturesImmediate>();
|
| + cmds::GenTexturesImmediate* cmd =
|
| + GetImmediateAs<cmds::GenTexturesImmediate>();
|
| GLuint temp = kNewClientId;
|
| - SpecializedSetup<GenTexturesImmediate, 0>(true);
|
| + SpecializedSetup<cmds::GenTexturesImmediate, 0>(true);
|
| cmd->Init(1, &temp);
|
| EXPECT_EQ(error::kNoError,
|
| ExecuteImmediateCmd(*cmd, sizeof(temp)));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| - EXPECT_TRUE(GetTextureInfo(kNewClientId) != NULL);
|
| + EXPECT_TRUE(GetTexture(kNewClientId) != NULL);
|
| }
|
|
|
| TEST_F(GLES2DecoderTest1, GenTexturesImmediateInvalidArgs) {
|
| EXPECT_CALL(*gl_, GenTextures(_, _)).Times(0);
|
| - GenTexturesImmediate* cmd = GetImmediateAs<GenTexturesImmediate>();
|
| - SpecializedSetup<GenTexturesImmediate, 0>(false);
|
| + cmds::GenTexturesImmediate* cmd =
|
| + GetImmediateAs<cmds::GenTexturesImmediate>();
|
| + SpecializedSetup<cmds::GenTexturesImmediate, 0>(false);
|
| cmd->Init(1, &client_texture_id_);
|
| EXPECT_EQ(error::kInvalidArguments,
|
| ExecuteImmediateCmd(*cmd, sizeof(&client_texture_id_)));
|
| @@ -1110,12 +1120,12 @@ TEST_F(GLES2DecoderTest1, GetBooleanvValidArgs) {
|
| .WillOnce(Return(GL_NO_ERROR))
|
| .WillOnce(Return(GL_NO_ERROR))
|
| .RetiresOnSaturation();
|
| - SpecializedSetup<GetBooleanv, 0>(true);
|
| - typedef GetBooleanv::Result Result;
|
| + SpecializedSetup<cmds::GetBooleanv, 0>(true);
|
| + typedef cmds::GetBooleanv::Result Result;
|
| Result* result = static_cast<Result*>(shared_memory_address_);
|
| EXPECT_CALL(*gl_, GetBooleanv(GL_ACTIVE_TEXTURE, result->GetData()));
|
| result->size = 0;
|
| - GetBooleanv cmd;
|
| + cmds::GetBooleanv cmd;
|
| cmd.Init(GL_ACTIVE_TEXTURE, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(decoder_->GetGLES2Util()->GLGetNumValuesReturned(
|
| @@ -1126,11 +1136,11 @@ TEST_F(GLES2DecoderTest1, GetBooleanvValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest1, GetBooleanvInvalidArgs0_0) {
|
| EXPECT_CALL(*gl_, GetBooleanv(_, _)).Times(0);
|
| - SpecializedSetup<GetBooleanv, 0>(false);
|
| - GetBooleanv::Result* result =
|
| - static_cast<GetBooleanv::Result*>(shared_memory_address_);
|
| + SpecializedSetup<cmds::GetBooleanv, 0>(false);
|
| + cmds::GetBooleanv::Result* result =
|
| + static_cast<cmds::GetBooleanv::Result*>(shared_memory_address_);
|
| result->size = 0;
|
| - GetBooleanv cmd;
|
| + cmds::GetBooleanv cmd;
|
| cmd.Init(GL_FOG_HINT, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(0u, result->size);
|
| @@ -1139,11 +1149,11 @@ TEST_F(GLES2DecoderTest1, GetBooleanvInvalidArgs0_0) {
|
|
|
| TEST_F(GLES2DecoderTest1, GetBooleanvInvalidArgs1_0) {
|
| EXPECT_CALL(*gl_, GetBooleanv(_, _)).Times(0);
|
| - SpecializedSetup<GetBooleanv, 0>(false);
|
| - GetBooleanv::Result* result =
|
| - static_cast<GetBooleanv::Result*>(shared_memory_address_);
|
| + SpecializedSetup<cmds::GetBooleanv, 0>(false);
|
| + cmds::GetBooleanv::Result* result =
|
| + static_cast<cmds::GetBooleanv::Result*>(shared_memory_address_);
|
| result->size = 0;
|
| - GetBooleanv cmd;
|
| + cmds::GetBooleanv cmd;
|
| cmd.Init(GL_ACTIVE_TEXTURE, kInvalidSharedMemoryId, 0);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| EXPECT_EQ(0u, result->size);
|
| @@ -1151,11 +1161,11 @@ TEST_F(GLES2DecoderTest1, GetBooleanvInvalidArgs1_0) {
|
|
|
| TEST_F(GLES2DecoderTest1, GetBooleanvInvalidArgs1_1) {
|
| EXPECT_CALL(*gl_, GetBooleanv(_, _)).Times(0);
|
| - SpecializedSetup<GetBooleanv, 0>(false);
|
| - GetBooleanv::Result* result =
|
| - static_cast<GetBooleanv::Result*>(shared_memory_address_);
|
| + SpecializedSetup<cmds::GetBooleanv, 0>(false);
|
| + cmds::GetBooleanv::Result* result =
|
| + static_cast<cmds::GetBooleanv::Result*>(shared_memory_address_);
|
| result->size = 0;
|
| - GetBooleanv cmd;
|
| + cmds::GetBooleanv cmd;
|
| cmd.Init(GL_ACTIVE_TEXTURE, shared_memory_id_, kInvalidSharedMemoryOffset);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| EXPECT_EQ(0u, result->size);
|
| @@ -1166,14 +1176,14 @@ TEST_F(GLES2DecoderTest1, GetBufferParameterivValidArgs) {
|
| .WillOnce(Return(GL_NO_ERROR))
|
| .WillOnce(Return(GL_NO_ERROR))
|
| .RetiresOnSaturation();
|
| - SpecializedSetup<GetBufferParameteriv, 0>(true);
|
| - typedef GetBufferParameteriv::Result Result;
|
| + SpecializedSetup<cmds::GetBufferParameteriv, 0>(true);
|
| + typedef cmds::GetBufferParameteriv::Result Result;
|
| Result* result = static_cast<Result*>(shared_memory_address_);
|
| EXPECT_CALL(
|
| *gl_, GetBufferParameteriv(
|
| GL_ARRAY_BUFFER, GL_BUFFER_SIZE, result->GetData()));
|
| result->size = 0;
|
| - GetBufferParameteriv cmd;
|
| + cmds::GetBufferParameteriv cmd;
|
| cmd.Init(
|
| GL_ARRAY_BUFFER, GL_BUFFER_SIZE, shared_memory_id_,
|
| shared_memory_offset_);
|
| @@ -1186,11 +1196,11 @@ TEST_F(GLES2DecoderTest1, GetBufferParameterivValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest1, GetBufferParameterivInvalidArgs0_0) {
|
| EXPECT_CALL(*gl_, GetBufferParameteriv(_, _, _)).Times(0);
|
| - SpecializedSetup<GetBufferParameteriv, 0>(false);
|
| - GetBufferParameteriv::Result* result =
|
| - static_cast<GetBufferParameteriv::Result*>(shared_memory_address_);
|
| + SpecializedSetup<cmds::GetBufferParameteriv, 0>(false);
|
| + cmds::GetBufferParameteriv::Result* result =
|
| + static_cast<cmds::GetBufferParameteriv::Result*>(shared_memory_address_);
|
| result->size = 0;
|
| - GetBufferParameteriv cmd;
|
| + cmds::GetBufferParameteriv cmd;
|
| cmd.Init(
|
| GL_RENDERBUFFER, GL_BUFFER_SIZE, shared_memory_id_,
|
| shared_memory_offset_);
|
| @@ -1201,11 +1211,11 @@ TEST_F(GLES2DecoderTest1, GetBufferParameterivInvalidArgs0_0) {
|
|
|
| TEST_F(GLES2DecoderTest1, GetBufferParameterivInvalidArgs1_0) {
|
| EXPECT_CALL(*gl_, GetBufferParameteriv(_, _, _)).Times(0);
|
| - SpecializedSetup<GetBufferParameteriv, 0>(false);
|
| - GetBufferParameteriv::Result* result =
|
| - static_cast<GetBufferParameteriv::Result*>(shared_memory_address_);
|
| + SpecializedSetup<cmds::GetBufferParameteriv, 0>(false);
|
| + cmds::GetBufferParameteriv::Result* result =
|
| + static_cast<cmds::GetBufferParameteriv::Result*>(shared_memory_address_);
|
| result->size = 0;
|
| - GetBufferParameteriv cmd;
|
| + cmds::GetBufferParameteriv cmd;
|
| cmd.Init(
|
| GL_ARRAY_BUFFER, GL_PIXEL_PACK_BUFFER, shared_memory_id_,
|
| shared_memory_offset_);
|
| @@ -1216,11 +1226,11 @@ TEST_F(GLES2DecoderTest1, GetBufferParameterivInvalidArgs1_0) {
|
|
|
| TEST_F(GLES2DecoderTest1, GetBufferParameterivInvalidArgs2_0) {
|
| EXPECT_CALL(*gl_, GetBufferParameteriv(_, _, _)).Times(0);
|
| - SpecializedSetup<GetBufferParameteriv, 0>(false);
|
| - GetBufferParameteriv::Result* result =
|
| - static_cast<GetBufferParameteriv::Result*>(shared_memory_address_);
|
| + SpecializedSetup<cmds::GetBufferParameteriv, 0>(false);
|
| + cmds::GetBufferParameteriv::Result* result =
|
| + static_cast<cmds::GetBufferParameteriv::Result*>(shared_memory_address_);
|
| result->size = 0;
|
| - GetBufferParameteriv cmd;
|
| + cmds::GetBufferParameteriv cmd;
|
| cmd.Init(GL_ARRAY_BUFFER, GL_BUFFER_SIZE, kInvalidSharedMemoryId, 0);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| EXPECT_EQ(0u, result->size);
|
| @@ -1228,11 +1238,11 @@ TEST_F(GLES2DecoderTest1, GetBufferParameterivInvalidArgs2_0) {
|
|
|
| TEST_F(GLES2DecoderTest1, GetBufferParameterivInvalidArgs2_1) {
|
| EXPECT_CALL(*gl_, GetBufferParameteriv(_, _, _)).Times(0);
|
| - SpecializedSetup<GetBufferParameteriv, 0>(false);
|
| - GetBufferParameteriv::Result* result =
|
| - static_cast<GetBufferParameteriv::Result*>(shared_memory_address_);
|
| + SpecializedSetup<cmds::GetBufferParameteriv, 0>(false);
|
| + cmds::GetBufferParameteriv::Result* result =
|
| + static_cast<cmds::GetBufferParameteriv::Result*>(shared_memory_address_);
|
| result->size = 0;
|
| - GetBufferParameteriv cmd;
|
| + cmds::GetBufferParameteriv cmd;
|
| cmd.Init(
|
| GL_ARRAY_BUFFER, GL_BUFFER_SIZE, shared_memory_id_,
|
| kInvalidSharedMemoryOffset);
|
| @@ -1242,8 +1252,8 @@ TEST_F(GLES2DecoderTest1, GetBufferParameterivInvalidArgs2_1) {
|
|
|
| TEST_F(GLES2DecoderTest1, GetErrorValidArgs) {
|
| EXPECT_CALL(*gl_, GetError());
|
| - SpecializedSetup<GetError, 0>(true);
|
| - GetError cmd;
|
| + SpecializedSetup<cmds::GetError, 0>(true);
|
| + cmds::GetError cmd;
|
| cmd.Init(shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -1251,8 +1261,8 @@ TEST_F(GLES2DecoderTest1, GetErrorValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest1, GetErrorInvalidArgsBadSharedMemoryId) {
|
| EXPECT_CALL(*gl_, GetError()).Times(0);
|
| - SpecializedSetup<GetError, 0>(false);
|
| - GetError cmd;
|
| + SpecializedSetup<cmds::GetError, 0>(false);
|
| + cmds::GetError cmd;
|
| cmd.Init(kInvalidSharedMemoryId, shared_memory_offset_);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| cmd.Init(shared_memory_id_, kInvalidSharedMemoryOffset);
|
| @@ -1264,12 +1274,12 @@ TEST_F(GLES2DecoderTest1, GetFloatvValidArgs) {
|
| .WillOnce(Return(GL_NO_ERROR))
|
| .WillOnce(Return(GL_NO_ERROR))
|
| .RetiresOnSaturation();
|
| - SpecializedSetup<GetFloatv, 0>(true);
|
| - typedef GetFloatv::Result Result;
|
| + SpecializedSetup<cmds::GetFloatv, 0>(true);
|
| + typedef cmds::GetFloatv::Result Result;
|
| Result* result = static_cast<Result*>(shared_memory_address_);
|
| EXPECT_CALL(*gl_, GetFloatv(GL_ACTIVE_TEXTURE, result->GetData()));
|
| result->size = 0;
|
| - GetFloatv cmd;
|
| + cmds::GetFloatv cmd;
|
| cmd.Init(GL_ACTIVE_TEXTURE, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(decoder_->GetGLES2Util()->GLGetNumValuesReturned(
|
| @@ -1280,11 +1290,11 @@ TEST_F(GLES2DecoderTest1, GetFloatvValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest1, GetFloatvInvalidArgs0_0) {
|
| EXPECT_CALL(*gl_, GetFloatv(_, _)).Times(0);
|
| - SpecializedSetup<GetFloatv, 0>(false);
|
| - GetFloatv::Result* result =
|
| - static_cast<GetFloatv::Result*>(shared_memory_address_);
|
| + SpecializedSetup<cmds::GetFloatv, 0>(false);
|
| + cmds::GetFloatv::Result* result =
|
| + static_cast<cmds::GetFloatv::Result*>(shared_memory_address_);
|
| result->size = 0;
|
| - GetFloatv cmd;
|
| + cmds::GetFloatv cmd;
|
| cmd.Init(GL_FOG_HINT, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(0u, result->size);
|
| @@ -1293,11 +1303,11 @@ TEST_F(GLES2DecoderTest1, GetFloatvInvalidArgs0_0) {
|
|
|
| TEST_F(GLES2DecoderTest1, GetFloatvInvalidArgs1_0) {
|
| EXPECT_CALL(*gl_, GetFloatv(_, _)).Times(0);
|
| - SpecializedSetup<GetFloatv, 0>(false);
|
| - GetFloatv::Result* result =
|
| - static_cast<GetFloatv::Result*>(shared_memory_address_);
|
| + SpecializedSetup<cmds::GetFloatv, 0>(false);
|
| + cmds::GetFloatv::Result* result =
|
| + static_cast<cmds::GetFloatv::Result*>(shared_memory_address_);
|
| result->size = 0;
|
| - GetFloatv cmd;
|
| + cmds::GetFloatv cmd;
|
| cmd.Init(GL_ACTIVE_TEXTURE, kInvalidSharedMemoryId, 0);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| EXPECT_EQ(0u, result->size);
|
| @@ -1305,11 +1315,11 @@ TEST_F(GLES2DecoderTest1, GetFloatvInvalidArgs1_0) {
|
|
|
| TEST_F(GLES2DecoderTest1, GetFloatvInvalidArgs1_1) {
|
| EXPECT_CALL(*gl_, GetFloatv(_, _)).Times(0);
|
| - SpecializedSetup<GetFloatv, 0>(false);
|
| - GetFloatv::Result* result =
|
| - static_cast<GetFloatv::Result*>(shared_memory_address_);
|
| + SpecializedSetup<cmds::GetFloatv, 0>(false);
|
| + cmds::GetFloatv::Result* result =
|
| + static_cast<cmds::GetFloatv::Result*>(shared_memory_address_);
|
| result->size = 0;
|
| - GetFloatv cmd;
|
| + cmds::GetFloatv cmd;
|
| cmd.Init(GL_ACTIVE_TEXTURE, shared_memory_id_, kInvalidSharedMemoryOffset);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| EXPECT_EQ(0u, result->size);
|
| @@ -1320,15 +1330,15 @@ TEST_F(GLES2DecoderTest1, GetFramebufferAttachmentParameterivValidArgs) {
|
| .WillOnce(Return(GL_NO_ERROR))
|
| .WillOnce(Return(GL_NO_ERROR))
|
| .RetiresOnSaturation();
|
| - SpecializedSetup<GetFramebufferAttachmentParameteriv, 0>(true);
|
| - typedef GetFramebufferAttachmentParameteriv::Result Result;
|
| + SpecializedSetup<cmds::GetFramebufferAttachmentParameteriv, 0>(true);
|
| + typedef cmds::GetFramebufferAttachmentParameteriv::Result Result;
|
| Result* result = static_cast<Result*>(shared_memory_address_);
|
| EXPECT_CALL(
|
| *gl_, GetFramebufferAttachmentParameterivEXT(
|
| GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
|
| GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE, result->GetData()));
|
| result->size = 0;
|
| - GetFramebufferAttachmentParameteriv cmd;
|
| + cmds::GetFramebufferAttachmentParameteriv cmd;
|
| cmd.Init(
|
| GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
|
| GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE, shared_memory_id_,
|
| @@ -1343,12 +1353,12 @@ TEST_F(GLES2DecoderTest1, GetFramebufferAttachmentParameterivValidArgs) {
|
| TEST_F(GLES2DecoderTest1, GetFramebufferAttachmentParameterivInvalidArgs0_0) {
|
| EXPECT_CALL(
|
| *gl_, GetFramebufferAttachmentParameterivEXT(_, _, _, _)).Times(0);
|
| - SpecializedSetup<GetFramebufferAttachmentParameteriv, 0>(false);
|
| - GetFramebufferAttachmentParameteriv::Result* result =
|
| - static_cast<GetFramebufferAttachmentParameteriv::Result*>(
|
| + SpecializedSetup<cmds::GetFramebufferAttachmentParameteriv, 0>(false);
|
| + cmds::GetFramebufferAttachmentParameteriv::Result* result =
|
| + static_cast<cmds::GetFramebufferAttachmentParameteriv::Result*>(
|
| shared_memory_address_);
|
| result->size = 0;
|
| - GetFramebufferAttachmentParameteriv cmd;
|
| + cmds::GetFramebufferAttachmentParameteriv cmd;
|
| cmd.Init(
|
| GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
|
| GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE, shared_memory_id_,
|
| @@ -1361,12 +1371,12 @@ TEST_F(GLES2DecoderTest1, GetFramebufferAttachmentParameterivInvalidArgs0_0) {
|
| TEST_F(GLES2DecoderTest1, GetFramebufferAttachmentParameterivInvalidArgs0_1) {
|
| EXPECT_CALL(
|
| *gl_, GetFramebufferAttachmentParameterivEXT(_, _, _, _)).Times(0);
|
| - SpecializedSetup<GetFramebufferAttachmentParameteriv, 0>(false);
|
| - GetFramebufferAttachmentParameteriv::Result* result =
|
| - static_cast<GetFramebufferAttachmentParameteriv::Result*>(
|
| + SpecializedSetup<cmds::GetFramebufferAttachmentParameteriv, 0>(false);
|
| + cmds::GetFramebufferAttachmentParameteriv::Result* result =
|
| + static_cast<cmds::GetFramebufferAttachmentParameteriv::Result*>(
|
| shared_memory_address_);
|
| result->size = 0;
|
| - GetFramebufferAttachmentParameteriv cmd;
|
| + cmds::GetFramebufferAttachmentParameteriv cmd;
|
| cmd.Init(
|
| GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
|
| GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE, shared_memory_id_,
|
| @@ -1379,12 +1389,12 @@ TEST_F(GLES2DecoderTest1, GetFramebufferAttachmentParameterivInvalidArgs0_1) {
|
| TEST_F(GLES2DecoderTest1, GetFramebufferAttachmentParameterivInvalidArgs3_0) {
|
| EXPECT_CALL(
|
| *gl_, GetFramebufferAttachmentParameterivEXT(_, _, _, _)).Times(0);
|
| - SpecializedSetup<GetFramebufferAttachmentParameteriv, 0>(false);
|
| - GetFramebufferAttachmentParameteriv::Result* result =
|
| - static_cast<GetFramebufferAttachmentParameteriv::Result*>(
|
| + SpecializedSetup<cmds::GetFramebufferAttachmentParameteriv, 0>(false);
|
| + cmds::GetFramebufferAttachmentParameteriv::Result* result =
|
| + static_cast<cmds::GetFramebufferAttachmentParameteriv::Result*>(
|
| shared_memory_address_);
|
| result->size = 0;
|
| - GetFramebufferAttachmentParameteriv cmd;
|
| + cmds::GetFramebufferAttachmentParameteriv cmd;
|
| cmd.Init(
|
| GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
|
| GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE, kInvalidSharedMemoryId, 0);
|
| @@ -1395,12 +1405,12 @@ TEST_F(GLES2DecoderTest1, GetFramebufferAttachmentParameterivInvalidArgs3_0) {
|
| TEST_F(GLES2DecoderTest1, GetFramebufferAttachmentParameterivInvalidArgs3_1) {
|
| EXPECT_CALL(
|
| *gl_, GetFramebufferAttachmentParameterivEXT(_, _, _, _)).Times(0);
|
| - SpecializedSetup<GetFramebufferAttachmentParameteriv, 0>(false);
|
| - GetFramebufferAttachmentParameteriv::Result* result =
|
| - static_cast<GetFramebufferAttachmentParameteriv::Result*>(
|
| + SpecializedSetup<cmds::GetFramebufferAttachmentParameteriv, 0>(false);
|
| + cmds::GetFramebufferAttachmentParameteriv::Result* result =
|
| + static_cast<cmds::GetFramebufferAttachmentParameteriv::Result*>(
|
| shared_memory_address_);
|
| result->size = 0;
|
| - GetFramebufferAttachmentParameteriv cmd;
|
| + cmds::GetFramebufferAttachmentParameteriv cmd;
|
| cmd.Init(
|
| GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
|
| GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE, shared_memory_id_,
|
| @@ -1414,12 +1424,12 @@ TEST_F(GLES2DecoderTest1, GetIntegervValidArgs) {
|
| .WillOnce(Return(GL_NO_ERROR))
|
| .WillOnce(Return(GL_NO_ERROR))
|
| .RetiresOnSaturation();
|
| - SpecializedSetup<GetIntegerv, 0>(true);
|
| - typedef GetIntegerv::Result Result;
|
| + SpecializedSetup<cmds::GetIntegerv, 0>(true);
|
| + typedef cmds::GetIntegerv::Result Result;
|
| Result* result = static_cast<Result*>(shared_memory_address_);
|
| EXPECT_CALL(*gl_, GetIntegerv(GL_ACTIVE_TEXTURE, result->GetData()));
|
| result->size = 0;
|
| - GetIntegerv cmd;
|
| + cmds::GetIntegerv cmd;
|
| cmd.Init(GL_ACTIVE_TEXTURE, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(decoder_->GetGLES2Util()->GLGetNumValuesReturned(
|
| @@ -1430,11 +1440,11 @@ TEST_F(GLES2DecoderTest1, GetIntegervValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest1, GetIntegervInvalidArgs0_0) {
|
| EXPECT_CALL(*gl_, GetIntegerv(_, _)).Times(0);
|
| - SpecializedSetup<GetIntegerv, 0>(false);
|
| - GetIntegerv::Result* result =
|
| - static_cast<GetIntegerv::Result*>(shared_memory_address_);
|
| + SpecializedSetup<cmds::GetIntegerv, 0>(false);
|
| + cmds::GetIntegerv::Result* result =
|
| + static_cast<cmds::GetIntegerv::Result*>(shared_memory_address_);
|
| result->size = 0;
|
| - GetIntegerv cmd;
|
| + cmds::GetIntegerv cmd;
|
| cmd.Init(GL_FOG_HINT, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(0u, result->size);
|
| @@ -1443,11 +1453,11 @@ TEST_F(GLES2DecoderTest1, GetIntegervInvalidArgs0_0) {
|
|
|
| TEST_F(GLES2DecoderTest1, GetIntegervInvalidArgs1_0) {
|
| EXPECT_CALL(*gl_, GetIntegerv(_, _)).Times(0);
|
| - SpecializedSetup<GetIntegerv, 0>(false);
|
| - GetIntegerv::Result* result =
|
| - static_cast<GetIntegerv::Result*>(shared_memory_address_);
|
| + SpecializedSetup<cmds::GetIntegerv, 0>(false);
|
| + cmds::GetIntegerv::Result* result =
|
| + static_cast<cmds::GetIntegerv::Result*>(shared_memory_address_);
|
| result->size = 0;
|
| - GetIntegerv cmd;
|
| + cmds::GetIntegerv cmd;
|
| cmd.Init(GL_ACTIVE_TEXTURE, kInvalidSharedMemoryId, 0);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| EXPECT_EQ(0u, result->size);
|
| @@ -1455,22 +1465,22 @@ TEST_F(GLES2DecoderTest1, GetIntegervInvalidArgs1_0) {
|
|
|
| TEST_F(GLES2DecoderTest1, GetIntegervInvalidArgs1_1) {
|
| EXPECT_CALL(*gl_, GetIntegerv(_, _)).Times(0);
|
| - SpecializedSetup<GetIntegerv, 0>(false);
|
| - GetIntegerv::Result* result =
|
| - static_cast<GetIntegerv::Result*>(shared_memory_address_);
|
| + SpecializedSetup<cmds::GetIntegerv, 0>(false);
|
| + cmds::GetIntegerv::Result* result =
|
| + static_cast<cmds::GetIntegerv::Result*>(shared_memory_address_);
|
| result->size = 0;
|
| - GetIntegerv cmd;
|
| + cmds::GetIntegerv cmd;
|
| cmd.Init(GL_ACTIVE_TEXTURE, shared_memory_id_, kInvalidSharedMemoryOffset);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| EXPECT_EQ(0u, result->size);
|
| }
|
|
|
| TEST_F(GLES2DecoderTest1, GetProgramivValidArgs) {
|
| - SpecializedSetup<GetProgramiv, 0>(true);
|
| - typedef GetProgramiv::Result Result;
|
| + SpecializedSetup<cmds::GetProgramiv, 0>(true);
|
| + typedef cmds::GetProgramiv::Result Result;
|
| Result* result = static_cast<Result*>(shared_memory_address_);
|
| result->size = 0;
|
| - GetProgramiv cmd;
|
| + cmds::GetProgramiv cmd;
|
| cmd.Init(
|
| client_program_id_, GL_DELETE_STATUS, shared_memory_id_,
|
| shared_memory_offset_);
|
| @@ -1483,11 +1493,11 @@ TEST_F(GLES2DecoderTest1, GetProgramivValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest1, GetProgramivInvalidArgs2_0) {
|
| EXPECT_CALL(*gl_, GetProgramiv(_, _, _)).Times(0);
|
| - SpecializedSetup<GetProgramiv, 0>(false);
|
| - GetProgramiv::Result* result =
|
| - static_cast<GetProgramiv::Result*>(shared_memory_address_);
|
| + SpecializedSetup<cmds::GetProgramiv, 0>(false);
|
| + cmds::GetProgramiv::Result* result =
|
| + static_cast<cmds::GetProgramiv::Result*>(shared_memory_address_);
|
| result->size = 0;
|
| - GetProgramiv cmd;
|
| + cmds::GetProgramiv cmd;
|
| cmd.Init(client_program_id_, GL_DELETE_STATUS, kInvalidSharedMemoryId, 0);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| EXPECT_EQ(0u, result->size);
|
| @@ -1495,11 +1505,11 @@ TEST_F(GLES2DecoderTest1, GetProgramivInvalidArgs2_0) {
|
|
|
| TEST_F(GLES2DecoderTest1, GetProgramivInvalidArgs2_1) {
|
| EXPECT_CALL(*gl_, GetProgramiv(_, _, _)).Times(0);
|
| - SpecializedSetup<GetProgramiv, 0>(false);
|
| - GetProgramiv::Result* result =
|
| - static_cast<GetProgramiv::Result*>(shared_memory_address_);
|
| + SpecializedSetup<cmds::GetProgramiv, 0>(false);
|
| + cmds::GetProgramiv::Result* result =
|
| + static_cast<cmds::GetProgramiv::Result*>(shared_memory_address_);
|
| result->size = 0;
|
| - GetProgramiv cmd;
|
| + cmds::GetProgramiv cmd;
|
| cmd.Init(
|
| client_program_id_, GL_DELETE_STATUS, shared_memory_id_,
|
| kInvalidSharedMemoryOffset);
|
| @@ -1510,9 +1520,9 @@ TEST_F(GLES2DecoderTest1, GetProgramivInvalidArgs2_1) {
|
| TEST_F(GLES2DecoderTest1, GetProgramInfoLogValidArgs) {
|
| const char* kInfo = "hello";
|
| const uint32 kBucketId = 123;
|
| - SpecializedSetup<GetProgramInfoLog, 0>(true);
|
| + SpecializedSetup<cmds::GetProgramInfoLog, 0>(true);
|
|
|
| - GetProgramInfoLog cmd;
|
| + cmds::GetProgramInfoLog cmd;
|
| cmd.Init(client_program_id_, kBucketId);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| CommonDecoder::Bucket* bucket = decoder_->GetBucket(kBucketId);
|
| @@ -1525,7 +1535,7 @@ TEST_F(GLES2DecoderTest1, GetProgramInfoLogValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest1, GetProgramInfoLogInvalidArgs) {
|
| const uint32 kBucketId = 123;
|
| - GetProgramInfoLog cmd;
|
| + cmds::GetProgramInfoLog cmd;
|
| cmd.Init(kInvalidClientId, kBucketId);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_INVALID_VALUE, GetGLError());
|
| @@ -1536,14 +1546,14 @@ TEST_F(GLES2DecoderTest1, GetRenderbufferParameterivValidArgs) {
|
| .WillOnce(Return(GL_NO_ERROR))
|
| .WillOnce(Return(GL_NO_ERROR))
|
| .RetiresOnSaturation();
|
| - SpecializedSetup<GetRenderbufferParameteriv, 0>(true);
|
| - typedef GetRenderbufferParameteriv::Result Result;
|
| + SpecializedSetup<cmds::GetRenderbufferParameteriv, 0>(true);
|
| + typedef cmds::GetRenderbufferParameteriv::Result Result;
|
| Result* result = static_cast<Result*>(shared_memory_address_);
|
| EXPECT_CALL(
|
| *gl_, GetRenderbufferParameterivEXT(
|
| GL_RENDERBUFFER, GL_RENDERBUFFER_RED_SIZE, result->GetData()));
|
| result->size = 0;
|
| - GetRenderbufferParameteriv cmd;
|
| + cmds::GetRenderbufferParameteriv cmd;
|
| cmd.Init(
|
| GL_RENDERBUFFER, GL_RENDERBUFFER_RED_SIZE, shared_memory_id_,
|
| shared_memory_offset_);
|
| @@ -1556,11 +1566,12 @@ TEST_F(GLES2DecoderTest1, GetRenderbufferParameterivValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest1, GetRenderbufferParameterivInvalidArgs0_0) {
|
| EXPECT_CALL(*gl_, GetRenderbufferParameterivEXT(_, _, _)).Times(0);
|
| - SpecializedSetup<GetRenderbufferParameteriv, 0>(false);
|
| - GetRenderbufferParameteriv::Result* result =
|
| - static_cast<GetRenderbufferParameteriv::Result*>(shared_memory_address_);
|
| + SpecializedSetup<cmds::GetRenderbufferParameteriv, 0>(false);
|
| + cmds::GetRenderbufferParameteriv::Result* result =
|
| + static_cast<cmds::GetRenderbufferParameteriv::Result*>(
|
| + shared_memory_address_);
|
| result->size = 0;
|
| - GetRenderbufferParameteriv cmd;
|
| + cmds::GetRenderbufferParameteriv cmd;
|
| cmd.Init(
|
| GL_FRAMEBUFFER, GL_RENDERBUFFER_RED_SIZE, shared_memory_id_,
|
| shared_memory_offset_);
|
| @@ -1571,11 +1582,12 @@ TEST_F(GLES2DecoderTest1, GetRenderbufferParameterivInvalidArgs0_0) {
|
|
|
| TEST_F(GLES2DecoderTest1, GetRenderbufferParameterivInvalidArgs2_0) {
|
| EXPECT_CALL(*gl_, GetRenderbufferParameterivEXT(_, _, _)).Times(0);
|
| - SpecializedSetup<GetRenderbufferParameteriv, 0>(false);
|
| - GetRenderbufferParameteriv::Result* result =
|
| - static_cast<GetRenderbufferParameteriv::Result*>(shared_memory_address_);
|
| + SpecializedSetup<cmds::GetRenderbufferParameteriv, 0>(false);
|
| + cmds::GetRenderbufferParameteriv::Result* result =
|
| + static_cast<cmds::GetRenderbufferParameteriv::Result*>(
|
| + shared_memory_address_);
|
| result->size = 0;
|
| - GetRenderbufferParameteriv cmd;
|
| + cmds::GetRenderbufferParameteriv cmd;
|
| cmd.Init(
|
| GL_RENDERBUFFER, GL_RENDERBUFFER_RED_SIZE, kInvalidSharedMemoryId, 0);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| @@ -1584,11 +1596,12 @@ TEST_F(GLES2DecoderTest1, GetRenderbufferParameterivInvalidArgs2_0) {
|
|
|
| TEST_F(GLES2DecoderTest1, GetRenderbufferParameterivInvalidArgs2_1) {
|
| EXPECT_CALL(*gl_, GetRenderbufferParameterivEXT(_, _, _)).Times(0);
|
| - SpecializedSetup<GetRenderbufferParameteriv, 0>(false);
|
| - GetRenderbufferParameteriv::Result* result =
|
| - static_cast<GetRenderbufferParameteriv::Result*>(shared_memory_address_);
|
| + SpecializedSetup<cmds::GetRenderbufferParameteriv, 0>(false);
|
| + cmds::GetRenderbufferParameteriv::Result* result =
|
| + static_cast<cmds::GetRenderbufferParameteriv::Result*>(
|
| + shared_memory_address_);
|
| result->size = 0;
|
| - GetRenderbufferParameteriv cmd;
|
| + cmds::GetRenderbufferParameteriv cmd;
|
| cmd.Init(
|
| GL_RENDERBUFFER, GL_RENDERBUFFER_RED_SIZE, shared_memory_id_,
|
| kInvalidSharedMemoryOffset);
|
| @@ -1601,13 +1614,13 @@ TEST_F(GLES2DecoderTest1, GetShaderivValidArgs) {
|
| .WillOnce(Return(GL_NO_ERROR))
|
| .WillOnce(Return(GL_NO_ERROR))
|
| .RetiresOnSaturation();
|
| - SpecializedSetup<GetShaderiv, 0>(true);
|
| - typedef GetShaderiv::Result Result;
|
| + SpecializedSetup<cmds::GetShaderiv, 0>(true);
|
| + typedef cmds::GetShaderiv::Result Result;
|
| Result* result = static_cast<Result*>(shared_memory_address_);
|
| EXPECT_CALL(
|
| *gl_, GetShaderiv(kServiceShaderId, GL_SHADER_TYPE, result->GetData()));
|
| result->size = 0;
|
| - GetShaderiv cmd;
|
| + cmds::GetShaderiv cmd;
|
| cmd.Init(
|
| client_shader_id_, GL_SHADER_TYPE, shared_memory_id_,
|
| shared_memory_offset_);
|
| @@ -1620,11 +1633,11 @@ TEST_F(GLES2DecoderTest1, GetShaderivValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest1, GetShaderivInvalidArgs2_0) {
|
| EXPECT_CALL(*gl_, GetShaderiv(_, _, _)).Times(0);
|
| - SpecializedSetup<GetShaderiv, 0>(false);
|
| - GetShaderiv::Result* result =
|
| - static_cast<GetShaderiv::Result*>(shared_memory_address_);
|
| + SpecializedSetup<cmds::GetShaderiv, 0>(false);
|
| + cmds::GetShaderiv::Result* result =
|
| + static_cast<cmds::GetShaderiv::Result*>(shared_memory_address_);
|
| result->size = 0;
|
| - GetShaderiv cmd;
|
| + cmds::GetShaderiv cmd;
|
| cmd.Init(client_shader_id_, GL_SHADER_TYPE, kInvalidSharedMemoryId, 0);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| EXPECT_EQ(0u, result->size);
|
| @@ -1632,11 +1645,11 @@ TEST_F(GLES2DecoderTest1, GetShaderivInvalidArgs2_0) {
|
|
|
| TEST_F(GLES2DecoderTest1, GetShaderivInvalidArgs2_1) {
|
| EXPECT_CALL(*gl_, GetShaderiv(_, _, _)).Times(0);
|
| - SpecializedSetup<GetShaderiv, 0>(false);
|
| - GetShaderiv::Result* result =
|
| - static_cast<GetShaderiv::Result*>(shared_memory_address_);
|
| + SpecializedSetup<cmds::GetShaderiv, 0>(false);
|
| + cmds::GetShaderiv::Result* result =
|
| + static_cast<cmds::GetShaderiv::Result*>(shared_memory_address_);
|
| result->size = 0;
|
| - GetShaderiv cmd;
|
| + cmds::GetShaderiv cmd;
|
| cmd.Init(
|
| client_shader_id_, GL_SHADER_TYPE, shared_memory_id_,
|
| kInvalidSharedMemoryOffset);
|
| @@ -1655,14 +1668,14 @@ TEST_F(GLES2DecoderTest1, GetTexParameterfvValidArgs) {
|
| .WillOnce(Return(GL_NO_ERROR))
|
| .WillOnce(Return(GL_NO_ERROR))
|
| .RetiresOnSaturation();
|
| - SpecializedSetup<GetTexParameterfv, 0>(true);
|
| - typedef GetTexParameterfv::Result Result;
|
| + SpecializedSetup<cmds::GetTexParameterfv, 0>(true);
|
| + typedef cmds::GetTexParameterfv::Result Result;
|
| Result* result = static_cast<Result*>(shared_memory_address_);
|
| EXPECT_CALL(
|
| *gl_, GetTexParameterfv(
|
| GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, result->GetData()));
|
| result->size = 0;
|
| - GetTexParameterfv cmd;
|
| + cmds::GetTexParameterfv cmd;
|
| cmd.Init(
|
| GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, shared_memory_id_,
|
| shared_memory_offset_);
|
| @@ -1675,11 +1688,11 @@ TEST_F(GLES2DecoderTest1, GetTexParameterfvValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest1, GetTexParameterfvInvalidArgs0_0) {
|
| EXPECT_CALL(*gl_, GetTexParameterfv(_, _, _)).Times(0);
|
| - SpecializedSetup<GetTexParameterfv, 0>(false);
|
| - GetTexParameterfv::Result* result =
|
| - static_cast<GetTexParameterfv::Result*>(shared_memory_address_);
|
| + SpecializedSetup<cmds::GetTexParameterfv, 0>(false);
|
| + cmds::GetTexParameterfv::Result* result =
|
| + static_cast<cmds::GetTexParameterfv::Result*>(shared_memory_address_);
|
| result->size = 0;
|
| - GetTexParameterfv cmd;
|
| + cmds::GetTexParameterfv cmd;
|
| cmd.Init(
|
| GL_PROXY_TEXTURE_CUBE_MAP, GL_TEXTURE_MAG_FILTER, shared_memory_id_,
|
| shared_memory_offset_);
|
| @@ -1690,11 +1703,11 @@ TEST_F(GLES2DecoderTest1, GetTexParameterfvInvalidArgs0_0) {
|
|
|
| TEST_F(GLES2DecoderTest1, GetTexParameterfvInvalidArgs1_0) {
|
| EXPECT_CALL(*gl_, GetTexParameterfv(_, _, _)).Times(0);
|
| - SpecializedSetup<GetTexParameterfv, 0>(false);
|
| - GetTexParameterfv::Result* result =
|
| - static_cast<GetTexParameterfv::Result*>(shared_memory_address_);
|
| + SpecializedSetup<cmds::GetTexParameterfv, 0>(false);
|
| + cmds::GetTexParameterfv::Result* result =
|
| + static_cast<cmds::GetTexParameterfv::Result*>(shared_memory_address_);
|
| result->size = 0;
|
| - GetTexParameterfv cmd;
|
| + cmds::GetTexParameterfv cmd;
|
| cmd.Init(
|
| GL_TEXTURE_2D, GL_GENERATE_MIPMAP, shared_memory_id_,
|
| shared_memory_offset_);
|
| @@ -1705,11 +1718,11 @@ TEST_F(GLES2DecoderTest1, GetTexParameterfvInvalidArgs1_0) {
|
|
|
| TEST_F(GLES2DecoderTest1, GetTexParameterfvInvalidArgs2_0) {
|
| EXPECT_CALL(*gl_, GetTexParameterfv(_, _, _)).Times(0);
|
| - SpecializedSetup<GetTexParameterfv, 0>(false);
|
| - GetTexParameterfv::Result* result =
|
| - static_cast<GetTexParameterfv::Result*>(shared_memory_address_);
|
| + SpecializedSetup<cmds::GetTexParameterfv, 0>(false);
|
| + cmds::GetTexParameterfv::Result* result =
|
| + static_cast<cmds::GetTexParameterfv::Result*>(shared_memory_address_);
|
| result->size = 0;
|
| - GetTexParameterfv cmd;
|
| + cmds::GetTexParameterfv cmd;
|
| cmd.Init(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, kInvalidSharedMemoryId, 0);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| EXPECT_EQ(0u, result->size);
|
| @@ -1717,11 +1730,11 @@ TEST_F(GLES2DecoderTest1, GetTexParameterfvInvalidArgs2_0) {
|
|
|
| TEST_F(GLES2DecoderTest1, GetTexParameterfvInvalidArgs2_1) {
|
| EXPECT_CALL(*gl_, GetTexParameterfv(_, _, _)).Times(0);
|
| - SpecializedSetup<GetTexParameterfv, 0>(false);
|
| - GetTexParameterfv::Result* result =
|
| - static_cast<GetTexParameterfv::Result*>(shared_memory_address_);
|
| + SpecializedSetup<cmds::GetTexParameterfv, 0>(false);
|
| + cmds::GetTexParameterfv::Result* result =
|
| + static_cast<cmds::GetTexParameterfv::Result*>(shared_memory_address_);
|
| result->size = 0;
|
| - GetTexParameterfv cmd;
|
| + cmds::GetTexParameterfv cmd;
|
| cmd.Init(
|
| GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, shared_memory_id_,
|
| kInvalidSharedMemoryOffset);
|
| @@ -1734,14 +1747,14 @@ TEST_F(GLES2DecoderTest1, GetTexParameterivValidArgs) {
|
| .WillOnce(Return(GL_NO_ERROR))
|
| .WillOnce(Return(GL_NO_ERROR))
|
| .RetiresOnSaturation();
|
| - SpecializedSetup<GetTexParameteriv, 0>(true);
|
| - typedef GetTexParameteriv::Result Result;
|
| + SpecializedSetup<cmds::GetTexParameteriv, 0>(true);
|
| + typedef cmds::GetTexParameteriv::Result Result;
|
| Result* result = static_cast<Result*>(shared_memory_address_);
|
| EXPECT_CALL(
|
| *gl_, GetTexParameteriv(
|
| GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, result->GetData()));
|
| result->size = 0;
|
| - GetTexParameteriv cmd;
|
| + cmds::GetTexParameteriv cmd;
|
| cmd.Init(
|
| GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, shared_memory_id_,
|
| shared_memory_offset_);
|
| @@ -1754,11 +1767,11 @@ TEST_F(GLES2DecoderTest1, GetTexParameterivValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest1, GetTexParameterivInvalidArgs0_0) {
|
| EXPECT_CALL(*gl_, GetTexParameteriv(_, _, _)).Times(0);
|
| - SpecializedSetup<GetTexParameteriv, 0>(false);
|
| - GetTexParameteriv::Result* result =
|
| - static_cast<GetTexParameteriv::Result*>(shared_memory_address_);
|
| + SpecializedSetup<cmds::GetTexParameteriv, 0>(false);
|
| + cmds::GetTexParameteriv::Result* result =
|
| + static_cast<cmds::GetTexParameteriv::Result*>(shared_memory_address_);
|
| result->size = 0;
|
| - GetTexParameteriv cmd;
|
| + cmds::GetTexParameteriv cmd;
|
| cmd.Init(
|
| GL_PROXY_TEXTURE_CUBE_MAP, GL_TEXTURE_MAG_FILTER, shared_memory_id_,
|
| shared_memory_offset_);
|
| @@ -1769,11 +1782,11 @@ TEST_F(GLES2DecoderTest1, GetTexParameterivInvalidArgs0_0) {
|
|
|
| TEST_F(GLES2DecoderTest1, GetTexParameterivInvalidArgs1_0) {
|
| EXPECT_CALL(*gl_, GetTexParameteriv(_, _, _)).Times(0);
|
| - SpecializedSetup<GetTexParameteriv, 0>(false);
|
| - GetTexParameteriv::Result* result =
|
| - static_cast<GetTexParameteriv::Result*>(shared_memory_address_);
|
| + SpecializedSetup<cmds::GetTexParameteriv, 0>(false);
|
| + cmds::GetTexParameteriv::Result* result =
|
| + static_cast<cmds::GetTexParameteriv::Result*>(shared_memory_address_);
|
| result->size = 0;
|
| - GetTexParameteriv cmd;
|
| + cmds::GetTexParameteriv cmd;
|
| cmd.Init(
|
| GL_TEXTURE_2D, GL_GENERATE_MIPMAP, shared_memory_id_,
|
| shared_memory_offset_);
|
| @@ -1784,11 +1797,11 @@ TEST_F(GLES2DecoderTest1, GetTexParameterivInvalidArgs1_0) {
|
|
|
| TEST_F(GLES2DecoderTest1, GetTexParameterivInvalidArgs2_0) {
|
| EXPECT_CALL(*gl_, GetTexParameteriv(_, _, _)).Times(0);
|
| - SpecializedSetup<GetTexParameteriv, 0>(false);
|
| - GetTexParameteriv::Result* result =
|
| - static_cast<GetTexParameteriv::Result*>(shared_memory_address_);
|
| + SpecializedSetup<cmds::GetTexParameteriv, 0>(false);
|
| + cmds::GetTexParameteriv::Result* result =
|
| + static_cast<cmds::GetTexParameteriv::Result*>(shared_memory_address_);
|
| result->size = 0;
|
| - GetTexParameteriv cmd;
|
| + cmds::GetTexParameteriv cmd;
|
| cmd.Init(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, kInvalidSharedMemoryId, 0);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| EXPECT_EQ(0u, result->size);
|
| @@ -1796,11 +1809,11 @@ TEST_F(GLES2DecoderTest1, GetTexParameterivInvalidArgs2_0) {
|
|
|
| TEST_F(GLES2DecoderTest1, GetTexParameterivInvalidArgs2_1) {
|
| EXPECT_CALL(*gl_, GetTexParameteriv(_, _, _)).Times(0);
|
| - SpecializedSetup<GetTexParameteriv, 0>(false);
|
| - GetTexParameteriv::Result* result =
|
| - static_cast<GetTexParameteriv::Result*>(shared_memory_address_);
|
| + SpecializedSetup<cmds::GetTexParameteriv, 0>(false);
|
| + cmds::GetTexParameteriv::Result* result =
|
| + static_cast<cmds::GetTexParameteriv::Result*>(shared_memory_address_);
|
| result->size = 0;
|
| - GetTexParameteriv cmd;
|
| + cmds::GetTexParameteriv cmd;
|
| cmd.Init(
|
| GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, shared_memory_id_,
|
| kInvalidSharedMemoryOffset);
|
| @@ -1819,11 +1832,11 @@ TEST_F(GLES2DecoderTest1, GetTexParameterivInvalidArgs2_1) {
|
|
|
|
|
| TEST_F(GLES2DecoderTest1, GetVertexAttribfvValidArgs) {
|
| - SpecializedSetup<GetVertexAttribfv, 0>(true);
|
| - typedef GetVertexAttribfv::Result Result;
|
| + SpecializedSetup<cmds::GetVertexAttribfv, 0>(true);
|
| + typedef cmds::GetVertexAttribfv::Result Result;
|
| Result* result = static_cast<Result*>(shared_memory_address_);
|
| result->size = 0;
|
| - GetVertexAttribfv cmd;
|
| + cmds::GetVertexAttribfv cmd;
|
| cmd.Init(
|
| 1, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, shared_memory_id_,
|
| shared_memory_offset_);
|
| @@ -1836,11 +1849,11 @@ TEST_F(GLES2DecoderTest1, GetVertexAttribfvValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest1, GetVertexAttribfvInvalidArgs2_0) {
|
| EXPECT_CALL(*gl_, GetVertexAttribfv(_, _, _)).Times(0);
|
| - SpecializedSetup<GetVertexAttribfv, 0>(false);
|
| - GetVertexAttribfv::Result* result =
|
| - static_cast<GetVertexAttribfv::Result*>(shared_memory_address_);
|
| + SpecializedSetup<cmds::GetVertexAttribfv, 0>(false);
|
| + cmds::GetVertexAttribfv::Result* result =
|
| + static_cast<cmds::GetVertexAttribfv::Result*>(shared_memory_address_);
|
| result->size = 0;
|
| - GetVertexAttribfv cmd;
|
| + cmds::GetVertexAttribfv cmd;
|
| cmd.Init(1, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, kInvalidSharedMemoryId, 0);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| EXPECT_EQ(0u, result->size);
|
| @@ -1848,11 +1861,11 @@ TEST_F(GLES2DecoderTest1, GetVertexAttribfvInvalidArgs2_0) {
|
|
|
| TEST_F(GLES2DecoderTest1, GetVertexAttribfvInvalidArgs2_1) {
|
| EXPECT_CALL(*gl_, GetVertexAttribfv(_, _, _)).Times(0);
|
| - SpecializedSetup<GetVertexAttribfv, 0>(false);
|
| - GetVertexAttribfv::Result* result =
|
| - static_cast<GetVertexAttribfv::Result*>(shared_memory_address_);
|
| + SpecializedSetup<cmds::GetVertexAttribfv, 0>(false);
|
| + cmds::GetVertexAttribfv::Result* result =
|
| + static_cast<cmds::GetVertexAttribfv::Result*>(shared_memory_address_);
|
| result->size = 0;
|
| - GetVertexAttribfv cmd;
|
| + cmds::GetVertexAttribfv cmd;
|
| cmd.Init(
|
| 1, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, shared_memory_id_,
|
| kInvalidSharedMemoryOffset);
|
|
|