| Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h
|
| diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h
|
| index d83c55aedd99e48d785f23dd566d9772a6e88cea..14a73e890621860eb473b57d27e6c8794baebaff 100644
|
| --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h
|
| +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h
|
| @@ -12,11 +12,11 @@
|
|
|
|
|
| TEST_F(GLES2DecoderTest2, GetVertexAttribivValidArgs) {
|
| - SpecializedSetup<GetVertexAttribiv, 0>(true);
|
| - typedef GetVertexAttribiv::Result Result;
|
| + SpecializedSetup<cmds::GetVertexAttribiv, 0>(true);
|
| + typedef cmds::GetVertexAttribiv::Result Result;
|
| Result* result = static_cast<Result*>(shared_memory_address_);
|
| result->size = 0;
|
| - GetVertexAttribiv cmd;
|
| + cmds::GetVertexAttribiv cmd;
|
| cmd.Init(
|
| 1, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, shared_memory_id_,
|
| shared_memory_offset_);
|
| @@ -29,11 +29,11 @@ TEST_F(GLES2DecoderTest2, GetVertexAttribivValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest2, GetVertexAttribivInvalidArgs2_0) {
|
| EXPECT_CALL(*gl_, GetVertexAttribiv(_, _, _)).Times(0);
|
| - SpecializedSetup<GetVertexAttribiv, 0>(false);
|
| - GetVertexAttribiv::Result* result =
|
| - static_cast<GetVertexAttribiv::Result*>(shared_memory_address_);
|
| + SpecializedSetup<cmds::GetVertexAttribiv, 0>(false);
|
| + cmds::GetVertexAttribiv::Result* result =
|
| + static_cast<cmds::GetVertexAttribiv::Result*>(shared_memory_address_);
|
| result->size = 0;
|
| - GetVertexAttribiv cmd;
|
| + cmds::GetVertexAttribiv cmd;
|
| cmd.Init(1, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, kInvalidSharedMemoryId, 0);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| EXPECT_EQ(0u, result->size);
|
| @@ -41,11 +41,11 @@ TEST_F(GLES2DecoderTest2, GetVertexAttribivInvalidArgs2_0) {
|
|
|
| TEST_F(GLES2DecoderTest2, GetVertexAttribivInvalidArgs2_1) {
|
| EXPECT_CALL(*gl_, GetVertexAttribiv(_, _, _)).Times(0);
|
| - SpecializedSetup<GetVertexAttribiv, 0>(false);
|
| - GetVertexAttribiv::Result* result =
|
| - static_cast<GetVertexAttribiv::Result*>(shared_memory_address_);
|
| + SpecializedSetup<cmds::GetVertexAttribiv, 0>(false);
|
| + cmds::GetVertexAttribiv::Result* result =
|
| + static_cast<cmds::GetVertexAttribiv::Result*>(shared_memory_address_);
|
| result->size = 0;
|
| - GetVertexAttribiv cmd;
|
| + cmds::GetVertexAttribiv cmd;
|
| cmd.Init(
|
| 1, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, shared_memory_id_,
|
| kInvalidSharedMemoryOffset);
|
| @@ -57,8 +57,8 @@ TEST_F(GLES2DecoderTest2, GetVertexAttribivInvalidArgs2_1) {
|
|
|
| TEST_F(GLES2DecoderTest2, HintValidArgs) {
|
| EXPECT_CALL(*gl_, Hint(GL_GENERATE_MIPMAP_HINT, GL_FASTEST));
|
| - SpecializedSetup<Hint, 0>(true);
|
| - Hint cmd;
|
| + SpecializedSetup<cmds::Hint, 0>(true);
|
| + cmds::Hint cmd;
|
| cmd.Init(GL_GENERATE_MIPMAP_HINT, GL_FASTEST);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -66,24 +66,24 @@ TEST_F(GLES2DecoderTest2, HintValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest2, HintInvalidArgs0_0) {
|
| EXPECT_CALL(*gl_, Hint(_, _)).Times(0);
|
| - SpecializedSetup<Hint, 0>(false);
|
| - Hint cmd;
|
| + SpecializedSetup<cmds::Hint, 0>(false);
|
| + cmds::Hint cmd;
|
| cmd.Init(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, IsBufferValidArgs) {
|
| - SpecializedSetup<IsBuffer, 0>(true);
|
| - IsBuffer cmd;
|
| + SpecializedSetup<cmds::IsBuffer, 0>(true);
|
| + cmds::IsBuffer cmd;
|
| cmd.Init(client_buffer_id_, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, IsBufferInvalidArgsBadSharedMemoryId) {
|
| - SpecializedSetup<IsBuffer, 0>(false);
|
| - IsBuffer cmd;
|
| + SpecializedSetup<cmds::IsBuffer, 0>(false);
|
| + cmds::IsBuffer cmd;
|
| cmd.Init(client_buffer_id_, kInvalidSharedMemoryId, shared_memory_offset_);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| cmd.Init(client_buffer_id_, shared_memory_id_, kInvalidSharedMemoryOffset);
|
| @@ -91,8 +91,8 @@ TEST_F(GLES2DecoderTest2, IsBufferInvalidArgsBadSharedMemoryId) {
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, IsEnabledValidArgs) {
|
| - SpecializedSetup<IsEnabled, 0>(true);
|
| - IsEnabled cmd;
|
| + SpecializedSetup<cmds::IsEnabled, 0>(true);
|
| + cmds::IsEnabled cmd;
|
| cmd.Init(GL_BLEND, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -100,8 +100,8 @@ TEST_F(GLES2DecoderTest2, IsEnabledValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest2, IsEnabledInvalidArgs0_0) {
|
| EXPECT_CALL(*gl_, IsEnabled(_)).Times(0);
|
| - SpecializedSetup<IsEnabled, 0>(false);
|
| - IsEnabled cmd;
|
| + SpecializedSetup<cmds::IsEnabled, 0>(false);
|
| + cmds::IsEnabled cmd;
|
| cmd.Init(GL_CLIP_PLANE0, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
|
| @@ -109,16 +109,16 @@ TEST_F(GLES2DecoderTest2, IsEnabledInvalidArgs0_0) {
|
|
|
| TEST_F(GLES2DecoderTest2, IsEnabledInvalidArgs0_1) {
|
| EXPECT_CALL(*gl_, IsEnabled(_)).Times(0);
|
| - SpecializedSetup<IsEnabled, 0>(false);
|
| - IsEnabled cmd;
|
| + SpecializedSetup<cmds::IsEnabled, 0>(false);
|
| + cmds::IsEnabled cmd;
|
| cmd.Init(GL_POINT_SPRITE, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, IsEnabledInvalidArgsBadSharedMemoryId) {
|
| - SpecializedSetup<IsEnabled, 0>(false);
|
| - IsEnabled cmd;
|
| + SpecializedSetup<cmds::IsEnabled, 0>(false);
|
| + cmds::IsEnabled cmd;
|
| cmd.Init(GL_BLEND, kInvalidSharedMemoryId, shared_memory_offset_);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| cmd.Init(GL_BLEND, shared_memory_id_, kInvalidSharedMemoryOffset);
|
| @@ -126,16 +126,16 @@ TEST_F(GLES2DecoderTest2, IsEnabledInvalidArgsBadSharedMemoryId) {
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, IsFramebufferValidArgs) {
|
| - SpecializedSetup<IsFramebuffer, 0>(true);
|
| - IsFramebuffer cmd;
|
| + SpecializedSetup<cmds::IsFramebuffer, 0>(true);
|
| + cmds::IsFramebuffer cmd;
|
| cmd.Init(client_framebuffer_id_, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, IsFramebufferInvalidArgsBadSharedMemoryId) {
|
| - SpecializedSetup<IsFramebuffer, 0>(false);
|
| - IsFramebuffer cmd;
|
| + SpecializedSetup<cmds::IsFramebuffer, 0>(false);
|
| + cmds::IsFramebuffer cmd;
|
| cmd.Init(
|
| client_framebuffer_id_, kInvalidSharedMemoryId, shared_memory_offset_);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| @@ -145,16 +145,16 @@ TEST_F(GLES2DecoderTest2, IsFramebufferInvalidArgsBadSharedMemoryId) {
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, IsProgramValidArgs) {
|
| - SpecializedSetup<IsProgram, 0>(true);
|
| - IsProgram cmd;
|
| + SpecializedSetup<cmds::IsProgram, 0>(true);
|
| + cmds::IsProgram cmd;
|
| cmd.Init(client_program_id_, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, IsProgramInvalidArgsBadSharedMemoryId) {
|
| - SpecializedSetup<IsProgram, 0>(false);
|
| - IsProgram cmd;
|
| + SpecializedSetup<cmds::IsProgram, 0>(false);
|
| + cmds::IsProgram cmd;
|
| cmd.Init(client_program_id_, kInvalidSharedMemoryId, shared_memory_offset_);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| cmd.Init(client_program_id_, shared_memory_id_, kInvalidSharedMemoryOffset);
|
| @@ -162,16 +162,16 @@ TEST_F(GLES2DecoderTest2, IsProgramInvalidArgsBadSharedMemoryId) {
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, IsRenderbufferValidArgs) {
|
| - SpecializedSetup<IsRenderbuffer, 0>(true);
|
| - IsRenderbuffer cmd;
|
| + SpecializedSetup<cmds::IsRenderbuffer, 0>(true);
|
| + cmds::IsRenderbuffer cmd;
|
| cmd.Init(client_renderbuffer_id_, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, IsRenderbufferInvalidArgsBadSharedMemoryId) {
|
| - SpecializedSetup<IsRenderbuffer, 0>(false);
|
| - IsRenderbuffer cmd;
|
| + SpecializedSetup<cmds::IsRenderbuffer, 0>(false);
|
| + cmds::IsRenderbuffer cmd;
|
| cmd.Init(
|
| client_renderbuffer_id_, kInvalidSharedMemoryId, shared_memory_offset_);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| @@ -181,16 +181,16 @@ TEST_F(GLES2DecoderTest2, IsRenderbufferInvalidArgsBadSharedMemoryId) {
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, IsShaderValidArgs) {
|
| - SpecializedSetup<IsShader, 0>(true);
|
| - IsShader cmd;
|
| + SpecializedSetup<cmds::IsShader, 0>(true);
|
| + cmds::IsShader cmd;
|
| cmd.Init(client_shader_id_, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, IsShaderInvalidArgsBadSharedMemoryId) {
|
| - SpecializedSetup<IsShader, 0>(false);
|
| - IsShader cmd;
|
| + SpecializedSetup<cmds::IsShader, 0>(false);
|
| + cmds::IsShader cmd;
|
| cmd.Init(client_shader_id_, kInvalidSharedMemoryId, shared_memory_offset_);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| cmd.Init(client_shader_id_, shared_memory_id_, kInvalidSharedMemoryOffset);
|
| @@ -198,16 +198,16 @@ TEST_F(GLES2DecoderTest2, IsShaderInvalidArgsBadSharedMemoryId) {
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, IsTextureValidArgs) {
|
| - SpecializedSetup<IsTexture, 0>(true);
|
| - IsTexture cmd;
|
| + SpecializedSetup<cmds::IsTexture, 0>(true);
|
| + cmds::IsTexture cmd;
|
| cmd.Init(client_texture_id_, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, IsTextureInvalidArgsBadSharedMemoryId) {
|
| - SpecializedSetup<IsTexture, 0>(false);
|
| - IsTexture cmd;
|
| + SpecializedSetup<cmds::IsTexture, 0>(false);
|
| + cmds::IsTexture cmd;
|
| cmd.Init(client_texture_id_, kInvalidSharedMemoryId, shared_memory_offset_);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| cmd.Init(client_texture_id_, shared_memory_id_, kInvalidSharedMemoryOffset);
|
| @@ -216,16 +216,16 @@ TEST_F(GLES2DecoderTest2, IsTextureInvalidArgsBadSharedMemoryId) {
|
|
|
| TEST_F(GLES2DecoderTest2, LineWidthValidArgs) {
|
| EXPECT_CALL(*gl_, LineWidth(0.5f));
|
| - SpecializedSetup<LineWidth, 0>(true);
|
| - LineWidth cmd;
|
| + SpecializedSetup<cmds::LineWidth, 0>(true);
|
| + cmds::LineWidth cmd;
|
| cmd.Init(0.5f);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, LineWidthInvalidValue0_0) {
|
| - SpecializedSetup<LineWidth, 0>(false);
|
| - LineWidth cmd;
|
| + SpecializedSetup<cmds::LineWidth, 0>(false);
|
| + cmds::LineWidth cmd;
|
| cmd.Init(0.0f);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_INVALID_VALUE, GetGLError());
|
| @@ -233,8 +233,8 @@ TEST_F(GLES2DecoderTest2, LineWidthInvalidValue0_0) {
|
|
|
| TEST_F(GLES2DecoderTest2, LinkProgramValidArgs) {
|
| EXPECT_CALL(*gl_, LinkProgram(kServiceProgramId));
|
| - SpecializedSetup<LinkProgram, 0>(true);
|
| - LinkProgram cmd;
|
| + SpecializedSetup<cmds::LinkProgram, 0>(true);
|
| + cmds::LinkProgram cmd;
|
| cmd.Init(client_program_id_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -244,8 +244,8 @@ TEST_F(GLES2DecoderTest2, LinkProgramValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest2, PolygonOffsetValidArgs) {
|
| EXPECT_CALL(*gl_, PolygonOffset(1, 2));
|
| - SpecializedSetup<PolygonOffset, 0>(true);
|
| - PolygonOffset cmd;
|
| + SpecializedSetup<cmds::PolygonOffset, 0>(true);
|
| + cmds::PolygonOffset cmd;
|
| cmd.Init(1, 2);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -255,8 +255,8 @@ TEST_F(GLES2DecoderTest2, PolygonOffsetValidArgs) {
|
| // TODO(gman): ReleaseShaderCompiler
|
|
|
| TEST_F(GLES2DecoderTest2, RenderbufferStorageValidArgs) {
|
| - SpecializedSetup<RenderbufferStorage, 0>(true);
|
| - RenderbufferStorage cmd;
|
| + SpecializedSetup<cmds::RenderbufferStorage, 0>(true);
|
| + cmds::RenderbufferStorage cmd;
|
| cmd.Init(GL_RENDERBUFFER, GL_RGBA4, 3, 4);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -264,8 +264,8 @@ TEST_F(GLES2DecoderTest2, RenderbufferStorageValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest2, RenderbufferStorageInvalidArgs0_0) {
|
| EXPECT_CALL(*gl_, RenderbufferStorageEXT(_, _, _, _)).Times(0);
|
| - SpecializedSetup<RenderbufferStorage, 0>(false);
|
| - RenderbufferStorage cmd;
|
| + SpecializedSetup<cmds::RenderbufferStorage, 0>(false);
|
| + cmds::RenderbufferStorage cmd;
|
| cmd.Init(GL_FRAMEBUFFER, GL_RGBA4, 3, 4);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
|
| @@ -273,8 +273,8 @@ TEST_F(GLES2DecoderTest2, RenderbufferStorageInvalidArgs0_0) {
|
|
|
| TEST_F(GLES2DecoderTest2, RenderbufferStorageInvalidArgs2_0) {
|
| EXPECT_CALL(*gl_, RenderbufferStorageEXT(_, _, _, _)).Times(0);
|
| - SpecializedSetup<RenderbufferStorage, 0>(false);
|
| - RenderbufferStorage cmd;
|
| + SpecializedSetup<cmds::RenderbufferStorage, 0>(false);
|
| + cmds::RenderbufferStorage cmd;
|
| cmd.Init(GL_RENDERBUFFER, GL_RGBA4, -1, 4);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_INVALID_VALUE, GetGLError());
|
| @@ -282,8 +282,8 @@ TEST_F(GLES2DecoderTest2, RenderbufferStorageInvalidArgs2_0) {
|
|
|
| TEST_F(GLES2DecoderTest2, RenderbufferStorageInvalidArgs3_0) {
|
| EXPECT_CALL(*gl_, RenderbufferStorageEXT(_, _, _, _)).Times(0);
|
| - SpecializedSetup<RenderbufferStorage, 0>(false);
|
| - RenderbufferStorage cmd;
|
| + SpecializedSetup<cmds::RenderbufferStorage, 0>(false);
|
| + cmds::RenderbufferStorage cmd;
|
| cmd.Init(GL_RENDERBUFFER, GL_RGBA4, 3, -1);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_INVALID_VALUE, GetGLError());
|
| @@ -291,8 +291,8 @@ TEST_F(GLES2DecoderTest2, RenderbufferStorageInvalidArgs3_0) {
|
|
|
| TEST_F(GLES2DecoderTest2, SampleCoverageValidArgs) {
|
| EXPECT_CALL(*gl_, SampleCoverage(1, true));
|
| - SpecializedSetup<SampleCoverage, 0>(true);
|
| - SampleCoverage cmd;
|
| + SpecializedSetup<cmds::SampleCoverage, 0>(true);
|
| + cmds::SampleCoverage cmd;
|
| cmd.Init(1, true);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -300,8 +300,8 @@ TEST_F(GLES2DecoderTest2, SampleCoverageValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest2, ScissorValidArgs) {
|
| EXPECT_CALL(*gl_, Scissor(1, 2, 3, 4));
|
| - SpecializedSetup<Scissor, 0>(true);
|
| - Scissor cmd;
|
| + SpecializedSetup<cmds::Scissor, 0>(true);
|
| + cmds::Scissor cmd;
|
| cmd.Init(1, 2, 3, 4);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -309,8 +309,8 @@ TEST_F(GLES2DecoderTest2, ScissorValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest2, ScissorInvalidArgs2_0) {
|
| EXPECT_CALL(*gl_, Scissor(_, _, _, _)).Times(0);
|
| - SpecializedSetup<Scissor, 0>(false);
|
| - Scissor cmd;
|
| + SpecializedSetup<cmds::Scissor, 0>(false);
|
| + cmds::Scissor cmd;
|
| cmd.Init(1, 2, -1, 4);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_INVALID_VALUE, GetGLError());
|
| @@ -318,8 +318,8 @@ TEST_F(GLES2DecoderTest2, ScissorInvalidArgs2_0) {
|
|
|
| TEST_F(GLES2DecoderTest2, ScissorInvalidArgs3_0) {
|
| EXPECT_CALL(*gl_, Scissor(_, _, _, _)).Times(0);
|
| - SpecializedSetup<Scissor, 0>(false);
|
| - Scissor cmd;
|
| + SpecializedSetup<cmds::Scissor, 0>(false);
|
| + cmds::Scissor cmd;
|
| cmd.Init(1, 2, 3, -1);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_INVALID_VALUE, GetGLError());
|
| @@ -334,8 +334,8 @@ TEST_F(GLES2DecoderTest2, ScissorInvalidArgs3_0) {
|
|
|
| TEST_F(GLES2DecoderTest2, StencilFuncValidArgs) {
|
| EXPECT_CALL(*gl_, StencilFunc(GL_NEVER, 2, 3));
|
| - SpecializedSetup<StencilFunc, 0>(true);
|
| - StencilFunc cmd;
|
| + SpecializedSetup<cmds::StencilFunc, 0>(true);
|
| + cmds::StencilFunc cmd;
|
| cmd.Init(GL_NEVER, 2, 3);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -343,24 +343,24 @@ TEST_F(GLES2DecoderTest2, StencilFuncValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest2, StencilFuncSeparateValidArgs) {
|
| EXPECT_CALL(*gl_, StencilFuncSeparate(GL_FRONT, GL_NEVER, 3, 4));
|
| - SpecializedSetup<StencilFuncSeparate, 0>(true);
|
| - StencilFuncSeparate cmd;
|
| + SpecializedSetup<cmds::StencilFuncSeparate, 0>(true);
|
| + cmds::StencilFuncSeparate cmd;
|
| cmd.Init(GL_FRONT, GL_NEVER, 3, 4);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, StencilMaskValidArgs) {
|
| - SpecializedSetup<StencilMask, 0>(true);
|
| - StencilMask cmd;
|
| + SpecializedSetup<cmds::StencilMask, 0>(true);
|
| + cmds::StencilMask cmd;
|
| cmd.Init(1);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, StencilMaskSeparateValidArgs) {
|
| - SpecializedSetup<StencilMaskSeparate, 0>(true);
|
| - StencilMaskSeparate cmd;
|
| + SpecializedSetup<cmds::StencilMaskSeparate, 0>(true);
|
| + cmds::StencilMaskSeparate cmd;
|
| cmd.Init(GL_FRONT, 2);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -368,8 +368,8 @@ TEST_F(GLES2DecoderTest2, StencilMaskSeparateValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest2, StencilOpValidArgs) {
|
| EXPECT_CALL(*gl_, StencilOp(GL_KEEP, GL_INCR, GL_KEEP));
|
| - SpecializedSetup<StencilOp, 0>(true);
|
| - StencilOp cmd;
|
| + SpecializedSetup<cmds::StencilOp, 0>(true);
|
| + cmds::StencilOp cmd;
|
| cmd.Init(GL_KEEP, GL_INCR, GL_KEEP);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -377,8 +377,8 @@ TEST_F(GLES2DecoderTest2, StencilOpValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest2, StencilOpSeparateValidArgs) {
|
| EXPECT_CALL(*gl_, StencilOpSeparate(GL_FRONT, GL_INCR, GL_KEEP, GL_KEEP));
|
| - SpecializedSetup<StencilOpSeparate, 0>(true);
|
| - StencilOpSeparate cmd;
|
| + SpecializedSetup<cmds::StencilOpSeparate, 0>(true);
|
| + cmds::StencilOpSeparate cmd;
|
| cmd.Init(GL_FRONT, GL_INCR, GL_KEEP, GL_KEEP);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -391,8 +391,8 @@ TEST_F(GLES2DecoderTest2, StencilOpSeparateValidArgs) {
|
| TEST_F(GLES2DecoderTest2, TexParameterfValidArgs) {
|
| EXPECT_CALL(
|
| *gl_, TexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST));
|
| - SpecializedSetup<TexParameterf, 0>(true);
|
| - TexParameterf cmd;
|
| + SpecializedSetup<cmds::TexParameterf, 0>(true);
|
| + cmds::TexParameterf cmd;
|
| cmd.Init(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -400,8 +400,8 @@ TEST_F(GLES2DecoderTest2, TexParameterfValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest2, TexParameterfInvalidArgs0_0) {
|
| EXPECT_CALL(*gl_, TexParameterf(_, _, _)).Times(0);
|
| - SpecializedSetup<TexParameterf, 0>(false);
|
| - TexParameterf cmd;
|
| + SpecializedSetup<cmds::TexParameterf, 0>(false);
|
| + cmds::TexParameterf cmd;
|
| cmd.Init(GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
|
| @@ -409,8 +409,8 @@ TEST_F(GLES2DecoderTest2, TexParameterfInvalidArgs0_0) {
|
|
|
| TEST_F(GLES2DecoderTest2, TexParameterfInvalidArgs0_1) {
|
| EXPECT_CALL(*gl_, TexParameterf(_, _, _)).Times(0);
|
| - SpecializedSetup<TexParameterf, 0>(false);
|
| - TexParameterf cmd;
|
| + SpecializedSetup<cmds::TexParameterf, 0>(false);
|
| + cmds::TexParameterf cmd;
|
| cmd.Init(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
|
| @@ -418,8 +418,8 @@ TEST_F(GLES2DecoderTest2, TexParameterfInvalidArgs0_1) {
|
|
|
| TEST_F(GLES2DecoderTest2, TexParameterfInvalidArgs1_0) {
|
| EXPECT_CALL(*gl_, TexParameterf(_, _, _)).Times(0);
|
| - SpecializedSetup<TexParameterf, 0>(false);
|
| - TexParameterf cmd;
|
| + SpecializedSetup<cmds::TexParameterf, 0>(false);
|
| + cmds::TexParameterf cmd;
|
| cmd.Init(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_NEAREST);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
|
| @@ -430,8 +430,8 @@ TEST_F(GLES2DecoderTest2, TexParameterfvValidArgs) {
|
| *gl_, TexParameterfv(
|
| GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,
|
| reinterpret_cast<const GLfloat*>(shared_memory_address_)));
|
| - SpecializedSetup<TexParameterfv, 0>(true);
|
| - TexParameterfv cmd;
|
| + SpecializedSetup<cmds::TexParameterfv, 0>(true);
|
| + cmds::TexParameterfv cmd;
|
| cmd.Init(
|
| GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, shared_memory_id_,
|
| shared_memory_offset_);
|
| @@ -442,8 +442,8 @@ TEST_F(GLES2DecoderTest2, TexParameterfvValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest2, TexParameterfvInvalidArgs0_0) {
|
| EXPECT_CALL(*gl_, TexParameterfv(_, _, _)).Times(0);
|
| - SpecializedSetup<TexParameterfv, 0>(false);
|
| - TexParameterfv cmd;
|
| + SpecializedSetup<cmds::TexParameterfv, 0>(false);
|
| + cmds::TexParameterfv cmd;
|
| cmd.Init(
|
| GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, shared_memory_id_,
|
| shared_memory_offset_);
|
| @@ -454,8 +454,8 @@ TEST_F(GLES2DecoderTest2, TexParameterfvInvalidArgs0_0) {
|
|
|
| TEST_F(GLES2DecoderTest2, TexParameterfvInvalidArgs0_1) {
|
| EXPECT_CALL(*gl_, TexParameterfv(_, _, _)).Times(0);
|
| - SpecializedSetup<TexParameterfv, 0>(false);
|
| - TexParameterfv cmd;
|
| + SpecializedSetup<cmds::TexParameterfv, 0>(false);
|
| + cmds::TexParameterfv cmd;
|
| cmd.Init(
|
| GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, shared_memory_id_,
|
| shared_memory_offset_);
|
| @@ -466,8 +466,8 @@ TEST_F(GLES2DecoderTest2, TexParameterfvInvalidArgs0_1) {
|
|
|
| TEST_F(GLES2DecoderTest2, TexParameterfvInvalidArgs1_0) {
|
| EXPECT_CALL(*gl_, TexParameterfv(_, _, _)).Times(0);
|
| - SpecializedSetup<TexParameterfv, 0>(false);
|
| - TexParameterfv cmd;
|
| + SpecializedSetup<cmds::TexParameterfv, 0>(false);
|
| + cmds::TexParameterfv cmd;
|
| cmd.Init(
|
| GL_TEXTURE_2D, GL_GENERATE_MIPMAP, shared_memory_id_,
|
| shared_memory_offset_);
|
| @@ -478,8 +478,8 @@ TEST_F(GLES2DecoderTest2, TexParameterfvInvalidArgs1_0) {
|
|
|
| TEST_F(GLES2DecoderTest2, TexParameterfvInvalidArgs2_0) {
|
| EXPECT_CALL(*gl_, TexParameterfv(_, _, _)).Times(0);
|
| - SpecializedSetup<TexParameterfv, 0>(false);
|
| - TexParameterfv cmd;
|
| + SpecializedSetup<cmds::TexParameterfv, 0>(false);
|
| + cmds::TexParameterfv cmd;
|
| cmd.Init(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, kInvalidSharedMemoryId, 0);
|
| GetSharedMemoryAs<GLfloat*>()[0] = GL_NEAREST;
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| @@ -487,8 +487,8 @@ TEST_F(GLES2DecoderTest2, TexParameterfvInvalidArgs2_0) {
|
|
|
| TEST_F(GLES2DecoderTest2, TexParameterfvInvalidArgs2_1) {
|
| EXPECT_CALL(*gl_, TexParameterfv(_, _, _)).Times(0);
|
| - SpecializedSetup<TexParameterfv, 0>(false);
|
| - TexParameterfv cmd;
|
| + SpecializedSetup<cmds::TexParameterfv, 0>(false);
|
| + cmds::TexParameterfv cmd;
|
| cmd.Init(
|
| GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, shared_memory_id_,
|
| kInvalidSharedMemoryOffset);
|
| @@ -497,12 +497,13 @@ TEST_F(GLES2DecoderTest2, TexParameterfvInvalidArgs2_1) {
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, TexParameterfvImmediateValidArgs) {
|
| - TexParameterfvImmediate& cmd = *GetImmediateAs<TexParameterfvImmediate>();
|
| + cmds::TexParameterfvImmediate& cmd =
|
| + *GetImmediateAs<cmds::TexParameterfvImmediate>();
|
| EXPECT_CALL(
|
| *gl_,
|
| TexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,
|
| reinterpret_cast<GLfloat*>(ImmediateDataAddress(&cmd))));
|
| - SpecializedSetup<TexParameterfvImmediate, 0>(true);
|
| + SpecializedSetup<cmds::TexParameterfvImmediate, 0>(true);
|
| GLfloat temp[1] = { GL_NEAREST, };
|
| cmd.Init(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, &temp[0]);
|
| EXPECT_EQ(error::kNoError,
|
| @@ -511,9 +512,10 @@ TEST_F(GLES2DecoderTest2, TexParameterfvImmediateValidArgs) {
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, TexParameterfvImmediateInvalidArgs0_0) {
|
| - TexParameterfvImmediate& cmd = *GetImmediateAs<TexParameterfvImmediate>();
|
| + cmds::TexParameterfvImmediate& cmd =
|
| + *GetImmediateAs<cmds::TexParameterfvImmediate>();
|
| EXPECT_CALL(*gl_, TexParameterfv(_, _, _)).Times(0);
|
| - SpecializedSetup<TexParameterfvImmediate, 0>(false);
|
| + SpecializedSetup<cmds::TexParameterfvImmediate, 0>(false);
|
| GLfloat temp[1] = { GL_NEAREST, };
|
| cmd.Init(GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, &temp[0]);
|
| EXPECT_EQ(error::kNoError,
|
| @@ -522,9 +524,10 @@ TEST_F(GLES2DecoderTest2, TexParameterfvImmediateInvalidArgs0_0) {
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, TexParameterfvImmediateInvalidArgs0_1) {
|
| - TexParameterfvImmediate& cmd = *GetImmediateAs<TexParameterfvImmediate>();
|
| + cmds::TexParameterfvImmediate& cmd =
|
| + *GetImmediateAs<cmds::TexParameterfvImmediate>();
|
| EXPECT_CALL(*gl_, TexParameterfv(_, _, _)).Times(0);
|
| - SpecializedSetup<TexParameterfvImmediate, 0>(false);
|
| + SpecializedSetup<cmds::TexParameterfvImmediate, 0>(false);
|
| GLfloat temp[1] = { GL_NEAREST, };
|
| cmd.Init(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, &temp[0]);
|
| EXPECT_EQ(error::kNoError,
|
| @@ -533,9 +536,10 @@ TEST_F(GLES2DecoderTest2, TexParameterfvImmediateInvalidArgs0_1) {
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, TexParameterfvImmediateInvalidArgs1_0) {
|
| - TexParameterfvImmediate& cmd = *GetImmediateAs<TexParameterfvImmediate>();
|
| + cmds::TexParameterfvImmediate& cmd =
|
| + *GetImmediateAs<cmds::TexParameterfvImmediate>();
|
| EXPECT_CALL(*gl_, TexParameterfv(_, _, _)).Times(0);
|
| - SpecializedSetup<TexParameterfvImmediate, 0>(false);
|
| + SpecializedSetup<cmds::TexParameterfvImmediate, 0>(false);
|
| GLfloat temp[1] = { GL_NEAREST, };
|
| cmd.Init(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, &temp[0]);
|
| EXPECT_EQ(error::kNoError,
|
| @@ -546,8 +550,8 @@ TEST_F(GLES2DecoderTest2, TexParameterfvImmediateInvalidArgs1_0) {
|
| TEST_F(GLES2DecoderTest2, TexParameteriValidArgs) {
|
| EXPECT_CALL(
|
| *gl_, TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST));
|
| - SpecializedSetup<TexParameteri, 0>(true);
|
| - TexParameteri cmd;
|
| + SpecializedSetup<cmds::TexParameteri, 0>(true);
|
| + cmds::TexParameteri cmd;
|
| cmd.Init(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -555,8 +559,8 @@ TEST_F(GLES2DecoderTest2, TexParameteriValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest2, TexParameteriInvalidArgs0_0) {
|
| EXPECT_CALL(*gl_, TexParameteri(_, _, _)).Times(0);
|
| - SpecializedSetup<TexParameteri, 0>(false);
|
| - TexParameteri cmd;
|
| + SpecializedSetup<cmds::TexParameteri, 0>(false);
|
| + cmds::TexParameteri cmd;
|
| cmd.Init(GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
|
| @@ -564,8 +568,8 @@ TEST_F(GLES2DecoderTest2, TexParameteriInvalidArgs0_0) {
|
|
|
| TEST_F(GLES2DecoderTest2, TexParameteriInvalidArgs0_1) {
|
| EXPECT_CALL(*gl_, TexParameteri(_, _, _)).Times(0);
|
| - SpecializedSetup<TexParameteri, 0>(false);
|
| - TexParameteri cmd;
|
| + SpecializedSetup<cmds::TexParameteri, 0>(false);
|
| + cmds::TexParameteri cmd;
|
| cmd.Init(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
|
| @@ -573,8 +577,8 @@ TEST_F(GLES2DecoderTest2, TexParameteriInvalidArgs0_1) {
|
|
|
| TEST_F(GLES2DecoderTest2, TexParameteriInvalidArgs1_0) {
|
| EXPECT_CALL(*gl_, TexParameteri(_, _, _)).Times(0);
|
| - SpecializedSetup<TexParameteri, 0>(false);
|
| - TexParameteri cmd;
|
| + SpecializedSetup<cmds::TexParameteri, 0>(false);
|
| + cmds::TexParameteri cmd;
|
| cmd.Init(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_NEAREST);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
|
| @@ -585,8 +589,8 @@ TEST_F(GLES2DecoderTest2, TexParameterivValidArgs) {
|
| *gl_, TexParameteriv(
|
| GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, reinterpret_cast<const GLint*>(
|
| shared_memory_address_)));
|
| - SpecializedSetup<TexParameteriv, 0>(true);
|
| - TexParameteriv cmd;
|
| + SpecializedSetup<cmds::TexParameteriv, 0>(true);
|
| + cmds::TexParameteriv cmd;
|
| cmd.Init(
|
| GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, shared_memory_id_,
|
| shared_memory_offset_);
|
| @@ -597,8 +601,8 @@ TEST_F(GLES2DecoderTest2, TexParameterivValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest2, TexParameterivInvalidArgs0_0) {
|
| EXPECT_CALL(*gl_, TexParameteriv(_, _, _)).Times(0);
|
| - SpecializedSetup<TexParameteriv, 0>(false);
|
| - TexParameteriv cmd;
|
| + SpecializedSetup<cmds::TexParameteriv, 0>(false);
|
| + cmds::TexParameteriv cmd;
|
| cmd.Init(
|
| GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, shared_memory_id_,
|
| shared_memory_offset_);
|
| @@ -609,8 +613,8 @@ TEST_F(GLES2DecoderTest2, TexParameterivInvalidArgs0_0) {
|
|
|
| TEST_F(GLES2DecoderTest2, TexParameterivInvalidArgs0_1) {
|
| EXPECT_CALL(*gl_, TexParameteriv(_, _, _)).Times(0);
|
| - SpecializedSetup<TexParameteriv, 0>(false);
|
| - TexParameteriv cmd;
|
| + SpecializedSetup<cmds::TexParameteriv, 0>(false);
|
| + cmds::TexParameteriv cmd;
|
| cmd.Init(
|
| GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, shared_memory_id_,
|
| shared_memory_offset_);
|
| @@ -621,8 +625,8 @@ TEST_F(GLES2DecoderTest2, TexParameterivInvalidArgs0_1) {
|
|
|
| TEST_F(GLES2DecoderTest2, TexParameterivInvalidArgs1_0) {
|
| EXPECT_CALL(*gl_, TexParameteriv(_, _, _)).Times(0);
|
| - SpecializedSetup<TexParameteriv, 0>(false);
|
| - TexParameteriv cmd;
|
| + SpecializedSetup<cmds::TexParameteriv, 0>(false);
|
| + cmds::TexParameteriv cmd;
|
| cmd.Init(
|
| GL_TEXTURE_2D, GL_GENERATE_MIPMAP, shared_memory_id_,
|
| shared_memory_offset_);
|
| @@ -633,8 +637,8 @@ TEST_F(GLES2DecoderTest2, TexParameterivInvalidArgs1_0) {
|
|
|
| TEST_F(GLES2DecoderTest2, TexParameterivInvalidArgs2_0) {
|
| EXPECT_CALL(*gl_, TexParameteriv(_, _, _)).Times(0);
|
| - SpecializedSetup<TexParameteriv, 0>(false);
|
| - TexParameteriv cmd;
|
| + SpecializedSetup<cmds::TexParameteriv, 0>(false);
|
| + cmds::TexParameteriv cmd;
|
| cmd.Init(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, kInvalidSharedMemoryId, 0);
|
| GetSharedMemoryAs<GLint*>()[0] = GL_NEAREST;
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| @@ -642,8 +646,8 @@ TEST_F(GLES2DecoderTest2, TexParameterivInvalidArgs2_0) {
|
|
|
| TEST_F(GLES2DecoderTest2, TexParameterivInvalidArgs2_1) {
|
| EXPECT_CALL(*gl_, TexParameteriv(_, _, _)).Times(0);
|
| - SpecializedSetup<TexParameteriv, 0>(false);
|
| - TexParameteriv cmd;
|
| + SpecializedSetup<cmds::TexParameteriv, 0>(false);
|
| + cmds::TexParameteriv cmd;
|
| cmd.Init(
|
| GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, shared_memory_id_,
|
| kInvalidSharedMemoryOffset);
|
| @@ -652,12 +656,13 @@ TEST_F(GLES2DecoderTest2, TexParameterivInvalidArgs2_1) {
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, TexParameterivImmediateValidArgs) {
|
| - TexParameterivImmediate& cmd = *GetImmediateAs<TexParameterivImmediate>();
|
| + cmds::TexParameterivImmediate& cmd =
|
| + *GetImmediateAs<cmds::TexParameterivImmediate>();
|
| EXPECT_CALL(
|
| *gl_,
|
| TexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,
|
| reinterpret_cast<GLint*>(ImmediateDataAddress(&cmd))));
|
| - SpecializedSetup<TexParameterivImmediate, 0>(true);
|
| + SpecializedSetup<cmds::TexParameterivImmediate, 0>(true);
|
| GLint temp[1] = { GL_NEAREST, };
|
| cmd.Init(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, &temp[0]);
|
| EXPECT_EQ(error::kNoError,
|
| @@ -666,9 +671,10 @@ TEST_F(GLES2DecoderTest2, TexParameterivImmediateValidArgs) {
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, TexParameterivImmediateInvalidArgs0_0) {
|
| - TexParameterivImmediate& cmd = *GetImmediateAs<TexParameterivImmediate>();
|
| + cmds::TexParameterivImmediate& cmd =
|
| + *GetImmediateAs<cmds::TexParameterivImmediate>();
|
| EXPECT_CALL(*gl_, TexParameteriv(_, _, _)).Times(0);
|
| - SpecializedSetup<TexParameterivImmediate, 0>(false);
|
| + SpecializedSetup<cmds::TexParameterivImmediate, 0>(false);
|
| GLint temp[1] = { GL_NEAREST, };
|
| cmd.Init(GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, &temp[0]);
|
| EXPECT_EQ(error::kNoError,
|
| @@ -677,9 +683,10 @@ TEST_F(GLES2DecoderTest2, TexParameterivImmediateInvalidArgs0_0) {
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, TexParameterivImmediateInvalidArgs0_1) {
|
| - TexParameterivImmediate& cmd = *GetImmediateAs<TexParameterivImmediate>();
|
| + cmds::TexParameterivImmediate& cmd =
|
| + *GetImmediateAs<cmds::TexParameterivImmediate>();
|
| EXPECT_CALL(*gl_, TexParameteriv(_, _, _)).Times(0);
|
| - SpecializedSetup<TexParameterivImmediate, 0>(false);
|
| + SpecializedSetup<cmds::TexParameterivImmediate, 0>(false);
|
| GLint temp[1] = { GL_NEAREST, };
|
| cmd.Init(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, &temp[0]);
|
| EXPECT_EQ(error::kNoError,
|
| @@ -688,9 +695,10 @@ TEST_F(GLES2DecoderTest2, TexParameterivImmediateInvalidArgs0_1) {
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, TexParameterivImmediateInvalidArgs1_0) {
|
| - TexParameterivImmediate& cmd = *GetImmediateAs<TexParameterivImmediate>();
|
| + cmds::TexParameterivImmediate& cmd =
|
| + *GetImmediateAs<cmds::TexParameterivImmediate>();
|
| EXPECT_CALL(*gl_, TexParameteriv(_, _, _)).Times(0);
|
| - SpecializedSetup<TexParameterivImmediate, 0>(false);
|
| + SpecializedSetup<cmds::TexParameterivImmediate, 0>(false);
|
| GLint temp[1] = { GL_NEAREST, };
|
| cmd.Init(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, &temp[0]);
|
| EXPECT_EQ(error::kNoError,
|
| @@ -704,8 +712,8 @@ TEST_F(GLES2DecoderTest2, TexParameterivImmediateInvalidArgs1_0) {
|
|
|
| TEST_F(GLES2DecoderTest2, Uniform1fValidArgs) {
|
| EXPECT_CALL(*gl_, Uniform1fv(1, 1, _));
|
| - SpecializedSetup<Uniform1f, 0>(true);
|
| - Uniform1f cmd;
|
| + SpecializedSetup<cmds::Uniform1f, 0>(true);
|
| + cmds::Uniform1f cmd;
|
| cmd.Init(1, 2);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -715,8 +723,8 @@ TEST_F(GLES2DecoderTest2, Uniform1fvValidArgs) {
|
| EXPECT_CALL(
|
| *gl_, Uniform1fv(
|
| 1, 2, reinterpret_cast<const GLfloat*>(shared_memory_address_)));
|
| - SpecializedSetup<Uniform1fv, 0>(true);
|
| - Uniform1fv cmd;
|
| + SpecializedSetup<cmds::Uniform1fv, 0>(true);
|
| + cmds::Uniform1fv cmd;
|
| cmd.Init(1, 2, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -724,8 +732,8 @@ TEST_F(GLES2DecoderTest2, Uniform1fvValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest2, Uniform1fvInvalidArgs1_0) {
|
| EXPECT_CALL(*gl_, Uniform1fv(_, _, _)).Times(0);
|
| - SpecializedSetup<Uniform1fv, 0>(false);
|
| - Uniform1fv cmd;
|
| + SpecializedSetup<cmds::Uniform1fv, 0>(false);
|
| + cmds::Uniform1fv cmd;
|
| cmd.Init(1, -1, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -733,16 +741,16 @@ TEST_F(GLES2DecoderTest2, Uniform1fvInvalidArgs1_0) {
|
|
|
| TEST_F(GLES2DecoderTest2, Uniform1fvInvalidArgs2_0) {
|
| EXPECT_CALL(*gl_, Uniform1fv(_, _, _)).Times(0);
|
| - SpecializedSetup<Uniform1fv, 0>(false);
|
| - Uniform1fv cmd;
|
| + SpecializedSetup<cmds::Uniform1fv, 0>(false);
|
| + cmds::Uniform1fv cmd;
|
| cmd.Init(1, 2, kInvalidSharedMemoryId, 0);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, Uniform1fvInvalidArgs2_1) {
|
| EXPECT_CALL(*gl_, Uniform1fv(_, _, _)).Times(0);
|
| - SpecializedSetup<Uniform1fv, 0>(false);
|
| - Uniform1fv cmd;
|
| + SpecializedSetup<cmds::Uniform1fv, 0>(false);
|
| + cmds::Uniform1fv cmd;
|
| cmd.Init(1, 2, shared_memory_id_, kInvalidSharedMemoryOffset);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| }
|
| @@ -751,8 +759,8 @@ TEST_F(GLES2DecoderTest2, Uniform1fvValidArgsCountTooLarge) {
|
| EXPECT_CALL(
|
| *gl_, Uniform1fv(
|
| 3, 3, reinterpret_cast<const GLfloat*>(shared_memory_address_)));
|
| - SpecializedSetup<Uniform1fv, 0>(true);
|
| - Uniform1fv cmd;
|
| + SpecializedSetup<cmds::Uniform1fv, 0>(true);
|
| + cmds::Uniform1fv cmd;
|
| cmd.Init(
|
| ProgramManager::MakeFakeLocation(
|
| 1, 1), 5, shared_memory_id_, shared_memory_offset_);
|
| @@ -761,12 +769,13 @@ TEST_F(GLES2DecoderTest2, Uniform1fvValidArgsCountTooLarge) {
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, Uniform1fvImmediateValidArgs) {
|
| - Uniform1fvImmediate& cmd = *GetImmediateAs<Uniform1fvImmediate>();
|
| + cmds::Uniform1fvImmediate& cmd =
|
| + *GetImmediateAs<cmds::Uniform1fvImmediate>();
|
| EXPECT_CALL(
|
| *gl_,
|
| Uniform1fv(1, 2,
|
| reinterpret_cast<GLfloat*>(ImmediateDataAddress(&cmd))));
|
| - SpecializedSetup<Uniform1fvImmediate, 0>(true);
|
| + SpecializedSetup<cmds::Uniform1fvImmediate, 0>(true);
|
| GLfloat temp[1 * 2] = { 0, };
|
| cmd.Init(1, 2, &temp[0]);
|
| EXPECT_EQ(error::kNoError,
|
| @@ -779,8 +788,8 @@ TEST_F(GLES2DecoderTest2, Uniform1fvImmediateValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest2, Uniform2fValidArgs) {
|
| EXPECT_CALL(*gl_, Uniform2fv(1, 1, _));
|
| - SpecializedSetup<Uniform2f, 0>(true);
|
| - Uniform2f cmd;
|
| + SpecializedSetup<cmds::Uniform2f, 0>(true);
|
| + cmds::Uniform2f cmd;
|
| cmd.Init(1, 2, 3);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -790,8 +799,8 @@ TEST_F(GLES2DecoderTest2, Uniform2fvValidArgs) {
|
| EXPECT_CALL(
|
| *gl_, Uniform2fv(
|
| 1, 2, reinterpret_cast<const GLfloat*>(shared_memory_address_)));
|
| - SpecializedSetup<Uniform2fv, 0>(true);
|
| - Uniform2fv cmd;
|
| + SpecializedSetup<cmds::Uniform2fv, 0>(true);
|
| + cmds::Uniform2fv cmd;
|
| cmd.Init(1, 2, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -799,8 +808,8 @@ TEST_F(GLES2DecoderTest2, Uniform2fvValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest2, Uniform2fvInvalidArgs1_0) {
|
| EXPECT_CALL(*gl_, Uniform2fv(_, _, _)).Times(0);
|
| - SpecializedSetup<Uniform2fv, 0>(false);
|
| - Uniform2fv cmd;
|
| + SpecializedSetup<cmds::Uniform2fv, 0>(false);
|
| + cmds::Uniform2fv cmd;
|
| cmd.Init(1, -1, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -808,16 +817,16 @@ TEST_F(GLES2DecoderTest2, Uniform2fvInvalidArgs1_0) {
|
|
|
| TEST_F(GLES2DecoderTest2, Uniform2fvInvalidArgs2_0) {
|
| EXPECT_CALL(*gl_, Uniform2fv(_, _, _)).Times(0);
|
| - SpecializedSetup<Uniform2fv, 0>(false);
|
| - Uniform2fv cmd;
|
| + SpecializedSetup<cmds::Uniform2fv, 0>(false);
|
| + cmds::Uniform2fv cmd;
|
| cmd.Init(1, 2, kInvalidSharedMemoryId, 0);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, Uniform2fvInvalidArgs2_1) {
|
| EXPECT_CALL(*gl_, Uniform2fv(_, _, _)).Times(0);
|
| - SpecializedSetup<Uniform2fv, 0>(false);
|
| - Uniform2fv cmd;
|
| + SpecializedSetup<cmds::Uniform2fv, 0>(false);
|
| + cmds::Uniform2fv cmd;
|
| cmd.Init(1, 2, shared_memory_id_, kInvalidSharedMemoryOffset);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| }
|
| @@ -826,8 +835,8 @@ TEST_F(GLES2DecoderTest2, Uniform2fvValidArgsCountTooLarge) {
|
| EXPECT_CALL(
|
| *gl_, Uniform2fv(
|
| 3, 3, reinterpret_cast<const GLfloat*>(shared_memory_address_)));
|
| - SpecializedSetup<Uniform2fv, 0>(true);
|
| - Uniform2fv cmd;
|
| + SpecializedSetup<cmds::Uniform2fv, 0>(true);
|
| + cmds::Uniform2fv cmd;
|
| cmd.Init(
|
| ProgramManager::MakeFakeLocation(
|
| 1, 1), 5, shared_memory_id_, shared_memory_offset_);
|
| @@ -836,12 +845,13 @@ TEST_F(GLES2DecoderTest2, Uniform2fvValidArgsCountTooLarge) {
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, Uniform2fvImmediateValidArgs) {
|
| - Uniform2fvImmediate& cmd = *GetImmediateAs<Uniform2fvImmediate>();
|
| + cmds::Uniform2fvImmediate& cmd =
|
| + *GetImmediateAs<cmds::Uniform2fvImmediate>();
|
| EXPECT_CALL(
|
| *gl_,
|
| Uniform2fv(1, 2,
|
| reinterpret_cast<GLfloat*>(ImmediateDataAddress(&cmd))));
|
| - SpecializedSetup<Uniform2fvImmediate, 0>(true);
|
| + SpecializedSetup<cmds::Uniform2fvImmediate, 0>(true);
|
| GLfloat temp[2 * 2] = { 0, };
|
| cmd.Init(1, 2, &temp[0]);
|
| EXPECT_EQ(error::kNoError,
|
| @@ -851,8 +861,8 @@ TEST_F(GLES2DecoderTest2, Uniform2fvImmediateValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest2, Uniform2iValidArgs) {
|
| EXPECT_CALL(*gl_, Uniform2iv(1, 1, _));
|
| - SpecializedSetup<Uniform2i, 0>(true);
|
| - Uniform2i cmd;
|
| + SpecializedSetup<cmds::Uniform2i, 0>(true);
|
| + cmds::Uniform2i cmd;
|
| cmd.Init(1, 2, 3);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -862,8 +872,8 @@ TEST_F(GLES2DecoderTest2, Uniform2ivValidArgs) {
|
| EXPECT_CALL(
|
| *gl_, Uniform2iv(
|
| 1, 2, reinterpret_cast<const GLint*>(shared_memory_address_)));
|
| - SpecializedSetup<Uniform2iv, 0>(true);
|
| - Uniform2iv cmd;
|
| + SpecializedSetup<cmds::Uniform2iv, 0>(true);
|
| + cmds::Uniform2iv cmd;
|
| cmd.Init(1, 2, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -871,8 +881,8 @@ TEST_F(GLES2DecoderTest2, Uniform2ivValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest2, Uniform2ivInvalidArgs1_0) {
|
| EXPECT_CALL(*gl_, Uniform2iv(_, _, _)).Times(0);
|
| - SpecializedSetup<Uniform2iv, 0>(false);
|
| - Uniform2iv cmd;
|
| + SpecializedSetup<cmds::Uniform2iv, 0>(false);
|
| + cmds::Uniform2iv cmd;
|
| cmd.Init(1, -1, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -880,16 +890,16 @@ TEST_F(GLES2DecoderTest2, Uniform2ivInvalidArgs1_0) {
|
|
|
| TEST_F(GLES2DecoderTest2, Uniform2ivInvalidArgs2_0) {
|
| EXPECT_CALL(*gl_, Uniform2iv(_, _, _)).Times(0);
|
| - SpecializedSetup<Uniform2iv, 0>(false);
|
| - Uniform2iv cmd;
|
| + SpecializedSetup<cmds::Uniform2iv, 0>(false);
|
| + cmds::Uniform2iv cmd;
|
| cmd.Init(1, 2, kInvalidSharedMemoryId, 0);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, Uniform2ivInvalidArgs2_1) {
|
| EXPECT_CALL(*gl_, Uniform2iv(_, _, _)).Times(0);
|
| - SpecializedSetup<Uniform2iv, 0>(false);
|
| - Uniform2iv cmd;
|
| + SpecializedSetup<cmds::Uniform2iv, 0>(false);
|
| + cmds::Uniform2iv cmd;
|
| cmd.Init(1, 2, shared_memory_id_, kInvalidSharedMemoryOffset);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| }
|
| @@ -898,8 +908,8 @@ TEST_F(GLES2DecoderTest2, Uniform2ivValidArgsCountTooLarge) {
|
| EXPECT_CALL(
|
| *gl_, Uniform2iv(
|
| 3, 3, reinterpret_cast<const GLint*>(shared_memory_address_)));
|
| - SpecializedSetup<Uniform2iv, 0>(true);
|
| - Uniform2iv cmd;
|
| + SpecializedSetup<cmds::Uniform2iv, 0>(true);
|
| + cmds::Uniform2iv cmd;
|
| cmd.Init(
|
| ProgramManager::MakeFakeLocation(
|
| 1, 1), 5, shared_memory_id_, shared_memory_offset_);
|
| @@ -908,12 +918,13 @@ TEST_F(GLES2DecoderTest2, Uniform2ivValidArgsCountTooLarge) {
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, Uniform2ivImmediateValidArgs) {
|
| - Uniform2ivImmediate& cmd = *GetImmediateAs<Uniform2ivImmediate>();
|
| + cmds::Uniform2ivImmediate& cmd =
|
| + *GetImmediateAs<cmds::Uniform2ivImmediate>();
|
| EXPECT_CALL(
|
| *gl_,
|
| Uniform2iv(1, 2,
|
| reinterpret_cast<GLint*>(ImmediateDataAddress(&cmd))));
|
| - SpecializedSetup<Uniform2ivImmediate, 0>(true);
|
| + SpecializedSetup<cmds::Uniform2ivImmediate, 0>(true);
|
| GLint temp[2 * 2] = { 0, };
|
| cmd.Init(1, 2, &temp[0]);
|
| EXPECT_EQ(error::kNoError,
|
| @@ -923,8 +934,8 @@ TEST_F(GLES2DecoderTest2, Uniform2ivImmediateValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest2, Uniform3fValidArgs) {
|
| EXPECT_CALL(*gl_, Uniform3fv(1, 1, _));
|
| - SpecializedSetup<Uniform3f, 0>(true);
|
| - Uniform3f cmd;
|
| + SpecializedSetup<cmds::Uniform3f, 0>(true);
|
| + cmds::Uniform3f cmd;
|
| cmd.Init(1, 2, 3, 4);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -934,8 +945,8 @@ TEST_F(GLES2DecoderTest2, Uniform3fvValidArgs) {
|
| EXPECT_CALL(
|
| *gl_, Uniform3fv(
|
| 1, 2, reinterpret_cast<const GLfloat*>(shared_memory_address_)));
|
| - SpecializedSetup<Uniform3fv, 0>(true);
|
| - Uniform3fv cmd;
|
| + SpecializedSetup<cmds::Uniform3fv, 0>(true);
|
| + cmds::Uniform3fv cmd;
|
| cmd.Init(1, 2, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -943,8 +954,8 @@ TEST_F(GLES2DecoderTest2, Uniform3fvValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest2, Uniform3fvInvalidArgs1_0) {
|
| EXPECT_CALL(*gl_, Uniform3fv(_, _, _)).Times(0);
|
| - SpecializedSetup<Uniform3fv, 0>(false);
|
| - Uniform3fv cmd;
|
| + SpecializedSetup<cmds::Uniform3fv, 0>(false);
|
| + cmds::Uniform3fv cmd;
|
| cmd.Init(1, -1, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -952,16 +963,16 @@ TEST_F(GLES2DecoderTest2, Uniform3fvInvalidArgs1_0) {
|
|
|
| TEST_F(GLES2DecoderTest2, Uniform3fvInvalidArgs2_0) {
|
| EXPECT_CALL(*gl_, Uniform3fv(_, _, _)).Times(0);
|
| - SpecializedSetup<Uniform3fv, 0>(false);
|
| - Uniform3fv cmd;
|
| + SpecializedSetup<cmds::Uniform3fv, 0>(false);
|
| + cmds::Uniform3fv cmd;
|
| cmd.Init(1, 2, kInvalidSharedMemoryId, 0);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, Uniform3fvInvalidArgs2_1) {
|
| EXPECT_CALL(*gl_, Uniform3fv(_, _, _)).Times(0);
|
| - SpecializedSetup<Uniform3fv, 0>(false);
|
| - Uniform3fv cmd;
|
| + SpecializedSetup<cmds::Uniform3fv, 0>(false);
|
| + cmds::Uniform3fv cmd;
|
| cmd.Init(1, 2, shared_memory_id_, kInvalidSharedMemoryOffset);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| }
|
| @@ -970,8 +981,8 @@ TEST_F(GLES2DecoderTest2, Uniform3fvValidArgsCountTooLarge) {
|
| EXPECT_CALL(
|
| *gl_, Uniform3fv(
|
| 3, 3, reinterpret_cast<const GLfloat*>(shared_memory_address_)));
|
| - SpecializedSetup<Uniform3fv, 0>(true);
|
| - Uniform3fv cmd;
|
| + SpecializedSetup<cmds::Uniform3fv, 0>(true);
|
| + cmds::Uniform3fv cmd;
|
| cmd.Init(
|
| ProgramManager::MakeFakeLocation(
|
| 1, 1), 5, shared_memory_id_, shared_memory_offset_);
|
| @@ -980,12 +991,13 @@ TEST_F(GLES2DecoderTest2, Uniform3fvValidArgsCountTooLarge) {
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, Uniform3fvImmediateValidArgs) {
|
| - Uniform3fvImmediate& cmd = *GetImmediateAs<Uniform3fvImmediate>();
|
| + cmds::Uniform3fvImmediate& cmd =
|
| + *GetImmediateAs<cmds::Uniform3fvImmediate>();
|
| EXPECT_CALL(
|
| *gl_,
|
| Uniform3fv(1, 2,
|
| reinterpret_cast<GLfloat*>(ImmediateDataAddress(&cmd))));
|
| - SpecializedSetup<Uniform3fvImmediate, 0>(true);
|
| + SpecializedSetup<cmds::Uniform3fvImmediate, 0>(true);
|
| GLfloat temp[3 * 2] = { 0, };
|
| cmd.Init(1, 2, &temp[0]);
|
| EXPECT_EQ(error::kNoError,
|
| @@ -995,8 +1007,8 @@ TEST_F(GLES2DecoderTest2, Uniform3fvImmediateValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest2, Uniform3iValidArgs) {
|
| EXPECT_CALL(*gl_, Uniform3iv(1, 1, _));
|
| - SpecializedSetup<Uniform3i, 0>(true);
|
| - Uniform3i cmd;
|
| + SpecializedSetup<cmds::Uniform3i, 0>(true);
|
| + cmds::Uniform3i cmd;
|
| cmd.Init(1, 2, 3, 4);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -1006,8 +1018,8 @@ TEST_F(GLES2DecoderTest2, Uniform3ivValidArgs) {
|
| EXPECT_CALL(
|
| *gl_, Uniform3iv(
|
| 1, 2, reinterpret_cast<const GLint*>(shared_memory_address_)));
|
| - SpecializedSetup<Uniform3iv, 0>(true);
|
| - Uniform3iv cmd;
|
| + SpecializedSetup<cmds::Uniform3iv, 0>(true);
|
| + cmds::Uniform3iv cmd;
|
| cmd.Init(1, 2, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -1015,8 +1027,8 @@ TEST_F(GLES2DecoderTest2, Uniform3ivValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest2, Uniform3ivInvalidArgs1_0) {
|
| EXPECT_CALL(*gl_, Uniform3iv(_, _, _)).Times(0);
|
| - SpecializedSetup<Uniform3iv, 0>(false);
|
| - Uniform3iv cmd;
|
| + SpecializedSetup<cmds::Uniform3iv, 0>(false);
|
| + cmds::Uniform3iv cmd;
|
| cmd.Init(1, -1, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -1024,16 +1036,16 @@ TEST_F(GLES2DecoderTest2, Uniform3ivInvalidArgs1_0) {
|
|
|
| TEST_F(GLES2DecoderTest2, Uniform3ivInvalidArgs2_0) {
|
| EXPECT_CALL(*gl_, Uniform3iv(_, _, _)).Times(0);
|
| - SpecializedSetup<Uniform3iv, 0>(false);
|
| - Uniform3iv cmd;
|
| + SpecializedSetup<cmds::Uniform3iv, 0>(false);
|
| + cmds::Uniform3iv cmd;
|
| cmd.Init(1, 2, kInvalidSharedMemoryId, 0);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, Uniform3ivInvalidArgs2_1) {
|
| EXPECT_CALL(*gl_, Uniform3iv(_, _, _)).Times(0);
|
| - SpecializedSetup<Uniform3iv, 0>(false);
|
| - Uniform3iv cmd;
|
| + SpecializedSetup<cmds::Uniform3iv, 0>(false);
|
| + cmds::Uniform3iv cmd;
|
| cmd.Init(1, 2, shared_memory_id_, kInvalidSharedMemoryOffset);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| }
|
| @@ -1042,8 +1054,8 @@ TEST_F(GLES2DecoderTest2, Uniform3ivValidArgsCountTooLarge) {
|
| EXPECT_CALL(
|
| *gl_, Uniform3iv(
|
| 3, 3, reinterpret_cast<const GLint*>(shared_memory_address_)));
|
| - SpecializedSetup<Uniform3iv, 0>(true);
|
| - Uniform3iv cmd;
|
| + SpecializedSetup<cmds::Uniform3iv, 0>(true);
|
| + cmds::Uniform3iv cmd;
|
| cmd.Init(
|
| ProgramManager::MakeFakeLocation(
|
| 1, 1), 5, shared_memory_id_, shared_memory_offset_);
|
| @@ -1052,12 +1064,13 @@ TEST_F(GLES2DecoderTest2, Uniform3ivValidArgsCountTooLarge) {
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, Uniform3ivImmediateValidArgs) {
|
| - Uniform3ivImmediate& cmd = *GetImmediateAs<Uniform3ivImmediate>();
|
| + cmds::Uniform3ivImmediate& cmd =
|
| + *GetImmediateAs<cmds::Uniform3ivImmediate>();
|
| EXPECT_CALL(
|
| *gl_,
|
| Uniform3iv(1, 2,
|
| reinterpret_cast<GLint*>(ImmediateDataAddress(&cmd))));
|
| - SpecializedSetup<Uniform3ivImmediate, 0>(true);
|
| + SpecializedSetup<cmds::Uniform3ivImmediate, 0>(true);
|
| GLint temp[3 * 2] = { 0, };
|
| cmd.Init(1, 2, &temp[0]);
|
| EXPECT_EQ(error::kNoError,
|
| @@ -1067,8 +1080,8 @@ TEST_F(GLES2DecoderTest2, Uniform3ivImmediateValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest2, Uniform4fValidArgs) {
|
| EXPECT_CALL(*gl_, Uniform4fv(1, 1, _));
|
| - SpecializedSetup<Uniform4f, 0>(true);
|
| - Uniform4f cmd;
|
| + SpecializedSetup<cmds::Uniform4f, 0>(true);
|
| + cmds::Uniform4f cmd;
|
| cmd.Init(1, 2, 3, 4, 5);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -1078,8 +1091,8 @@ TEST_F(GLES2DecoderTest2, Uniform4fvValidArgs) {
|
| EXPECT_CALL(
|
| *gl_, Uniform4fv(
|
| 1, 2, reinterpret_cast<const GLfloat*>(shared_memory_address_)));
|
| - SpecializedSetup<Uniform4fv, 0>(true);
|
| - Uniform4fv cmd;
|
| + SpecializedSetup<cmds::Uniform4fv, 0>(true);
|
| + cmds::Uniform4fv cmd;
|
| cmd.Init(1, 2, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -1087,8 +1100,8 @@ TEST_F(GLES2DecoderTest2, Uniform4fvValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest2, Uniform4fvInvalidArgs1_0) {
|
| EXPECT_CALL(*gl_, Uniform4fv(_, _, _)).Times(0);
|
| - SpecializedSetup<Uniform4fv, 0>(false);
|
| - Uniform4fv cmd;
|
| + SpecializedSetup<cmds::Uniform4fv, 0>(false);
|
| + cmds::Uniform4fv cmd;
|
| cmd.Init(1, -1, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -1096,16 +1109,16 @@ TEST_F(GLES2DecoderTest2, Uniform4fvInvalidArgs1_0) {
|
|
|
| TEST_F(GLES2DecoderTest2, Uniform4fvInvalidArgs2_0) {
|
| EXPECT_CALL(*gl_, Uniform4fv(_, _, _)).Times(0);
|
| - SpecializedSetup<Uniform4fv, 0>(false);
|
| - Uniform4fv cmd;
|
| + SpecializedSetup<cmds::Uniform4fv, 0>(false);
|
| + cmds::Uniform4fv cmd;
|
| cmd.Init(1, 2, kInvalidSharedMemoryId, 0);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, Uniform4fvInvalidArgs2_1) {
|
| EXPECT_CALL(*gl_, Uniform4fv(_, _, _)).Times(0);
|
| - SpecializedSetup<Uniform4fv, 0>(false);
|
| - Uniform4fv cmd;
|
| + SpecializedSetup<cmds::Uniform4fv, 0>(false);
|
| + cmds::Uniform4fv cmd;
|
| cmd.Init(1, 2, shared_memory_id_, kInvalidSharedMemoryOffset);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| }
|
| @@ -1114,8 +1127,8 @@ TEST_F(GLES2DecoderTest2, Uniform4fvValidArgsCountTooLarge) {
|
| EXPECT_CALL(
|
| *gl_, Uniform4fv(
|
| 3, 3, reinterpret_cast<const GLfloat*>(shared_memory_address_)));
|
| - SpecializedSetup<Uniform4fv, 0>(true);
|
| - Uniform4fv cmd;
|
| + SpecializedSetup<cmds::Uniform4fv, 0>(true);
|
| + cmds::Uniform4fv cmd;
|
| cmd.Init(
|
| ProgramManager::MakeFakeLocation(
|
| 1, 1), 5, shared_memory_id_, shared_memory_offset_);
|
| @@ -1124,12 +1137,13 @@ TEST_F(GLES2DecoderTest2, Uniform4fvValidArgsCountTooLarge) {
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, Uniform4fvImmediateValidArgs) {
|
| - Uniform4fvImmediate& cmd = *GetImmediateAs<Uniform4fvImmediate>();
|
| + cmds::Uniform4fvImmediate& cmd =
|
| + *GetImmediateAs<cmds::Uniform4fvImmediate>();
|
| EXPECT_CALL(
|
| *gl_,
|
| Uniform4fv(1, 2,
|
| reinterpret_cast<GLfloat*>(ImmediateDataAddress(&cmd))));
|
| - SpecializedSetup<Uniform4fvImmediate, 0>(true);
|
| + SpecializedSetup<cmds::Uniform4fvImmediate, 0>(true);
|
| GLfloat temp[4 * 2] = { 0, };
|
| cmd.Init(1, 2, &temp[0]);
|
| EXPECT_EQ(error::kNoError,
|
| @@ -1139,8 +1153,8 @@ TEST_F(GLES2DecoderTest2, Uniform4fvImmediateValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest2, Uniform4iValidArgs) {
|
| EXPECT_CALL(*gl_, Uniform4iv(1, 1, _));
|
| - SpecializedSetup<Uniform4i, 0>(true);
|
| - Uniform4i cmd;
|
| + SpecializedSetup<cmds::Uniform4i, 0>(true);
|
| + cmds::Uniform4i cmd;
|
| cmd.Init(1, 2, 3, 4, 5);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -1150,8 +1164,8 @@ TEST_F(GLES2DecoderTest2, Uniform4ivValidArgs) {
|
| EXPECT_CALL(
|
| *gl_, Uniform4iv(
|
| 1, 2, reinterpret_cast<const GLint*>(shared_memory_address_)));
|
| - SpecializedSetup<Uniform4iv, 0>(true);
|
| - Uniform4iv cmd;
|
| + SpecializedSetup<cmds::Uniform4iv, 0>(true);
|
| + cmds::Uniform4iv cmd;
|
| cmd.Init(1, 2, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -1159,8 +1173,8 @@ TEST_F(GLES2DecoderTest2, Uniform4ivValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest2, Uniform4ivInvalidArgs1_0) {
|
| EXPECT_CALL(*gl_, Uniform4iv(_, _, _)).Times(0);
|
| - SpecializedSetup<Uniform4iv, 0>(false);
|
| - Uniform4iv cmd;
|
| + SpecializedSetup<cmds::Uniform4iv, 0>(false);
|
| + cmds::Uniform4iv cmd;
|
| cmd.Init(1, -1, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -1168,16 +1182,16 @@ TEST_F(GLES2DecoderTest2, Uniform4ivInvalidArgs1_0) {
|
|
|
| TEST_F(GLES2DecoderTest2, Uniform4ivInvalidArgs2_0) {
|
| EXPECT_CALL(*gl_, Uniform4iv(_, _, _)).Times(0);
|
| - SpecializedSetup<Uniform4iv, 0>(false);
|
| - Uniform4iv cmd;
|
| + SpecializedSetup<cmds::Uniform4iv, 0>(false);
|
| + cmds::Uniform4iv cmd;
|
| cmd.Init(1, 2, kInvalidSharedMemoryId, 0);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, Uniform4ivInvalidArgs2_1) {
|
| EXPECT_CALL(*gl_, Uniform4iv(_, _, _)).Times(0);
|
| - SpecializedSetup<Uniform4iv, 0>(false);
|
| - Uniform4iv cmd;
|
| + SpecializedSetup<cmds::Uniform4iv, 0>(false);
|
| + cmds::Uniform4iv cmd;
|
| cmd.Init(1, 2, shared_memory_id_, kInvalidSharedMemoryOffset);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| }
|
| @@ -1186,8 +1200,8 @@ TEST_F(GLES2DecoderTest2, Uniform4ivValidArgsCountTooLarge) {
|
| EXPECT_CALL(
|
| *gl_, Uniform4iv(
|
| 3, 3, reinterpret_cast<const GLint*>(shared_memory_address_)));
|
| - SpecializedSetup<Uniform4iv, 0>(true);
|
| - Uniform4iv cmd;
|
| + SpecializedSetup<cmds::Uniform4iv, 0>(true);
|
| + cmds::Uniform4iv cmd;
|
| cmd.Init(
|
| ProgramManager::MakeFakeLocation(
|
| 1, 1), 5, shared_memory_id_, shared_memory_offset_);
|
| @@ -1196,12 +1210,13 @@ TEST_F(GLES2DecoderTest2, Uniform4ivValidArgsCountTooLarge) {
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, Uniform4ivImmediateValidArgs) {
|
| - Uniform4ivImmediate& cmd = *GetImmediateAs<Uniform4ivImmediate>();
|
| + cmds::Uniform4ivImmediate& cmd =
|
| + *GetImmediateAs<cmds::Uniform4ivImmediate>();
|
| EXPECT_CALL(
|
| *gl_,
|
| Uniform4iv(1, 2,
|
| reinterpret_cast<GLint*>(ImmediateDataAddress(&cmd))));
|
| - SpecializedSetup<Uniform4ivImmediate, 0>(true);
|
| + SpecializedSetup<cmds::Uniform4ivImmediate, 0>(true);
|
| GLint temp[4 * 2] = { 0, };
|
| cmd.Init(1, 2, &temp[0]);
|
| EXPECT_EQ(error::kNoError,
|
| @@ -1214,8 +1229,8 @@ TEST_F(GLES2DecoderTest2, UniformMatrix2fvValidArgs) {
|
| *gl_, UniformMatrix2fv(
|
| 1, 2, false, reinterpret_cast<const GLfloat*>(
|
| shared_memory_address_)));
|
| - SpecializedSetup<UniformMatrix2fv, 0>(true);
|
| - UniformMatrix2fv cmd;
|
| + SpecializedSetup<cmds::UniformMatrix2fv, 0>(true);
|
| + cmds::UniformMatrix2fv cmd;
|
| cmd.Init(1, 2, false, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -1223,8 +1238,8 @@ TEST_F(GLES2DecoderTest2, UniformMatrix2fvValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest2, UniformMatrix2fvInvalidArgs1_0) {
|
| EXPECT_CALL(*gl_, UniformMatrix2fv(_, _, _, _)).Times(0);
|
| - SpecializedSetup<UniformMatrix2fv, 0>(false);
|
| - UniformMatrix2fv cmd;
|
| + SpecializedSetup<cmds::UniformMatrix2fv, 0>(false);
|
| + cmds::UniformMatrix2fv cmd;
|
| cmd.Init(1, -1, false, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -1232,8 +1247,8 @@ TEST_F(GLES2DecoderTest2, UniformMatrix2fvInvalidArgs1_0) {
|
|
|
| TEST_F(GLES2DecoderTest2, UniformMatrix2fvInvalidArgs2_0) {
|
| EXPECT_CALL(*gl_, UniformMatrix2fv(_, _, _, _)).Times(0);
|
| - SpecializedSetup<UniformMatrix2fv, 0>(false);
|
| - UniformMatrix2fv cmd;
|
| + SpecializedSetup<cmds::UniformMatrix2fv, 0>(false);
|
| + cmds::UniformMatrix2fv cmd;
|
| cmd.Init(1, 2, true, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_INVALID_VALUE, GetGLError());
|
| @@ -1241,16 +1256,16 @@ TEST_F(GLES2DecoderTest2, UniformMatrix2fvInvalidArgs2_0) {
|
|
|
| TEST_F(GLES2DecoderTest2, UniformMatrix2fvInvalidArgs3_0) {
|
| EXPECT_CALL(*gl_, UniformMatrix2fv(_, _, _, _)).Times(0);
|
| - SpecializedSetup<UniformMatrix2fv, 0>(false);
|
| - UniformMatrix2fv cmd;
|
| + SpecializedSetup<cmds::UniformMatrix2fv, 0>(false);
|
| + cmds::UniformMatrix2fv cmd;
|
| cmd.Init(1, 2, false, kInvalidSharedMemoryId, 0);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, UniformMatrix2fvInvalidArgs3_1) {
|
| EXPECT_CALL(*gl_, UniformMatrix2fv(_, _, _, _)).Times(0);
|
| - SpecializedSetup<UniformMatrix2fv, 0>(false);
|
| - UniformMatrix2fv cmd;
|
| + SpecializedSetup<cmds::UniformMatrix2fv, 0>(false);
|
| + cmds::UniformMatrix2fv cmd;
|
| cmd.Init(1, 2, false, shared_memory_id_, kInvalidSharedMemoryOffset);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| }
|
| @@ -1260,8 +1275,8 @@ TEST_F(GLES2DecoderTest2, UniformMatrix2fvValidArgsCountTooLarge) {
|
| *gl_, UniformMatrix2fv(
|
| 3, 3, false, reinterpret_cast<const GLfloat*>(
|
| shared_memory_address_)));
|
| - SpecializedSetup<UniformMatrix2fv, 0>(true);
|
| - UniformMatrix2fv cmd;
|
| + SpecializedSetup<cmds::UniformMatrix2fv, 0>(true);
|
| + cmds::UniformMatrix2fv cmd;
|
| cmd.Init(
|
| ProgramManager::MakeFakeLocation(
|
| 1, 1), 5, false, shared_memory_id_, shared_memory_offset_);
|
| @@ -1270,13 +1285,13 @@ TEST_F(GLES2DecoderTest2, UniformMatrix2fvValidArgsCountTooLarge) {
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, UniformMatrix2fvImmediateValidArgs) {
|
| - UniformMatrix2fvImmediate& cmd =
|
| - *GetImmediateAs<UniformMatrix2fvImmediate>();
|
| + cmds::UniformMatrix2fvImmediate& cmd =
|
| + *GetImmediateAs<cmds::UniformMatrix2fvImmediate>();
|
| EXPECT_CALL(
|
| *gl_,
|
| UniformMatrix2fv(1, 2, false,
|
| reinterpret_cast<GLfloat*>(ImmediateDataAddress(&cmd))));
|
| - SpecializedSetup<UniformMatrix2fvImmediate, 0>(true);
|
| + SpecializedSetup<cmds::UniformMatrix2fvImmediate, 0>(true);
|
| GLfloat temp[4 * 2] = { 0, };
|
| cmd.Init(1, 2, false, &temp[0]);
|
| EXPECT_EQ(error::kNoError,
|
| @@ -1285,10 +1300,10 @@ TEST_F(GLES2DecoderTest2, UniformMatrix2fvImmediateValidArgs) {
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, UniformMatrix2fvImmediateInvalidArgs2_0) {
|
| - UniformMatrix2fvImmediate& cmd =
|
| - *GetImmediateAs<UniformMatrix2fvImmediate>();
|
| + cmds::UniformMatrix2fvImmediate& cmd =
|
| + *GetImmediateAs<cmds::UniformMatrix2fvImmediate>();
|
| EXPECT_CALL(*gl_, UniformMatrix2fv(_, _, _, _)).Times(0);
|
| - SpecializedSetup<UniformMatrix2fvImmediate, 0>(false);
|
| + SpecializedSetup<cmds::UniformMatrix2fvImmediate, 0>(false);
|
| GLfloat temp[4 * 2] = { 0, };
|
| cmd.Init(1, 2, true, &temp[0]);
|
| EXPECT_EQ(error::kNoError,
|
| @@ -1301,8 +1316,8 @@ TEST_F(GLES2DecoderTest2, UniformMatrix3fvValidArgs) {
|
| *gl_, UniformMatrix3fv(
|
| 1, 2, false, reinterpret_cast<const GLfloat*>(
|
| shared_memory_address_)));
|
| - SpecializedSetup<UniformMatrix3fv, 0>(true);
|
| - UniformMatrix3fv cmd;
|
| + SpecializedSetup<cmds::UniformMatrix3fv, 0>(true);
|
| + cmds::UniformMatrix3fv cmd;
|
| cmd.Init(1, 2, false, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -1310,8 +1325,8 @@ TEST_F(GLES2DecoderTest2, UniformMatrix3fvValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest2, UniformMatrix3fvInvalidArgs1_0) {
|
| EXPECT_CALL(*gl_, UniformMatrix3fv(_, _, _, _)).Times(0);
|
| - SpecializedSetup<UniformMatrix3fv, 0>(false);
|
| - UniformMatrix3fv cmd;
|
| + SpecializedSetup<cmds::UniformMatrix3fv, 0>(false);
|
| + cmds::UniformMatrix3fv cmd;
|
| cmd.Init(1, -1, false, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -1319,8 +1334,8 @@ TEST_F(GLES2DecoderTest2, UniformMatrix3fvInvalidArgs1_0) {
|
|
|
| TEST_F(GLES2DecoderTest2, UniformMatrix3fvInvalidArgs2_0) {
|
| EXPECT_CALL(*gl_, UniformMatrix3fv(_, _, _, _)).Times(0);
|
| - SpecializedSetup<UniformMatrix3fv, 0>(false);
|
| - UniformMatrix3fv cmd;
|
| + SpecializedSetup<cmds::UniformMatrix3fv, 0>(false);
|
| + cmds::UniformMatrix3fv cmd;
|
| cmd.Init(1, 2, true, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_INVALID_VALUE, GetGLError());
|
| @@ -1328,16 +1343,16 @@ TEST_F(GLES2DecoderTest2, UniformMatrix3fvInvalidArgs2_0) {
|
|
|
| TEST_F(GLES2DecoderTest2, UniformMatrix3fvInvalidArgs3_0) {
|
| EXPECT_CALL(*gl_, UniformMatrix3fv(_, _, _, _)).Times(0);
|
| - SpecializedSetup<UniformMatrix3fv, 0>(false);
|
| - UniformMatrix3fv cmd;
|
| + SpecializedSetup<cmds::UniformMatrix3fv, 0>(false);
|
| + cmds::UniformMatrix3fv cmd;
|
| cmd.Init(1, 2, false, kInvalidSharedMemoryId, 0);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, UniformMatrix3fvInvalidArgs3_1) {
|
| EXPECT_CALL(*gl_, UniformMatrix3fv(_, _, _, _)).Times(0);
|
| - SpecializedSetup<UniformMatrix3fv, 0>(false);
|
| - UniformMatrix3fv cmd;
|
| + SpecializedSetup<cmds::UniformMatrix3fv, 0>(false);
|
| + cmds::UniformMatrix3fv cmd;
|
| cmd.Init(1, 2, false, shared_memory_id_, kInvalidSharedMemoryOffset);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| }
|
| @@ -1347,8 +1362,8 @@ TEST_F(GLES2DecoderTest2, UniformMatrix3fvValidArgsCountTooLarge) {
|
| *gl_, UniformMatrix3fv(
|
| 3, 3, false, reinterpret_cast<const GLfloat*>(
|
| shared_memory_address_)));
|
| - SpecializedSetup<UniformMatrix3fv, 0>(true);
|
| - UniformMatrix3fv cmd;
|
| + SpecializedSetup<cmds::UniformMatrix3fv, 0>(true);
|
| + cmds::UniformMatrix3fv cmd;
|
| cmd.Init(
|
| ProgramManager::MakeFakeLocation(
|
| 1, 1), 5, false, shared_memory_id_, shared_memory_offset_);
|
| @@ -1357,13 +1372,13 @@ TEST_F(GLES2DecoderTest2, UniformMatrix3fvValidArgsCountTooLarge) {
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, UniformMatrix3fvImmediateValidArgs) {
|
| - UniformMatrix3fvImmediate& cmd =
|
| - *GetImmediateAs<UniformMatrix3fvImmediate>();
|
| + cmds::UniformMatrix3fvImmediate& cmd =
|
| + *GetImmediateAs<cmds::UniformMatrix3fvImmediate>();
|
| EXPECT_CALL(
|
| *gl_,
|
| UniformMatrix3fv(1, 2, false,
|
| reinterpret_cast<GLfloat*>(ImmediateDataAddress(&cmd))));
|
| - SpecializedSetup<UniformMatrix3fvImmediate, 0>(true);
|
| + SpecializedSetup<cmds::UniformMatrix3fvImmediate, 0>(true);
|
| GLfloat temp[9 * 2] = { 0, };
|
| cmd.Init(1, 2, false, &temp[0]);
|
| EXPECT_EQ(error::kNoError,
|
| @@ -1372,10 +1387,10 @@ TEST_F(GLES2DecoderTest2, UniformMatrix3fvImmediateValidArgs) {
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, UniformMatrix3fvImmediateInvalidArgs2_0) {
|
| - UniformMatrix3fvImmediate& cmd =
|
| - *GetImmediateAs<UniformMatrix3fvImmediate>();
|
| + cmds::UniformMatrix3fvImmediate& cmd =
|
| + *GetImmediateAs<cmds::UniformMatrix3fvImmediate>();
|
| EXPECT_CALL(*gl_, UniformMatrix3fv(_, _, _, _)).Times(0);
|
| - SpecializedSetup<UniformMatrix3fvImmediate, 0>(false);
|
| + SpecializedSetup<cmds::UniformMatrix3fvImmediate, 0>(false);
|
| GLfloat temp[9 * 2] = { 0, };
|
| cmd.Init(1, 2, true, &temp[0]);
|
| EXPECT_EQ(error::kNoError,
|
| @@ -1388,8 +1403,8 @@ TEST_F(GLES2DecoderTest2, UniformMatrix4fvValidArgs) {
|
| *gl_, UniformMatrix4fv(
|
| 1, 2, false, reinterpret_cast<const GLfloat*>(
|
| shared_memory_address_)));
|
| - SpecializedSetup<UniformMatrix4fv, 0>(true);
|
| - UniformMatrix4fv cmd;
|
| + SpecializedSetup<cmds::UniformMatrix4fv, 0>(true);
|
| + cmds::UniformMatrix4fv cmd;
|
| cmd.Init(1, 2, false, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -1397,8 +1412,8 @@ TEST_F(GLES2DecoderTest2, UniformMatrix4fvValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest2, UniformMatrix4fvInvalidArgs1_0) {
|
| EXPECT_CALL(*gl_, UniformMatrix4fv(_, _, _, _)).Times(0);
|
| - SpecializedSetup<UniformMatrix4fv, 0>(false);
|
| - UniformMatrix4fv cmd;
|
| + SpecializedSetup<cmds::UniformMatrix4fv, 0>(false);
|
| + cmds::UniformMatrix4fv cmd;
|
| cmd.Init(1, -1, false, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -1406,8 +1421,8 @@ TEST_F(GLES2DecoderTest2, UniformMatrix4fvInvalidArgs1_0) {
|
|
|
| TEST_F(GLES2DecoderTest2, UniformMatrix4fvInvalidArgs2_0) {
|
| EXPECT_CALL(*gl_, UniformMatrix4fv(_, _, _, _)).Times(0);
|
| - SpecializedSetup<UniformMatrix4fv, 0>(false);
|
| - UniformMatrix4fv cmd;
|
| + SpecializedSetup<cmds::UniformMatrix4fv, 0>(false);
|
| + cmds::UniformMatrix4fv cmd;
|
| cmd.Init(1, 2, true, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_INVALID_VALUE, GetGLError());
|
| @@ -1415,16 +1430,16 @@ TEST_F(GLES2DecoderTest2, UniformMatrix4fvInvalidArgs2_0) {
|
|
|
| TEST_F(GLES2DecoderTest2, UniformMatrix4fvInvalidArgs3_0) {
|
| EXPECT_CALL(*gl_, UniformMatrix4fv(_, _, _, _)).Times(0);
|
| - SpecializedSetup<UniformMatrix4fv, 0>(false);
|
| - UniformMatrix4fv cmd;
|
| + SpecializedSetup<cmds::UniformMatrix4fv, 0>(false);
|
| + cmds::UniformMatrix4fv cmd;
|
| cmd.Init(1, 2, false, kInvalidSharedMemoryId, 0);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, UniformMatrix4fvInvalidArgs3_1) {
|
| EXPECT_CALL(*gl_, UniformMatrix4fv(_, _, _, _)).Times(0);
|
| - SpecializedSetup<UniformMatrix4fv, 0>(false);
|
| - UniformMatrix4fv cmd;
|
| + SpecializedSetup<cmds::UniformMatrix4fv, 0>(false);
|
| + cmds::UniformMatrix4fv cmd;
|
| cmd.Init(1, 2, false, shared_memory_id_, kInvalidSharedMemoryOffset);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| }
|
| @@ -1434,8 +1449,8 @@ TEST_F(GLES2DecoderTest2, UniformMatrix4fvValidArgsCountTooLarge) {
|
| *gl_, UniformMatrix4fv(
|
| 3, 3, false, reinterpret_cast<const GLfloat*>(
|
| shared_memory_address_)));
|
| - SpecializedSetup<UniformMatrix4fv, 0>(true);
|
| - UniformMatrix4fv cmd;
|
| + SpecializedSetup<cmds::UniformMatrix4fv, 0>(true);
|
| + cmds::UniformMatrix4fv cmd;
|
| cmd.Init(
|
| ProgramManager::MakeFakeLocation(
|
| 1, 1), 5, false, shared_memory_id_, shared_memory_offset_);
|
| @@ -1444,13 +1459,13 @@ TEST_F(GLES2DecoderTest2, UniformMatrix4fvValidArgsCountTooLarge) {
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, UniformMatrix4fvImmediateValidArgs) {
|
| - UniformMatrix4fvImmediate& cmd =
|
| - *GetImmediateAs<UniformMatrix4fvImmediate>();
|
| + cmds::UniformMatrix4fvImmediate& cmd =
|
| + *GetImmediateAs<cmds::UniformMatrix4fvImmediate>();
|
| EXPECT_CALL(
|
| *gl_,
|
| UniformMatrix4fv(1, 2, false,
|
| reinterpret_cast<GLfloat*>(ImmediateDataAddress(&cmd))));
|
| - SpecializedSetup<UniformMatrix4fvImmediate, 0>(true);
|
| + SpecializedSetup<cmds::UniformMatrix4fvImmediate, 0>(true);
|
| GLfloat temp[16 * 2] = { 0, };
|
| cmd.Init(1, 2, false, &temp[0]);
|
| EXPECT_EQ(error::kNoError,
|
| @@ -1459,10 +1474,10 @@ TEST_F(GLES2DecoderTest2, UniformMatrix4fvImmediateValidArgs) {
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, UniformMatrix4fvImmediateInvalidArgs2_0) {
|
| - UniformMatrix4fvImmediate& cmd =
|
| - *GetImmediateAs<UniformMatrix4fvImmediate>();
|
| + cmds::UniformMatrix4fvImmediate& cmd =
|
| + *GetImmediateAs<cmds::UniformMatrix4fvImmediate>();
|
| EXPECT_CALL(*gl_, UniformMatrix4fv(_, _, _, _)).Times(0);
|
| - SpecializedSetup<UniformMatrix4fvImmediate, 0>(false);
|
| + SpecializedSetup<cmds::UniformMatrix4fvImmediate, 0>(false);
|
| GLfloat temp[16 * 2] = { 0, };
|
| cmd.Init(1, 2, true, &temp[0]);
|
| EXPECT_EQ(error::kNoError,
|
| @@ -1473,8 +1488,8 @@ TEST_F(GLES2DecoderTest2, UniformMatrix4fvImmediateInvalidArgs2_0) {
|
|
|
| TEST_F(GLES2DecoderTest2, ValidateProgramValidArgs) {
|
| EXPECT_CALL(*gl_, ValidateProgram(kServiceProgramId));
|
| - SpecializedSetup<ValidateProgram, 0>(true);
|
| - ValidateProgram cmd;
|
| + SpecializedSetup<cmds::ValidateProgram, 0>(true);
|
| + cmds::ValidateProgram cmd;
|
| cmd.Init(client_program_id_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -1482,8 +1497,8 @@ TEST_F(GLES2DecoderTest2, ValidateProgramValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest2, VertexAttrib1fValidArgs) {
|
| EXPECT_CALL(*gl_, VertexAttrib1f(1, 2));
|
| - SpecializedSetup<VertexAttrib1f, 0>(true);
|
| - VertexAttrib1f cmd;
|
| + SpecializedSetup<cmds::VertexAttrib1f, 0>(true);
|
| + cmds::VertexAttrib1f cmd;
|
| cmd.Init(1, 2);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -1493,8 +1508,8 @@ TEST_F(GLES2DecoderTest2, VertexAttrib1fvValidArgs) {
|
| EXPECT_CALL(
|
| *gl_, VertexAttrib1fv(
|
| 1, reinterpret_cast<const GLfloat*>(shared_memory_address_)));
|
| - SpecializedSetup<VertexAttrib1fv, 0>(true);
|
| - VertexAttrib1fv cmd;
|
| + SpecializedSetup<cmds::VertexAttrib1fv, 0>(true);
|
| + cmds::VertexAttrib1fv cmd;
|
| cmd.Init(1, shared_memory_id_, shared_memory_offset_);
|
| GetSharedMemoryAs<GLfloat*>()[0] = 0;
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| @@ -1503,8 +1518,8 @@ TEST_F(GLES2DecoderTest2, VertexAttrib1fvValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest2, VertexAttrib1fvInvalidArgs1_0) {
|
| EXPECT_CALL(*gl_, VertexAttrib1fv(_, _)).Times(0);
|
| - SpecializedSetup<VertexAttrib1fv, 0>(false);
|
| - VertexAttrib1fv cmd;
|
| + SpecializedSetup<cmds::VertexAttrib1fv, 0>(false);
|
| + cmds::VertexAttrib1fv cmd;
|
| cmd.Init(1, kInvalidSharedMemoryId, 0);
|
| GetSharedMemoryAs<GLfloat*>()[0] = 0;
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| @@ -1512,20 +1527,21 @@ TEST_F(GLES2DecoderTest2, VertexAttrib1fvInvalidArgs1_0) {
|
|
|
| TEST_F(GLES2DecoderTest2, VertexAttrib1fvInvalidArgs1_1) {
|
| EXPECT_CALL(*gl_, VertexAttrib1fv(_, _)).Times(0);
|
| - SpecializedSetup<VertexAttrib1fv, 0>(false);
|
| - VertexAttrib1fv cmd;
|
| + SpecializedSetup<cmds::VertexAttrib1fv, 0>(false);
|
| + cmds::VertexAttrib1fv cmd;
|
| cmd.Init(1, shared_memory_id_, kInvalidSharedMemoryOffset);
|
| GetSharedMemoryAs<GLfloat*>()[0] = 0;
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, VertexAttrib1fvImmediateValidArgs) {
|
| - VertexAttrib1fvImmediate& cmd = *GetImmediateAs<VertexAttrib1fvImmediate>();
|
| + cmds::VertexAttrib1fvImmediate& cmd =
|
| + *GetImmediateAs<cmds::VertexAttrib1fvImmediate>();
|
| EXPECT_CALL(
|
| *gl_,
|
| VertexAttrib1fv(1,
|
| reinterpret_cast<GLfloat*>(ImmediateDataAddress(&cmd))));
|
| - SpecializedSetup<VertexAttrib1fvImmediate, 0>(true);
|
| + SpecializedSetup<cmds::VertexAttrib1fvImmediate, 0>(true);
|
| GLfloat temp[1] = { 0, };
|
| cmd.Init(1, &temp[0]);
|
| EXPECT_EQ(error::kNoError,
|
| @@ -1535,8 +1551,8 @@ TEST_F(GLES2DecoderTest2, VertexAttrib1fvImmediateValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest2, VertexAttrib2fValidArgs) {
|
| EXPECT_CALL(*gl_, VertexAttrib2f(1, 2, 3));
|
| - SpecializedSetup<VertexAttrib2f, 0>(true);
|
| - VertexAttrib2f cmd;
|
| + SpecializedSetup<cmds::VertexAttrib2f, 0>(true);
|
| + cmds::VertexAttrib2f cmd;
|
| cmd.Init(1, 2, 3);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -1546,8 +1562,8 @@ TEST_F(GLES2DecoderTest2, VertexAttrib2fvValidArgs) {
|
| EXPECT_CALL(
|
| *gl_, VertexAttrib2fv(
|
| 1, reinterpret_cast<const GLfloat*>(shared_memory_address_)));
|
| - SpecializedSetup<VertexAttrib2fv, 0>(true);
|
| - VertexAttrib2fv cmd;
|
| + SpecializedSetup<cmds::VertexAttrib2fv, 0>(true);
|
| + cmds::VertexAttrib2fv cmd;
|
| cmd.Init(1, shared_memory_id_, shared_memory_offset_);
|
| GetSharedMemoryAs<GLfloat*>()[0] = 0;
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| @@ -1556,8 +1572,8 @@ TEST_F(GLES2DecoderTest2, VertexAttrib2fvValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest2, VertexAttrib2fvInvalidArgs1_0) {
|
| EXPECT_CALL(*gl_, VertexAttrib2fv(_, _)).Times(0);
|
| - SpecializedSetup<VertexAttrib2fv, 0>(false);
|
| - VertexAttrib2fv cmd;
|
| + SpecializedSetup<cmds::VertexAttrib2fv, 0>(false);
|
| + cmds::VertexAttrib2fv cmd;
|
| cmd.Init(1, kInvalidSharedMemoryId, 0);
|
| GetSharedMemoryAs<GLfloat*>()[0] = 0;
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| @@ -1565,20 +1581,21 @@ TEST_F(GLES2DecoderTest2, VertexAttrib2fvInvalidArgs1_0) {
|
|
|
| TEST_F(GLES2DecoderTest2, VertexAttrib2fvInvalidArgs1_1) {
|
| EXPECT_CALL(*gl_, VertexAttrib2fv(_, _)).Times(0);
|
| - SpecializedSetup<VertexAttrib2fv, 0>(false);
|
| - VertexAttrib2fv cmd;
|
| + SpecializedSetup<cmds::VertexAttrib2fv, 0>(false);
|
| + cmds::VertexAttrib2fv cmd;
|
| cmd.Init(1, shared_memory_id_, kInvalidSharedMemoryOffset);
|
| GetSharedMemoryAs<GLfloat*>()[0] = 0;
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, VertexAttrib2fvImmediateValidArgs) {
|
| - VertexAttrib2fvImmediate& cmd = *GetImmediateAs<VertexAttrib2fvImmediate>();
|
| + cmds::VertexAttrib2fvImmediate& cmd =
|
| + *GetImmediateAs<cmds::VertexAttrib2fvImmediate>();
|
| EXPECT_CALL(
|
| *gl_,
|
| VertexAttrib2fv(1,
|
| reinterpret_cast<GLfloat*>(ImmediateDataAddress(&cmd))));
|
| - SpecializedSetup<VertexAttrib2fvImmediate, 0>(true);
|
| + SpecializedSetup<cmds::VertexAttrib2fvImmediate, 0>(true);
|
| GLfloat temp[2] = { 0, };
|
| cmd.Init(1, &temp[0]);
|
| EXPECT_EQ(error::kNoError,
|
| @@ -1588,8 +1605,8 @@ TEST_F(GLES2DecoderTest2, VertexAttrib2fvImmediateValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest2, VertexAttrib3fValidArgs) {
|
| EXPECT_CALL(*gl_, VertexAttrib3f(1, 2, 3, 4));
|
| - SpecializedSetup<VertexAttrib3f, 0>(true);
|
| - VertexAttrib3f cmd;
|
| + SpecializedSetup<cmds::VertexAttrib3f, 0>(true);
|
| + cmds::VertexAttrib3f cmd;
|
| cmd.Init(1, 2, 3, 4);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -1599,8 +1616,8 @@ TEST_F(GLES2DecoderTest2, VertexAttrib3fvValidArgs) {
|
| EXPECT_CALL(
|
| *gl_, VertexAttrib3fv(
|
| 1, reinterpret_cast<const GLfloat*>(shared_memory_address_)));
|
| - SpecializedSetup<VertexAttrib3fv, 0>(true);
|
| - VertexAttrib3fv cmd;
|
| + SpecializedSetup<cmds::VertexAttrib3fv, 0>(true);
|
| + cmds::VertexAttrib3fv cmd;
|
| cmd.Init(1, shared_memory_id_, shared_memory_offset_);
|
| GetSharedMemoryAs<GLfloat*>()[0] = 0;
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| @@ -1609,8 +1626,8 @@ TEST_F(GLES2DecoderTest2, VertexAttrib3fvValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest2, VertexAttrib3fvInvalidArgs1_0) {
|
| EXPECT_CALL(*gl_, VertexAttrib3fv(_, _)).Times(0);
|
| - SpecializedSetup<VertexAttrib3fv, 0>(false);
|
| - VertexAttrib3fv cmd;
|
| + SpecializedSetup<cmds::VertexAttrib3fv, 0>(false);
|
| + cmds::VertexAttrib3fv cmd;
|
| cmd.Init(1, kInvalidSharedMemoryId, 0);
|
| GetSharedMemoryAs<GLfloat*>()[0] = 0;
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| @@ -1618,20 +1635,21 @@ TEST_F(GLES2DecoderTest2, VertexAttrib3fvInvalidArgs1_0) {
|
|
|
| TEST_F(GLES2DecoderTest2, VertexAttrib3fvInvalidArgs1_1) {
|
| EXPECT_CALL(*gl_, VertexAttrib3fv(_, _)).Times(0);
|
| - SpecializedSetup<VertexAttrib3fv, 0>(false);
|
| - VertexAttrib3fv cmd;
|
| + SpecializedSetup<cmds::VertexAttrib3fv, 0>(false);
|
| + cmds::VertexAttrib3fv cmd;
|
| cmd.Init(1, shared_memory_id_, kInvalidSharedMemoryOffset);
|
| GetSharedMemoryAs<GLfloat*>()[0] = 0;
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, VertexAttrib3fvImmediateValidArgs) {
|
| - VertexAttrib3fvImmediate& cmd = *GetImmediateAs<VertexAttrib3fvImmediate>();
|
| + cmds::VertexAttrib3fvImmediate& cmd =
|
| + *GetImmediateAs<cmds::VertexAttrib3fvImmediate>();
|
| EXPECT_CALL(
|
| *gl_,
|
| VertexAttrib3fv(1,
|
| reinterpret_cast<GLfloat*>(ImmediateDataAddress(&cmd))));
|
| - SpecializedSetup<VertexAttrib3fvImmediate, 0>(true);
|
| + SpecializedSetup<cmds::VertexAttrib3fvImmediate, 0>(true);
|
| GLfloat temp[3] = { 0, };
|
| cmd.Init(1, &temp[0]);
|
| EXPECT_EQ(error::kNoError,
|
| @@ -1641,8 +1659,8 @@ TEST_F(GLES2DecoderTest2, VertexAttrib3fvImmediateValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest2, VertexAttrib4fValidArgs) {
|
| EXPECT_CALL(*gl_, VertexAttrib4f(1, 2, 3, 4, 5));
|
| - SpecializedSetup<VertexAttrib4f, 0>(true);
|
| - VertexAttrib4f cmd;
|
| + SpecializedSetup<cmds::VertexAttrib4f, 0>(true);
|
| + cmds::VertexAttrib4f cmd;
|
| cmd.Init(1, 2, 3, 4, 5);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -1652,8 +1670,8 @@ TEST_F(GLES2DecoderTest2, VertexAttrib4fvValidArgs) {
|
| EXPECT_CALL(
|
| *gl_, VertexAttrib4fv(
|
| 1, reinterpret_cast<const GLfloat*>(shared_memory_address_)));
|
| - SpecializedSetup<VertexAttrib4fv, 0>(true);
|
| - VertexAttrib4fv cmd;
|
| + SpecializedSetup<cmds::VertexAttrib4fv, 0>(true);
|
| + cmds::VertexAttrib4fv cmd;
|
| cmd.Init(1, shared_memory_id_, shared_memory_offset_);
|
| GetSharedMemoryAs<GLfloat*>()[0] = 0;
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| @@ -1662,8 +1680,8 @@ TEST_F(GLES2DecoderTest2, VertexAttrib4fvValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest2, VertexAttrib4fvInvalidArgs1_0) {
|
| EXPECT_CALL(*gl_, VertexAttrib4fv(_, _)).Times(0);
|
| - SpecializedSetup<VertexAttrib4fv, 0>(false);
|
| - VertexAttrib4fv cmd;
|
| + SpecializedSetup<cmds::VertexAttrib4fv, 0>(false);
|
| + cmds::VertexAttrib4fv cmd;
|
| cmd.Init(1, kInvalidSharedMemoryId, 0);
|
| GetSharedMemoryAs<GLfloat*>()[0] = 0;
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| @@ -1671,20 +1689,21 @@ TEST_F(GLES2DecoderTest2, VertexAttrib4fvInvalidArgs1_0) {
|
|
|
| TEST_F(GLES2DecoderTest2, VertexAttrib4fvInvalidArgs1_1) {
|
| EXPECT_CALL(*gl_, VertexAttrib4fv(_, _)).Times(0);
|
| - SpecializedSetup<VertexAttrib4fv, 0>(false);
|
| - VertexAttrib4fv cmd;
|
| + SpecializedSetup<cmds::VertexAttrib4fv, 0>(false);
|
| + cmds::VertexAttrib4fv cmd;
|
| cmd.Init(1, shared_memory_id_, kInvalidSharedMemoryOffset);
|
| GetSharedMemoryAs<GLfloat*>()[0] = 0;
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, VertexAttrib4fvImmediateValidArgs) {
|
| - VertexAttrib4fvImmediate& cmd = *GetImmediateAs<VertexAttrib4fvImmediate>();
|
| + cmds::VertexAttrib4fvImmediate& cmd =
|
| + *GetImmediateAs<cmds::VertexAttrib4fvImmediate>();
|
| EXPECT_CALL(
|
| *gl_,
|
| VertexAttrib4fv(1,
|
| reinterpret_cast<GLfloat*>(ImmediateDataAddress(&cmd))));
|
| - SpecializedSetup<VertexAttrib4fvImmediate, 0>(true);
|
| + SpecializedSetup<cmds::VertexAttrib4fvImmediate, 0>(true);
|
| GLfloat temp[4] = { 0, };
|
| cmd.Init(1, &temp[0]);
|
| EXPECT_EQ(error::kNoError,
|
| @@ -1696,8 +1715,8 @@ TEST_F(GLES2DecoderTest2, VertexAttrib4fvImmediateValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest2, ViewportValidArgs) {
|
| EXPECT_CALL(*gl_, Viewport(1, 2, 3, 4));
|
| - SpecializedSetup<Viewport, 0>(true);
|
| - Viewport cmd;
|
| + SpecializedSetup<cmds::Viewport, 0>(true);
|
| + cmds::Viewport cmd;
|
| cmd.Init(1, 2, 3, 4);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| @@ -1705,8 +1724,8 @@ TEST_F(GLES2DecoderTest2, ViewportValidArgs) {
|
|
|
| TEST_F(GLES2DecoderTest2, ViewportInvalidArgs2_0) {
|
| EXPECT_CALL(*gl_, Viewport(_, _, _, _)).Times(0);
|
| - SpecializedSetup<Viewport, 0>(false);
|
| - Viewport cmd;
|
| + SpecializedSetup<cmds::Viewport, 0>(false);
|
| + cmds::Viewport cmd;
|
| cmd.Init(1, 2, -1, 4);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_INVALID_VALUE, GetGLError());
|
| @@ -1714,8 +1733,8 @@ TEST_F(GLES2DecoderTest2, ViewportInvalidArgs2_0) {
|
|
|
| TEST_F(GLES2DecoderTest2, ViewportInvalidArgs3_0) {
|
| EXPECT_CALL(*gl_, Viewport(_, _, _, _)).Times(0);
|
| - SpecializedSetup<Viewport, 0>(false);
|
| - Viewport cmd;
|
| + SpecializedSetup<cmds::Viewport, 0>(false);
|
| + cmds::Viewport cmd;
|
| cmd.Init(1, 2, 3, -1);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_INVALID_VALUE, GetGLError());
|
| @@ -1737,8 +1756,8 @@ TEST_F(GLES2DecoderTest2, ViewportInvalidArgs3_0) {
|
|
|
|
|
| TEST_F(GLES2DecoderTest2, PopGroupMarkerEXTValidArgs) {
|
| - SpecializedSetup<PopGroupMarkerEXT, 0>(true);
|
| - PopGroupMarkerEXT cmd;
|
| + SpecializedSetup<cmds::PopGroupMarkerEXT, 0>(true);
|
| + cmds::PopGroupMarkerEXT cmd;
|
| cmd.Init();
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
|
|