gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc - Issue 7458008: Support GL_OES_EGL_image_external

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.cc

Issue 7458008: Support GL_OES_EGL_image_external (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: fix typo which hung the windows gpu_unittests by corrupting the stack Created 9 years, 5 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:

Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc

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

index 8e56d70833c921ce4465c60f968ae5bbd7b48ccf..d80576d1f3b8b277f3020f75f415ec91b09e9de5 100644

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

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

@@ -110,6 +110,13 @@ void GLES2DecoderTestBase::InitDecoder(

EXPECT_CALL(*gl_, ActiveTexture(GL_TEXTURE0 + tt))

.Times(1)

.RetiresOnSaturation();

+ if (group_->feature_info()->feature_flags().oes_egl_image_external) {

+ EXPECT_CALL(*gl_, BindTexture(

+ GL_TEXTURE_EXTERNAL_OES,

+ TestHelper::kServiceDefaultExternalTextureId))

+ .Times(1)

+ .RetiresOnSaturation();

+ }

EXPECT_CALL(*gl_, BindTexture(

GL_TEXTURE_CUBE_MAP, TestHelper::kServiceDefaultTextureCubemapId))

.Times(1)