summaryrefslogtreecommitdiffstats
path: root/gpu/command_buffer/service/test_helper.h
diff options
context:
space:
mode:
authorkbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-23 22:21:46 +0000
committerkbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-23 22:21:46 +0000
commite51bdf3d4f7bb89497344af0b4a99ff10512c0d5 (patch)
treef8ea1734e59c778c3acc8b9a4454789c526f15bd /gpu/command_buffer/service/test_helper.h
parentb898f0108b4e39bb86577455470dd42490ff1b7b (diff)
downloadchromium_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/test_helper.h')
-rw-r--r--gpu/command_buffer/service/test_helper.h13
1 files changed, 9 insertions, 4 deletions
diff --git a/gpu/command_buffer/service/test_helper.h b/gpu/command_buffer/service/test_helper.h
index 6c6dcd0..ec563315 100644
--- a/gpu/command_buffer/service/test_helper.h
+++ b/gpu/command_buffer/service/test_helper.h
@@ -15,11 +15,13 @@ struct DisallowedFeatures;
class TestHelper {
public:
static const GLuint kServiceBlackTexture2dId = 701;
- static const GLuint kServiceBlackTextureCubemapId = 702;
- static const GLuint kServiceDefaultTexture2dId = 703;
+ static const GLuint kServiceDefaultTexture2dId = 702;
+ static const GLuint kServiceBlackTextureCubemapId = 703;
static const GLuint kServiceDefaultTextureCubemapId = 704;
- static const GLuint kServiceDefaultExternalTextureId = 705;
- static const GLuint kServiceBlackExternalTextureId = 706;
+ static const GLuint kServiceBlackExternalTextureId = 705;
+ static const GLuint kServiceDefaultExternalTextureId = 706;
+ static const GLuint kServiceBlackRectangleTextureId = 707;
+ static const GLuint kServiceDefaultRectangleTextureId = 708;
static const GLint kMaxSamples = 4;
static const GLint kMaxRenderbufferSize = 1024;
@@ -45,6 +47,9 @@ class TestHelper {
::gfx::MockGLInterface* gl, const char* extensions);
static void SetupTextureManagerInitExpectations(::gfx::MockGLInterface* gl,
const char* extensions);
+ private:
+ static void SetupTextureInitializationExpectations(::gfx::MockGLInterface* gl,
+ GLenum target);
};
} // namespace gles2