diff options
| author | qiankun.miao <qiankun.miao@intel.com> | 2015-09-17 20:34:48 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-18 03:35:50 +0000 |
| commit | 4e2f0d09bae5ad062f5f35de0349f53f0f99122e (patch) | |
| tree | c3048b2d26ead202d6d9b134c8f7348d464aedea /gpu/command_buffer/service/test_helper.h | |
| parent | 04b6b6f6d76cb8bc118bcc7cb271bee74747dbee (diff) | |
| download | chromium_src-4e2f0d09bae5ad062f5f35de0349f53f0f99122e.zip chromium_src-4e2f0d09bae5ad062f5f35de0349f53f0f99122e.tar.gz chromium_src-4e2f0d09bae5ad062f5f35de0349f53f0f99122e.tar.bz2 | |
Initialize default texture for GL_TEXTURE_3D and GL_TEXTURE_2D_ARRAY
ES3 supports GL_TEXTURE_3D and GL_TEXTURE_2D_ARRAY for glBindTexture. So
we should create default texture the the two targets.
BUG=429053
Review URL: https://codereview.chromium.org/1335873002
Cr-Commit-Position: refs/heads/master@{#349602}
Diffstat (limited to 'gpu/command_buffer/service/test_helper.h')
| -rw-r--r-- | gpu/command_buffer/service/test_helper.h | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/gpu/command_buffer/service/test_helper.h b/gpu/command_buffer/service/test_helper.h index a7eaec2a..5998915b 100644 --- a/gpu/command_buffer/service/test_helper.h +++ b/gpu/command_buffer/service/test_helper.h @@ -27,12 +27,16 @@ class TestHelper { public: static const GLuint kServiceBlackTexture2dId = 701; static const GLuint kServiceDefaultTexture2dId = 702; - static const GLuint kServiceBlackTextureCubemapId = 703; - static const GLuint kServiceDefaultTextureCubemapId = 704; - static const GLuint kServiceBlackExternalTextureId = 705; - static const GLuint kServiceDefaultExternalTextureId = 706; - static const GLuint kServiceBlackRectangleTextureId = 707; - static const GLuint kServiceDefaultRectangleTextureId = 708; + static const GLuint kServiceBlackTexture3dId = 703; + static const GLuint kServiceDefaultTexture3dId = 704; + static const GLuint kServiceBlackTexture2dArrayId = 705; + static const GLuint kServiceDefaultTexture2dArrayId = 706; + static const GLuint kServiceBlackTextureCubemapId = 707; + static const GLuint kServiceDefaultTextureCubemapId = 708; + static const GLuint kServiceBlackExternalTextureId = 709; + static const GLuint kServiceDefaultExternalTextureId = 710; + static const GLuint kServiceBlackRectangleTextureId = 711; + static const GLuint kServiceDefaultRectangleTextureId = 712; static const GLint kMaxSamples = 4; static const GLint kMaxRenderbufferSize = 1024; @@ -83,10 +87,12 @@ class TestHelper { const char* gl_renderer, const char* gl_version); static void SetupTextureManagerInitExpectations(::gfx::MockGLInterface* gl, + bool is_es3_enabled, const char* extensions, bool use_default_textures); static void SetupTextureManagerDestructionExpectations( ::gfx::MockGLInterface* gl, + bool is_es3_enabled, const char* extensions, bool use_default_textures); |