gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc - Issue 7765013: Revert 98504 - Manually merging trunk revs 95836 and 96904 to 835 branch (second attempt)

Unified Diff: gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc

Issue 7765013: Revert 98504 - Manually merging trunk revs 95836 and 96904 to 835 branch (second attempt) (Closed) Base URL: svn://svn.chromium.org/chrome/branches/835/src/

Patch Set: Created 9 years, 4 months 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

Download patch

« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder.cc ('k') | gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.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.cc

===================================================================

--- gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc (revision 98533)

+++ gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc (working copy)

@@ -96,8 +96,7 @@

false, // has stencil

false, // request alpha

false, // request depth

- false, // request stencil

- true); // bind generates resource

+ false); // request stencil

SetupDefaultProgram();

}

};

@@ -3191,8 +3190,7 @@

false, // has stencil

true, // request alpha

false, // request depth

- false, // request stencil

- true); // bind generates resource

+ false); // request stencil

EXPECT_CALL(*gl_, GetError())

.WillOnce(Return(GL_NO_ERROR))

@@ -3222,8 +3220,7 @@

false, // has stencil

false, // request alpha

false, // request depth

- false, // request stencil

- true); // bind generates resource

+ false); // request stencil

EXPECT_CALL(*gl_, GetError())

.WillOnce(Return(GL_NO_ERROR))

@@ -3253,8 +3250,7 @@

false, // has stencil

false, // request alpha

true, // request depth

- false, // request stencil

- true); // bind generates resource

+ false); // request stencil

EXPECT_CALL(*gl_, GetError())

.WillOnce(Return(GL_NO_ERROR))

@@ -3284,8 +3280,7 @@

false, // has stencil

false, // request alpha

false, // request depth

- false, // request stencil

- true); // bind generates resource

+ false); // request stencil

EXPECT_CALL(*gl_, GetError())

.WillOnce(Return(GL_NO_ERROR))

@@ -3315,8 +3310,7 @@

true, // has stencil

false, // request alpha

false, // request depth

- true, // request stencil

- true); // bind generates resource

+ true); // request stencil

EXPECT_CALL(*gl_, GetError())

.WillOnce(Return(GL_NO_ERROR))

@@ -3346,8 +3340,7 @@

true, // has stencil

false, // request alpha

false, // request depth

- false, // request stencil

- true); // bind generates resource

+ false); // request stencil

EXPECT_CALL(*gl_, GetError())

.WillOnce(Return(GL_NO_ERROR))

@@ -3377,8 +3370,7 @@

false, // has stencil

false, // request alpha

true, // request depth

- false, // request stencil

- true); // bind generates resource

+ false); // request stencil

Enable cmd;

cmd.Init(GL_DEPTH_TEST);

@@ -3434,8 +3426,7 @@

false, // has stencil

false, // request alpha

false, // request depth

- false, // request stencil

- true); // bind generates resource

+ false); // request stencil

Enable cmd;

cmd.Init(GL_DEPTH_TEST);

@@ -3491,8 +3482,7 @@

true, // has stencil

false, // request alpha

false, // request depth

- true, // request stencil

- true); // bind generates resource

+ true); // request stencil

Enable cmd;

cmd.Init(GL_STENCIL_TEST);

@@ -3548,8 +3538,7 @@

true, // has stencil

false, // request alpha

false, // request depth

- false, // request stencil

- true); // bind generates resource

+ false); // request stencil

Enable cmd;

cmd.Init(GL_STENCIL_TEST);

@@ -3605,8 +3594,7 @@

true, // has stencil

false, // request alpha

true, // request depth

- true, // request stencil

- true); // bind generates resource

+ true); // request stencil

EXPECT_CALL(*gl_, GetError())

.WillOnce(Return(GL_NO_ERROR))

@@ -3649,8 +3637,7 @@

true, // has stencil

false, // request alpha

true, // request depth

- false, // request stencil

- true); // bind generates resource

+ false); // request stencil

EXPECT_CALL(*gl_, GetError())

