gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h - Issue 118203002: During virtual context switches only restore texture units that have changed from the previous cont…

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/gles2_cmd_decoder_unittest_base.h

Issue 118203002: During virtual context switches only restore texture units that have changed from the previous cont… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Incorporate sievers' feedback on unittests Created 6 years, 11 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 | « gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc ('k') | gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc » ('j') | gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h

diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h

index 6e6c7464037cbf716c4f49e2db338231055a66b5..d80f3c4420039fbacb710c8970078e4210966986 100644

--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h

+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h

@@ -358,6 +358,11 @@ class GLES2DecoderTestBase : public testing::Test {

void AddExpectationsForDeleteVertexArraysOES();

void AddExpectationsForBindVertexArrayOES();

void AddExpectationsForRestoreAttribState(GLuint attrib);

+ void AddExpectationsForActiveTexture(GLenum unit);

+ void AddExpectationsForBindTexture(GLenum target, GLuint texture_id);

+ void InitializeContextState(

+ ContextState* state, uint32 non_default_unit, uint32 active_unit);

no sievers 2014/01/14 22:19:28 remove these

kaanb 2014/01/14 23:51:10 Done.

GLvoid* BufferOffset(unsigned i) {

return static_cast<int8 *>(NULL)+(i);