Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(14)

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

Issue 761903003: Update from https://crrev.com/306655 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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
OLDNEW
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 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 DoBindBuffer(GL_ARRAY_BUFFER, client_buffer_id_, kServiceBufferId); 271 DoBindBuffer(GL_ARRAY_BUFFER, client_buffer_id_, kServiceBufferId);
272 DoVertexAttribPointer(1, 1, GL_FLOAT, 0, 0); 272 DoVertexAttribPointer(1, 1, GL_FLOAT, 0, 0);
273 if (valid) { 273 if (valid) {
274 EXPECT_CALL(*gl_, GetError()) 274 EXPECT_CALL(*gl_, GetError())
275 .WillOnce(Return(GL_NO_ERROR)) 275 .WillOnce(Return(GL_NO_ERROR))
276 .WillOnce(Return(GL_NO_ERROR)) 276 .WillOnce(Return(GL_NO_ERROR))
277 .RetiresOnSaturation(); 277 .RetiresOnSaturation();
278 } 278 }
279 }; 279 };
280 280
281 template <>
282 void GLES2DecoderTestBase::SpecializedSetup<cmds::RenderbufferStorage, 0>(
283 bool valid) {
284 DoBindRenderbuffer(GL_RENDERBUFFER, client_renderbuffer_id_,
285 kServiceRenderbufferId);
286 if (valid) {
287 EnsureRenderbufferBound(false);
288 EXPECT_CALL(*gl_, GetError())
289 .WillOnce(Return(GL_NO_ERROR))
290 .RetiresOnSaturation();
291 EXPECT_CALL(*gl_,
292 RenderbufferStorageEXT(GL_RENDERBUFFER, _, 3, 4))
293 .Times(1)
294 .RetiresOnSaturation();
295 EXPECT_CALL(*gl_, GetError())
296 .WillOnce(Return(GL_NO_ERROR))
297 .RetiresOnSaturation();
298 }
299 }
300
301 281
302 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h" 282 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h"
303 283
304 } // namespace gles2 284 } // namespace gles2
305 } // namespace gpu 285 } // namespace gpu
306 286
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder_mock.h ('k') | gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698