diff options
| author | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 22:21:46 +0000 |
|---|---|---|
| committer | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 22:21:46 +0000 |
| commit | e51bdf3d4f7bb89497344af0b4a99ff10512c0d5 (patch) | |
| tree | f8ea1734e59c778c3acc8b9a4454789c526f15bd /gpu/command_buffer/service/texture_manager_unittest.cc | |
| parent | b898f0108b4e39bb86577455470dd42490ff1b7b (diff) | |
| download | chromium_src-e51bdf3d4f7bb89497344af0b4a99ff10512c0d5.zip chromium_src-e51bdf3d4f7bb89497344af0b4a99ff10512c0d5.tar.gz chromium_src-e51bdf3d4f7bb89497344af0b4a99ff10512c0d5.tar.bz2 | |
Added minimal support to command buffer for GL_ARB_texture_rectangle
textures, and added Mac OS X-specific extension for binding IOSurfaces
to textures. This is infrastructure work for rendering Core Animation
plugins via Chrome's compositor.
Refactored the texture initialization in the command buffer and
associated unit tests. Added unit tests for rectangular textures.
These changes will be hooked up in a subsequent CL. They were split
off for easier review.
There are ongoing discussions about unifying the various mechanisms
for sharing textures across processes, but it's been agreed that those
should not block this work.
BUG=38967
TEST=GPU unit tests; manual testing with forthcoming changes
Review URL: http://codereview.chromium.org/8680002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111426 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer/service/texture_manager_unittest.cc')
| -rw-r--r-- | gpu/command_buffer/service/texture_manager_unittest.cc | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/gpu/command_buffer/service/texture_manager_unittest.cc b/gpu/command_buffer/service/texture_manager_unittest.cc index 15fc02e..4481567 100644 --- a/gpu/command_buffer/service/texture_manager_unittest.cc +++ b/gpu/command_buffer/service/texture_manager_unittest.cc @@ -27,12 +27,6 @@ class TextureManagerTest : public testing::Test { static const GLint kMaxCubeMapLevels = 4; static const GLint kMaxExternalLevels = 1; - static const GLuint kServiceBlackTexture2dId = 701; - static const GLuint kServiceBlackTextureCubemapId = 702; - static const GLuint kServiceDefaultTexture2dId = 703; - static const GLuint kServiceDefaultTextureCubemapId = 704; - - TextureManagerTest() : manager_(kMaxTextureSize, kMaxCubeMapTextureSize) { } @@ -69,10 +63,6 @@ const GLint TextureManagerTest::kMaxExternalTextureSize; const GLint TextureManagerTest::kMax2dLevels; const GLint TextureManagerTest::kMaxCubeMapLevels; const GLint TextureManagerTest::kMaxExternalLevels; -const GLuint TextureManagerTest::kServiceBlackTexture2dId; -const GLuint TextureManagerTest::kServiceBlackTextureCubemapId; -const GLuint TextureManagerTest::kServiceDefaultTexture2dId; -const GLuint TextureManagerTest::kServiceDefaultTextureCubemapId; #endif TEST_F(TextureManagerTest, Basic) { |