.WillOnce(Return(GL_NO_ERROR))

@@ -3693,8 +3680,7 @@

false, // has stencil

false, // request alpha

false, // request depth

- false, // request stencil

- true); // bind generates resource

+ false); // request stencil

DoBindRenderbuffer(GL_RENDERBUFFER, client_renderbuffer_id_,

kServiceRenderbufferId);

DoBindFramebuffer(GL_FRAMEBUFFER, client_framebuffer_id_,

@@ -3770,8 +3756,7 @@

false, // has stencil

false, // request alpha

false, // request depth

- false, // request stencil

- true); // bind generates resource

+ false); // request stencil

DoBindRenderbuffer(GL_RENDERBUFFER, client_renderbuffer_id_,

kServiceRenderbufferId);

DoBindFramebuffer(GL_FRAMEBUFFER, client_framebuffer_id_,

@@ -4122,8 +4107,7 @@

false, // has stencil

false, // request alpha

false, // request depth

- false, // request stencil

- true); // bind generates resource

+ false); // request stencil

DoBindRenderbuffer(GL_RENDERBUFFER, client_renderbuffer_id_,

kServiceRenderbufferId);

EXPECT_CALL(*gl_, GetError())

@@ -4185,8 +4169,7 @@

false, // has stencil

false, // request alpha

false, // request depth

- false, // request stencil

- true); // bind generates resource

+ false); // request stencil

EXPECT_CALL(*gl_, GetError())

.WillOnce(Return(GL_NO_ERROR))

@@ -4242,8 +4225,7 @@

false, // has stencil

false, // request alpha

false, // request depth

- false, // request stencil

- true); // bind generates resource

+ false); // request stencil

EXPECT_CALL(*gl_, GetError())

.WillOnce(Return(GL_NO_ERROR))

@@ -4294,7 +4276,7 @@

GetProgramInfoCHROMIUM cmd;

cmd.Init(kInvalidClientId, kBucketId);

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

- EXPECT_EQ(GL_NO_ERROR, GetGLError());

+ EXPECT_EQ(GL_INVALID_VALUE, GetGLError());

bucket = decoder_->GetBucket(kBucketId);

ASSERT_TRUE(bucket != NULL);

EXPECT_EQ(sizeof(ProgramInfoHeader), bucket->size());

@@ -4306,38 +4288,6 @@

EXPECT_EQ(0u, info->num_uniforms);

}

-TEST_F(GLES2DecoderManualInitTest, BindGeneratesResourceFalse) {

- InitDecoder(

- "", // extensions

- false, // has alpha

- false, // has depth

- false, // has stencil

- false, // request alpha

- false, // request depth

- false, // request stencil

- false); // bind generates resource

- BindTexture cmd1;

- cmd1.Init(GL_TEXTURE_2D, kInvalidClientId);

- EXPECT_EQ(error::kNoError, ExecuteCmd(cmd1));

- EXPECT_EQ(GL_INVALID_VALUE, GetGLError());

- BindBuffer cmd2;

- cmd2.Init(GL_ARRAY_BUFFER, kInvalidClientId);

- EXPECT_EQ(error::kNoError, ExecuteCmd(cmd2));

- EXPECT_EQ(GL_INVALID_VALUE, GetGLError());

- BindFramebuffer cmd3;

- cmd3.Init(GL_FRAMEBUFFER, kInvalidClientId);

- EXPECT_EQ(error::kNoError, ExecuteCmd(cmd3));

- EXPECT_EQ(GL_INVALID_VALUE, GetGLError());

- BindRenderbuffer cmd4;

- cmd4.Init(GL_RENDERBUFFER, kInvalidClientId);

- EXPECT_EQ(error::kNoError, ExecuteCmd(cmd4));

- EXPECT_EQ(GL_INVALID_VALUE, GetGLError());

// TODO(gman): Complete this test.

// TEST_F(GLES2DecoderTest, CompressedTexImage2DGLError) {

// }

« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder.cc ('k') | gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h » ('j') | no next file with comments »