gpu/command_buffer/service/gles2_cmd_decoder_unittest_0_autogen.h - Issue 1028333002: Chromium -> Mojo roll.

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_0_autogen.h

Issue 1028333002: Chromium -> Mojo roll. (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Created 5 years, 9 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_0_autogen.h

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

index 0aca4df3fa322e1686f66caaad274effa6358afb..b76e7bf659407f03f72c7b0f52669814f4977ca1 100644

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

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

@@ -12,7 +12,7 @@

#ifndef GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_0_AUTOGEN_H_

#define GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_0_AUTOGEN_H_

-void GLES2DecoderTestBase::SetupInitCapabilitiesExpectations() {

+void GLES2DecoderTestBase::SetupInitCapabilitiesExpectations(bool es3_capable) {

ExpectEnableDisable(GL_BLEND, false);

ExpectEnableDisable(GL_CULL_FACE, false);

ExpectEnableDisable(GL_DEPTH_TEST, false);

@@ -22,6 +22,9 @@ void GLES2DecoderTestBase::SetupInitCapabilitiesExpectations() {

ExpectEnableDisable(GL_SAMPLE_COVERAGE, false);

ExpectEnableDisable(GL_SCISSOR_TEST, false);

ExpectEnableDisable(GL_STENCIL_TEST, false);

+ if (es3_capable) {

+ ExpectEnableDisable(GL_RASTERIZER_DISCARD, false);

+ }

}

void GLES2DecoderTestBase::SetupInitStateExpectations() {