diff options
| author | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-12 04:10:31 +0000 |
|---|---|---|
| committer | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-12 04:10:31 +0000 |
| commit | fb96c8e94109f7c7b975dec14954da4a639e6793 (patch) | |
| tree | 13dbfbdd041aa3bc50e586b0ae633f638e3853c8 /gpu/command_buffer/service/program_manager_unittest.cc | |
| parent | 0e9b97e7a7168553edb354712be77dd474306ab7 (diff) | |
| download | chromium_src-fb96c8e94109f7c7b975dec14954da4a639e6793.zip chromium_src-fb96c8e94109f7c7b975dec14954da4a639e6793.tar.gz chromium_src-fb96c8e94109f7c7b975dec14954da4a639e6793.tar.bz2 | |
Fixes glAttachShader to be OpenGL ES 2.0 spec compliant.
You're not supposed to be able to attach more than
one shader of the same type unlike OpenGL.
TEST=unit tests
BUG=none
Review URL: http://codereview.chromium.org/3107007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55844 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer/service/program_manager_unittest.cc')
| -rw-r--r-- | gpu/command_buffer/service/program_manager_unittest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gpu/command_buffer/service/program_manager_unittest.cc b/gpu/command_buffer/service/program_manager_unittest.cc index a6b5614..fa159de 100644 --- a/gpu/command_buffer/service/program_manager_unittest.cc +++ b/gpu/command_buffer/service/program_manager_unittest.cc @@ -428,19 +428,19 @@ TEST_F(ProgramManagerWithShaderTest, AttachDetachShader) { ShaderManager::ShaderInfo* fshader = shader_manager.GetShaderInfo( kFShaderClientId); fshader->SetStatus(true, ""); - program_info->AttachShader(vshader); + EXPECT_TRUE(program_info->AttachShader(vshader)); EXPECT_FALSE(program_info->CanLink()); - program_info->AttachShader(fshader); + EXPECT_TRUE(program_info->AttachShader(fshader)); EXPECT_TRUE(program_info->CanLink()); program_info->DetachShader(vshader); EXPECT_FALSE(program_info->CanLink()); - program_info->AttachShader(vshader); + EXPECT_TRUE(program_info->AttachShader(vshader)); EXPECT_TRUE(program_info->CanLink()); program_info->DetachShader(fshader); EXPECT_FALSE(program_info->CanLink()); - program_info->AttachShader(vshader); + EXPECT_FALSE(program_info->AttachShader(vshader)); EXPECT_FALSE(program_info->CanLink()); - program_info->AttachShader(fshader); + EXPECT_TRUE(program_info->AttachShader(fshader)); EXPECT_TRUE(program_info->CanLink()); vshader->SetStatus(false, ""); EXPECT_FALSE(program_info->CanLink()); |