gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h - Issue 706203003: Update from https://crrev.com/303153

Unified Diff: gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h

Issue 706203003: Update from https://crrev.com/303153 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 6 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder_autogen.h ('k') | gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 b60bd3e4aa20674b3d484db3154173c0fc325d48..6fe923c11901379f9758f3fc6c85563ff383d96c 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

@@ -662,16 +662,12 @@ TEST_P(GLES2DecoderTest1, FlushValidArgs) {

}

TEST_P(GLES2DecoderTest1, FramebufferRenderbufferValidArgs) {

- EXPECT_CALL(*gl_,

- FramebufferRenderbufferEXT(GL_FRAMEBUFFER,

- GL_COLOR_ATTACHMENT0,

- GL_RENDERBUFFER,

- kServiceRenderbufferId));

+ EXPECT_CALL(*gl_, FramebufferRenderbufferEXT(

+ GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER,

+ kServiceRenderbufferId));

SpecializedSetup<cmds::FramebufferRenderbuffer, 0>(true);

cmds::FramebufferRenderbuffer cmd;

- cmd.Init(GL_FRAMEBUFFER,

- GL_COLOR_ATTACHMENT0,

- GL_RENDERBUFFER,

+ cmd.Init(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER,

client_renderbuffer_id_);

EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

EXPECT_EQ(GL_NO_ERROR, GetGLError());

@@ -681,9 +677,7 @@ TEST_P(GLES2DecoderTest1, FramebufferRenderbufferInvalidArgs0_0) {

EXPECT_CALL(*gl_, FramebufferRenderbufferEXT(_, _, _, _)).Times(0);

SpecializedSetup<cmds::FramebufferRenderbuffer, 0>(false);

cmds::FramebufferRenderbuffer cmd;

- cmd.Init(GL_DRAW_FRAMEBUFFER,

- GL_COLOR_ATTACHMENT0,

- GL_RENDERBUFFER,

+ cmd.Init(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER,

client_renderbuffer_id_);

EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

EXPECT_EQ(GL_INVALID_ENUM, GetGLError());

@@ -693,9 +687,7 @@ TEST_P(GLES2DecoderTest1, FramebufferRenderbufferInvalidArgs0_1) {

EXPECT_CALL(*gl_, FramebufferRenderbufferEXT(_, _, _, _)).Times(0);

SpecializedSetup<cmds::FramebufferRenderbuffer, 0>(false);

cmds::FramebufferRenderbuffer cmd;

- cmd.Init(GL_READ_FRAMEBUFFER,

- GL_COLOR_ATTACHMENT0,

- GL_RENDERBUFFER,

+ cmd.Init(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER,

client_renderbuffer_id_);

EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

EXPECT_EQ(GL_INVALID_ENUM, GetGLError());

@@ -705,9 +697,7 @@ TEST_P(GLES2DecoderTest1, FramebufferRenderbufferInvalidArgs2_0) {

EXPECT_CALL(*gl_, FramebufferRenderbufferEXT(_, _, _, _)).Times(0);

SpecializedSetup<cmds::FramebufferRenderbuffer, 0>(false);

cmds::FramebufferRenderbuffer cmd;

- cmd.Init(GL_FRAMEBUFFER,

- GL_COLOR_ATTACHMENT0,

- GL_FRAMEBUFFER,

+ cmd.Init(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_FRAMEBUFFER,

client_renderbuffer_id_);

EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

EXPECT_EQ(GL_INVALID_ENUM, GetGLError());

@@ -715,15 +705,12 @@ TEST_P(GLES2DecoderTest1, FramebufferRenderbufferInvalidArgs2_0) {

TEST_P(GLES2DecoderTest1, FramebufferTexture2DValidArgs) {

EXPECT_CALL(*gl_,

- FramebufferTexture2DEXT(GL_FRAMEBUFFER,

- GL_COLOR_ATTACHMENT0,

- GL_TEXTURE_2D,

- kServiceTextureId,

- 0));

+ FramebufferTexture2DEXT(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,

+ GL_TEXTURE_2D, kServiceTextureId, 0));

SpecializedSetup<cmds::FramebufferTexture2D, 0>(true);

cmds::FramebufferTexture2D cmd;

- cmd.Init(

- GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, client_texture_id_);

+ cmd.Init(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,

+ client_texture_id_);

EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

EXPECT_EQ(GL_NO_ERROR, GetGLError());

}

@@ -732,9 +719,7 @@ TEST_P(GLES2DecoderTest1, FramebufferTexture2DInvalidArgs0_0) {

EXPECT_CALL(*gl_, FramebufferTexture2DEXT(_, _, _, _, _)).Times(0);

SpecializedSetup<cmds::FramebufferTexture2D, 0>(false);

cmds::FramebufferTexture2D cmd;

- cmd.Init(GL_DRAW_FRAMEBUFFER,

- GL_COLOR_ATTACHMENT0,

- GL_TEXTURE_2D,

+ cmd.Init(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,

client_texture_id_);

EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

EXPECT_EQ(GL_INVALID_ENUM, GetGLError());

@@ -744,9 +729,7 @@ TEST_P(GLES2DecoderTest1, FramebufferTexture2DInvalidArgs0_1) {

EXPECT_CALL(*gl_, FramebufferTexture2DEXT(_, _, _, _, _)).Times(0);

SpecializedSetup<cmds::FramebufferTexture2D, 0>(false);

cmds::FramebufferTexture2D cmd;

- cmd.Init(GL_READ_FRAMEBUFFER,

- GL_COLOR_ATTACHMENT0,

- GL_TEXTURE_2D,

+ cmd.Init(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,

client_texture_id_);

EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

EXPECT_EQ(GL_INVALID_ENUM, GetGLError());

@@ -756,9 +739,7 @@ TEST_P(GLES2DecoderTest1, FramebufferTexture2DInvalidArgs2_0) {

EXPECT_CALL(*gl_, FramebufferTexture2DEXT(_, _, _, _, _)).Times(0);

SpecializedSetup<cmds::FramebufferTexture2D, 0>(false);

cmds::FramebufferTexture2D cmd;

- cmd.Init(GL_FRAMEBUFFER,

- GL_COLOR_ATTACHMENT0,

- GL_PROXY_TEXTURE_CUBE_MAP,

+ cmd.Init(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_PROXY_TEXTURE_CUBE_MAP,

client_texture_id_);

EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

EXPECT_EQ(GL_INVALID_ENUM, GetGLError());

@@ -958,9 +939,7 @@ TEST_P(GLES2DecoderTest1, GetBufferParameterivValidArgs) {

Result* result = static_cast<Result*>(shared_memory_address_);

result->size = 0;

cmds::GetBufferParameteriv cmd;

- cmd.Init(GL_ARRAY_BUFFER,

- GL_BUFFER_SIZE,

- shared_memory_id_,

+ cmd.Init(GL_ARRAY_BUFFER, GL_BUFFER_SIZE, shared_memory_id_,

shared_memory_offset_);

EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

EXPECT_EQ(decoder_->GetGLES2Util()->GLGetNumValuesReturned(GL_BUFFER_SIZE),

@@ -975,9 +954,7 @@ TEST_P(GLES2DecoderTest1, GetBufferParameterivInvalidArgs0_0) {

static_cast<cmds::GetBufferParameteriv::Result*>(shared_memory_address_);

result->size = 0;

cmds::GetBufferParameteriv cmd;

- cmd.Init(GL_RENDERBUFFER,

- GL_BUFFER_SIZE,

- shared_memory_id_,

+ cmd.Init(GL_RENDERBUFFER, GL_BUFFER_SIZE, shared_memory_id_,

shared_memory_offset_);

EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

EXPECT_EQ(0u, result->size);

@@ -991,9 +968,7 @@ TEST_P(GLES2DecoderTest1, GetBufferParameterivInvalidArgs1_0) {

static_cast<cmds::GetBufferParameteriv::Result*>(shared_memory_address_);

result->size = 0;

cmds::GetBufferParameteriv cmd;

- cmd.Init(GL_ARRAY_BUFFER,

- GL_PIXEL_PACK_BUFFER,

- shared_memory_id_,

+ cmd.Init(GL_ARRAY_BUFFER, GL_PIXEL_PACK_BUFFER, shared_memory_id_,

shared_memory_offset_);

EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

EXPECT_EQ(0u, result->size);

@@ -1019,9 +994,7 @@ TEST_P(GLES2DecoderTest1, GetBufferParameterivInvalidArgs2_1) {

static_cast<cmds::GetBufferParameteriv::Result*>(shared_memory_address_);

result->size = 0;

cmds::GetBufferParameteriv cmd;

- cmd.Init(GL_ARRAY_BUFFER,

- GL_BUFFER_SIZE,

- shared_memory_id_,

+ cmd.Init(GL_ARRAY_BUFFER, GL_BUFFER_SIZE, shared_memory_id_,

kInvalidSharedMemoryOffset);

EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));

EXPECT_EQ(0u, result->size);

@@ -1111,16 +1084,12 @@ TEST_P(GLES2DecoderTest1, GetFramebufferAttachmentParameterivValidArgs) {

Result* result = static_cast<Result*>(shared_memory_address_);

EXPECT_CALL(*gl_,

GetFramebufferAttachmentParameterivEXT(

- GL_FRAMEBUFFER,

- GL_COLOR_ATTACHMENT0,

- GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE,

- result->GetData()));

+ GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,

+ GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE, result->GetData()));

result->size = 0;

cmds::GetFramebufferAttachmentParameteriv cmd;

- cmd.Init(GL_FRAMEBUFFER,

- GL_COLOR_ATTACHMENT0,

- GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE,

- shared_memory_id_,

+ cmd.Init(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,

+ GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE, shared_memory_id_,

shared_memory_offset_);

EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

EXPECT_EQ(decoder_->GetGLES2Util()->GLGetNumValuesReturned(

@@ -1138,10 +1107,8 @@ TEST_P(GLES2DecoderTest1, GetFramebufferAttachmentParameterivInvalidArgs0_0) {

shared_memory_address_);

result->size = 0;

cmds::GetFramebufferAttachmentParameteriv cmd;

- cmd.Init(GL_DRAW_FRAMEBUFFER,

- GL_COLOR_ATTACHMENT0,

- GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE,

- shared_memory_id_,

+ cmd.Init(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,

+ GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE, shared_memory_id_,

shared_memory_offset_);

EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

EXPECT_EQ(0u, result->size);

@@ -1157,10 +1124,8 @@ TEST_P(GLES2DecoderTest1, GetFramebufferAttachmentParameterivInvalidArgs0_1) {

shared_memory_address_);

result->size = 0;

cmds::GetFramebufferAttachmentParameteriv cmd;

- cmd.Init(GL_READ_FRAMEBUFFER,

- GL_COLOR_ATTACHMENT0,

- GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE,

- shared_memory_id_,

+ cmd.Init(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,

+ GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE, shared_memory_id_,

shared_memory_offset_);

EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

EXPECT_EQ(0u, result->size);

@@ -1176,11 +1141,8 @@ TEST_P(GLES2DecoderTest1, GetFramebufferAttachmentParameterivInvalidArgs3_0) {

shared_memory_address_);

result->size = 0;

cmds::GetFramebufferAttachmentParameteriv cmd;

- cmd.Init(GL_FRAMEBUFFER,

- GL_COLOR_ATTACHMENT0,

- GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE,

- kInvalidSharedMemoryId,

- 0);

+ cmd.Init(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,

+ GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE, kInvalidSharedMemoryId, 0);

EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));

EXPECT_EQ(0u, result->size);

}

@@ -1194,10 +1156,8 @@ TEST_P(GLES2DecoderTest1, GetFramebufferAttachmentParameterivInvalidArgs3_1) {

shared_memory_address_);

result->size = 0;

cmds::GetFramebufferAttachmentParameteriv cmd;

- cmd.Init(GL_FRAMEBUFFER,

- GL_COLOR_ATTACHMENT0,

- GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE,

- shared_memory_id_,

+ cmd.Init(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,

+ GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE, shared_memory_id_,

kInvalidSharedMemoryOffset);

EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));

EXPECT_EQ(0u, result->size);

@@ -1264,9 +1224,7 @@ TEST_P(GLES2DecoderTest1, GetProgramivValidArgs) {

Result* result = static_cast<Result*>(shared_memory_address_);

result->size = 0;

cmds::GetProgramiv cmd;

- cmd.Init(client_program_id_,

- GL_DELETE_STATUS,

- shared_memory_id_,

+ cmd.Init(client_program_id_, GL_DELETE_STATUS, shared_memory_id_,

shared_memory_offset_);

EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

EXPECT_EQ(decoder_->GetGLES2Util()->GLGetNumValuesReturned(GL_DELETE_STATUS),

@@ -1293,9 +1251,7 @@ TEST_P(GLES2DecoderTest1, GetProgramivInvalidArgs2_1) {

static_cast<cmds::GetProgramiv::Result*>(shared_memory_address_);

result->size = 0;

cmds::GetProgramiv cmd;

- cmd.Init(client_program_id_,

- GL_DELETE_STATUS,

- shared_memory_id_,

+ cmd.Init(client_program_id_, GL_DELETE_STATUS, shared_memory_id_,

kInvalidSharedMemoryOffset);

EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));

EXPECT_EQ(0u, result->size);

@@ -1334,14 +1290,11 @@ TEST_P(GLES2DecoderTest1, GetRenderbufferParameterivValidArgs) {

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()));

+ *gl_, GetRenderbufferParameterivEXT(

+ GL_RENDERBUFFER, GL_RENDERBUFFER_RED_SIZE, result->GetData()));

result->size = 0;

cmds::GetRenderbufferParameteriv cmd;

- cmd.Init(GL_RENDERBUFFER,

- GL_RENDERBUFFER_RED_SIZE,

- shared_memory_id_,

+ cmd.Init(GL_RENDERBUFFER, GL_RENDERBUFFER_RED_SIZE, shared_memory_id_,

shared_memory_offset_);

EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

EXPECT_EQ(decoder_->GetGLES2Util()->GLGetNumValuesReturned(

@@ -1358,9 +1311,7 @@ TEST_P(GLES2DecoderTest1, GetRenderbufferParameterivInvalidArgs0_0) {

shared_memory_address_);

result->size = 0;

cmds::GetRenderbufferParameteriv cmd;

- cmd.Init(GL_FRAMEBUFFER,

- GL_RENDERBUFFER_RED_SIZE,

- shared_memory_id_,

+ cmd.Init(GL_FRAMEBUFFER, GL_RENDERBUFFER_RED_SIZE, shared_memory_id_,

shared_memory_offset_);

EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

EXPECT_EQ(0u, result->size);

@@ -1375,8 +1326,8 @@ TEST_P(GLES2DecoderTest1, GetRenderbufferParameterivInvalidArgs2_0) {

shared_memory_address_);

result->size = 0;

cmds::GetRenderbufferParameteriv cmd;

- cmd.Init(

- GL_RENDERBUFFER, GL_RENDERBUFFER_RED_SIZE, kInvalidSharedMemoryId, 0);

+ cmd.Init(GL_RENDERBUFFER, GL_RENDERBUFFER_RED_SIZE, kInvalidSharedMemoryId,

+ 0);

EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));

EXPECT_EQ(0u, result->size);

}

@@ -1389,9 +1340,7 @@ TEST_P(GLES2DecoderTest1, GetRenderbufferParameterivInvalidArgs2_1) {

shared_memory_address_);

result->size = 0;

cmds::GetRenderbufferParameteriv cmd;

- cmd.Init(GL_RENDERBUFFER,

- GL_RENDERBUFFER_RED_SIZE,

- shared_memory_id_,

+ cmd.Init(GL_RENDERBUFFER, GL_RENDERBUFFER_RED_SIZE, shared_memory_id_,

kInvalidSharedMemoryOffset);

EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));

EXPECT_EQ(0u, result->size);

@@ -1409,9 +1358,7 @@ TEST_P(GLES2DecoderTest1, GetShaderivValidArgs) {

GetShaderiv(kServiceShaderId, GL_SHADER_TYPE, result->GetData()));

result->size = 0;

cmds::GetShaderiv cmd;

- cmd.Init(client_shader_id_,

- GL_SHADER_TYPE,

- shared_memory_id_,

+ cmd.Init(client_shader_id_, GL_SHADER_TYPE, shared_memory_id_,

shared_memory_offset_);

EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

EXPECT_EQ(decoder_->GetGLES2Util()->GLGetNumValuesReturned(GL_SHADER_TYPE),

@@ -1438,9 +1385,7 @@ TEST_P(GLES2DecoderTest1, GetShaderivInvalidArgs2_1) {

static_cast<cmds::GetShaderiv::Result*>(shared_memory_address_);

result->size = 0;

cmds::GetShaderiv cmd;

- cmd.Init(client_shader_id_,

- GL_SHADER_TYPE,

- shared_memory_id_,

+ cmd.Init(client_shader_id_, GL_SHADER_TYPE, shared_memory_id_,

kInvalidSharedMemoryOffset);

EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));

EXPECT_EQ(0u, result->size);

@@ -1459,14 +1404,11 @@ TEST_P(GLES2DecoderTest1, GetTexParameterfvValidArgs) {

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()));

+ EXPECT_CALL(*gl_, GetTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,

+ result->GetData()));

result->size = 0;

cmds::GetTexParameterfv cmd;

- cmd.Init(GL_TEXTURE_2D,

- GL_TEXTURE_MAG_FILTER,

- shared_memory_id_,

+ cmd.Init(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, shared_memory_id_,

shared_memory_offset_);

EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

EXPECT_EQ(

@@ -1482,9 +1424,7 @@ TEST_P(GLES2DecoderTest1, GetTexParameterfvInvalidArgs0_0) {

static_cast<cmds::GetTexParameterfv::Result*>(shared_memory_address_);

result->size = 0;

cmds::GetTexParameterfv cmd;

- cmd.Init(GL_PROXY_TEXTURE_CUBE_MAP,

- GL_TEXTURE_MAG_FILTER,

- shared_memory_id_,

+ cmd.Init(GL_PROXY_TEXTURE_CUBE_MAP, GL_TEXTURE_MAG_FILTER, shared_memory_id_,

shared_memory_offset_);

EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

EXPECT_EQ(0u, result->size);

@@ -1498,9 +1438,7 @@ TEST_P(GLES2DecoderTest1, GetTexParameterfvInvalidArgs1_0) {

static_cast<cmds::GetTexParameterfv::Result*>(shared_memory_address_);

result->size = 0;

cmds::GetTexParameterfv cmd;

- cmd.Init(GL_TEXTURE_2D,

- GL_GENERATE_MIPMAP,

- shared_memory_id_,

+ cmd.Init(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, shared_memory_id_,

shared_memory_offset_);

EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

EXPECT_EQ(0u, result->size);

@@ -1526,9 +1464,7 @@ TEST_P(GLES2DecoderTest1, GetTexParameterfvInvalidArgs2_1) {

static_cast<cmds::GetTexParameterfv::Result*>(shared_memory_address_);

result->size = 0;

cmds::GetTexParameterfv cmd;

- cmd.Init(GL_TEXTURE_2D,

- GL_TEXTURE_MAG_FILTER,

- shared_memory_id_,

+ cmd.Init(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, shared_memory_id_,

kInvalidSharedMemoryOffset);

EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));

EXPECT_EQ(0u, result->size);

@@ -1542,14 +1478,11 @@ TEST_P(GLES2DecoderTest1, GetTexParameterivValidArgs) {

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()));

+ EXPECT_CALL(*gl_, GetTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,

+ result->GetData()));

result->size = 0;

cmds::GetTexParameteriv cmd;

- cmd.Init(GL_TEXTURE_2D,

- GL_TEXTURE_MAG_FILTER,

- shared_memory_id_,

+ cmd.Init(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, shared_memory_id_,

shared_memory_offset_);

EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

EXPECT_EQ(

@@ -1565,9 +1498,7 @@ TEST_P(GLES2DecoderTest1, GetTexParameterivInvalidArgs0_0) {

static_cast<cmds::GetTexParameteriv::Result*>(shared_memory_address_);

result->size = 0;

cmds::GetTexParameteriv cmd;

- cmd.Init(GL_PROXY_TEXTURE_CUBE_MAP,

- GL_TEXTURE_MAG_FILTER,

- shared_memory_id_,

+ cmd.Init(GL_PROXY_TEXTURE_CUBE_MAP, GL_TEXTURE_MAG_FILTER, shared_memory_id_,

shared_memory_offset_);

EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

EXPECT_EQ(0u, result->size);

@@ -1581,9 +1512,7 @@ TEST_P(GLES2DecoderTest1, GetTexParameterivInvalidArgs1_0) {

static_cast<cmds::GetTexParameteriv::Result*>(shared_memory_address_);

result->size = 0;

cmds::GetTexParameteriv cmd;

- cmd.Init(GL_TEXTURE_2D,

- GL_GENERATE_MIPMAP,

- shared_memory_id_,

+ cmd.Init(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, shared_memory_id_,

shared_memory_offset_);

EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

EXPECT_EQ(0u, result->size);

@@ -1609,9 +1538,7 @@ TEST_P(GLES2DecoderTest1, GetTexParameterivInvalidArgs2_1) {

static_cast<cmds::GetTexParameteriv::Result*>(shared_memory_address_);

result->size = 0;

cmds::GetTexParameteriv cmd;

- cmd.Init(GL_TEXTURE_2D,

- GL_TEXTURE_MAG_FILTER,

- shared_memory_id_,

+ cmd.Init(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, shared_memory_id_,

kInvalidSharedMemoryOffset);

EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));

EXPECT_EQ(0u, result->size);

@@ -1628,9 +1555,7 @@ TEST_P(GLES2DecoderTest1, GetVertexAttribfvValidArgs) {

Result* result = static_cast<Result*>(shared_memory_address_);

result->size = 0;

cmds::GetVertexAttribfv cmd;

- cmd.Init(1,

- GL_VERTEX_ATTRIB_ARRAY_NORMALIZED,

- shared_memory_id_,

+ cmd.Init(1, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, shared_memory_id_,

shared_memory_offset_);

EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

EXPECT_EQ(decoder_->GetGLES2Util()->GLGetNumValuesReturned(

@@ -1658,9 +1583,7 @@ TEST_P(GLES2DecoderTest1, GetVertexAttribfvInvalidArgs2_1) {

static_cast<cmds::GetVertexAttribfv::Result*>(shared_memory_address_);

result->size = 0;

cmds::GetVertexAttribfv cmd;

- cmd.Init(1,

- GL_VERTEX_ATTRIB_ARRAY_NORMALIZED,

- shared_memory_id_,

+ cmd.Init(1, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, shared_memory_id_,

kInvalidSharedMemoryOffset);

EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));

EXPECT_EQ(0u, result->size);

@@ -1672,9 +1595,7 @@ TEST_P(GLES2DecoderTest1, GetVertexAttribivValidArgs) {

Result* result = static_cast<Result*>(shared_memory_address_);

result->size = 0;

cmds::GetVertexAttribiv cmd;

- cmd.Init(1,

- GL_VERTEX_ATTRIB_ARRAY_NORMALIZED,

- shared_memory_id_,

+ cmd.Init(1, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, shared_memory_id_,

shared_memory_offset_);

EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

EXPECT_EQ(decoder_->GetGLES2Util()->GLGetNumValuesReturned(

@@ -1702,9 +1623,7 @@ TEST_P(GLES2DecoderTest1, GetVertexAttribivInvalidArgs2_1) {

static_cast<cmds::GetVertexAttribiv::Result*>(shared_memory_address_);

result->size = 0;

cmds::GetVertexAttribiv cmd;

- cmd.Init(1,

- GL_VERTEX_ATTRIB_ARRAY_NORMALIZED,

- shared_memory_id_,

+ cmd.Init(1, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, shared_memory_id_,

kInvalidSharedMemoryOffset);

EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));

EXPECT_EQ(0u, result->size);

@@ -1792,11 +1711,11 @@ TEST_P(GLES2DecoderTest1, IsFramebufferValidArgs) {

TEST_P(GLES2DecoderTest1, IsFramebufferInvalidArgsBadSharedMemoryId) {

SpecializedSetup<cmds::IsFramebuffer, 0>(false);

cmds::IsFramebuffer cmd;

- cmd.Init(

- client_framebuffer_id_, kInvalidSharedMemoryId, shared_memory_offset_);

+ cmd.Init(client_framebuffer_id_, kInvalidSharedMemoryId,

+ shared_memory_offset_);

EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));

- cmd.Init(

- client_framebuffer_id_, shared_memory_id_, kInvalidSharedMemoryOffset);

+ cmd.Init(client_framebuffer_id_, shared_memory_id_,

+ kInvalidSharedMemoryOffset);

EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));

}

@@ -1828,11 +1747,11 @@ TEST_P(GLES2DecoderTest1, IsRenderbufferValidArgs) {

TEST_P(GLES2DecoderTest1, IsRenderbufferInvalidArgsBadSharedMemoryId) {

SpecializedSetup<cmds::IsRenderbuffer, 0>(false);

cmds::IsRenderbuffer cmd;

- cmd.Init(

- client_renderbuffer_id_, kInvalidSharedMemoryId, shared_memory_offset_);

+ cmd.Init(client_renderbuffer_id_, kInvalidSharedMemoryId,

+ shared_memory_offset_);

EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));

- cmd.Init(

- client_renderbuffer_id_, shared_memory_id_, kInvalidSharedMemoryOffset);

+ cmd.Init(client_renderbuffer_id_, shared_memory_id_,

+ kInvalidSharedMemoryOffset);

EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));

}