gpu/command_buffer/service/gles2_cmd_decoder_unittest_1.cc - Issue 935333002: Update from https://crrev.com/316786

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: gpu/command_buffer/service/gles2_cmd_decoder_unittest_1.cc

Issue 935333002: Update from https://crrev.com/316786 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 5 years, 10 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 unified diff | Download patch

« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder_autogen.h ('k') | gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"	5 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"

6	6

7 #include "gpu/command_buffer/common/gles2_cmd_format.h"	7 #include "gpu/command_buffer/common/gles2_cmd_format.h"

8 #include "gpu/command_buffer/common/gles2_cmd_utils.h"	8 #include "gpu/command_buffer/common/gles2_cmd_utils.h"

9 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h"	9 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h"

10 #include "gpu/command_buffer/service/cmd_buffer_engine.h"	10 #include "gpu/command_buffer/service/cmd_buffer_engine.h"

(...skipping 230 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
241 Program* program = GetProgram(client_program_id_);	241 Program* program = GetProgram(client_program_id_);

242 ASSERT_TRUE(program != NULL);	242 ASSERT_TRUE(program != NULL);

243	243

244 cmds::AttachShader attach_cmd;	244 cmds::AttachShader attach_cmd;

245 attach_cmd.Init(client_program_id_, kClientVertexShaderId);	245 attach_cmd.Init(client_program_id_, kClientVertexShaderId);

246 EXPECT_EQ(error::kNoError, ExecuteCmd(attach_cmd));	246 EXPECT_EQ(error::kNoError, ExecuteCmd(attach_cmd));

247	247

248 attach_cmd.Init(client_program_id_, kClientFragmentShaderId);	248 attach_cmd.Init(client_program_id_, kClientFragmentShaderId);

249 EXPECT_EQ(error::kNoError, ExecuteCmd(attach_cmd));	249 EXPECT_EQ(error::kNoError, ExecuteCmd(attach_cmd));

250	250

251 program->Link(NULL, NULL, NULL, Program::kCountOnlyStaticallyUsed,	251 program->Link(NULL, Program::kCountOnlyStaticallyUsed,

252 base::Bind(&ShaderCacheCb));	252 base::Bind(&ShaderCacheCb));

253 };	253 };

254	254

255 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h"	255 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h"

256	256

257 } // namespace gles2	257 } // namespace gles2

258 } // namespace gpu	258 } // namespace gpu

259	259

OLD	NEW