gpu/command_buffer/service/test_helper.h - Issue 1335873002: Initialize default texture for GL_TEXTURE_3D and GL_TEXTURE_2D_ARRAY

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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 gpu_unittests 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

« gpu/command_buffer/service/gles2_cmd_decoder_unittest_extensions.cc ('K') | « gpu/command_buffer/service/gles2_cmd_decoder_unittest_extensions.cc ('k') | gpu/command_buffer/service/test_helper.cc » ('j') | gpu/command_buffer/service/test_helper.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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..26137cb85d90e9c288d2585808fcc916941bb5e3 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,

+ const char* gl_version,

const char* extensions,

bool use_default_textures);

static void SetupTextureManagerDestructionExpectations(

::gfx::MockGLInterface* gl,

+ const char* gl_version,

const char* extensions,

bool use_default_textures);