diff options
| author | alokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-28 17:21:38 +0000 |
|---|---|---|
| committer | alokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-28 17:21:38 +0000 |
| commit | 7cea56d943924d0c2196bdf4049f592b6182992c (patch) | |
| tree | 7582dd4f41b8ee98d01f664688ef24ad9989fe25 /gpu/command_buffer/service/shader_manager_unittest.cc | |
| parent | 288f31156953cd8598b5da317bc376dfba689e7e (diff) | |
| download | chromium_src-7cea56d943924d0c2196bdf4049f592b6182992c.zip chromium_src-7cea56d943924d0c2196bdf4049f592b6182992c.tar.gz chromium_src-7cea56d943924d0c2196bdf4049f592b6182992c.tar.bz2 | |
Added shader type to shader info.
Review URL: http://codereview.chromium.org/1696012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45823 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer/service/shader_manager_unittest.cc')
| -rw-r--r-- | gpu/command_buffer/service/shader_manager_unittest.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gpu/command_buffer/service/shader_manager_unittest.cc b/gpu/command_buffer/service/shader_manager_unittest.cc index c30d4c6..70d733b 100644 --- a/gpu/command_buffer/service/shader_manager_unittest.cc +++ b/gpu/command_buffer/service/shader_manager_unittest.cc @@ -26,15 +26,18 @@ class ShaderManagerTest : public testing::Test { TEST_F(ShaderManagerTest, Basic) { const GLuint kClient1Id = 1; const GLuint kService1Id = 11; + const GLenum kShader1Type = GL_VERTEX_SHADER; const std::string kClient1Source("hello world"); const GLuint kClient2Id = 2; // Check we can create shader. - manager_.CreateShaderInfo(kClient1Id, kService1Id); + manager_.CreateShaderInfo(kClient1Id, kService1Id, kShader1Type); // Check shader got created. ShaderManager::ShaderInfo* info1 = manager_.GetShaderInfo(kClient1Id); ASSERT_TRUE(info1 != NULL); EXPECT_EQ(kService1Id, info1->service_id()); - // Check we and set its source. + // Check if the shader has correct type. + EXPECT_EQ(kShader1Type, info1->shader_type()); + // Check we can set its source. info1->Update(kClient1Source); EXPECT_STREQ(kClient1Source.c_str(), info1->source().c_str()); // Check we get nothing for a non-existent shader. |