Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(251)

Unified Diff: gpu/command_buffer/service/test_helper.h

Issue 1335873002: Initialize default texture for GL_TEXTURE_3D and GL_TEXTURE_2D_ARRAY (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix default argument Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | gpu/command_buffer/service/test_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/test_helper.h
diff --git a/gpu/command_buffer/service/test_helper.h b/gpu/command_buffer/service/test_helper.h
index a7eaec2afe3bc2d5933ebb2e1984baa408adf9f7..5998915b3826f9f92aa88bcbe34f50fcf0656a0c 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);
« no previous file with comments | « no previous file | gpu/command_buffer/service/test_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698