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

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

Issue 303543005: Fix a bug in gpu_unittests mock expectations for VAO. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/strings/string_number_conversions.h" 8 #include "base/strings/string_number_conversions.h"
9 #include "gpu/command_buffer/common/gles2_cmd_format.h" 9 #include "gpu/command_buffer/common/gles2_cmd_format.h"
10 #include "gpu/command_buffer/common/gles2_cmd_utils.h" 10 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 } 229 }
230 230
231 class GLES2DecoderVertexArraysOESTest : public GLES2DecoderWithShaderTest { 231 class GLES2DecoderVertexArraysOESTest : public GLES2DecoderWithShaderTest {
232 public: 232 public:
233 GLES2DecoderVertexArraysOESTest() {} 233 GLES2DecoderVertexArraysOESTest() {}
234 234
235 bool vertex_array_deleted_manually_; 235 bool vertex_array_deleted_manually_;
236 236
237 virtual void SetUp() { 237 virtual void SetUp() {
238 InitState init; 238 InitState init;
239 init.extensions = "GL_OES_vertex_array_object";
240 init.gl_version = "opengl es 2.0"; 239 init.gl_version = "opengl es 2.0";
241 init.bind_generates_resource = true; 240 init.bind_generates_resource = true;
242 InitDecoder(init); 241 InitDecoder(init);
243 SetupDefaultProgram(); 242 SetupDefaultProgram();
244 243
245 AddExpectationsForGenVertexArraysOES(); 244 AddExpectationsForGenVertexArraysOES();
246 GenHelper<GenVertexArraysOESImmediate>(client_vertexarray_id_); 245 GenHelper<GenVertexArraysOESImmediate>(client_vertexarray_id_);
247 246
248 vertex_array_deleted_manually_ = false; 247 vertex_array_deleted_manually_ = false;
249 } 248 }
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 390
392 class GLES2DecoderEmulatedVertexArraysOESTest 391 class GLES2DecoderEmulatedVertexArraysOESTest
393 : public GLES2DecoderVertexArraysOESTest { 392 : public GLES2DecoderVertexArraysOESTest {
394 public: 393 public:
395 GLES2DecoderEmulatedVertexArraysOESTest() {} 394 GLES2DecoderEmulatedVertexArraysOESTest() {}
396 395
397 virtual void SetUp() { 396 virtual void SetUp() {
398 InitState init; 397 InitState init;
399 init.gl_version = "3.0"; 398 init.gl_version = "3.0";
400 init.bind_generates_resource = true; 399 init.bind_generates_resource = true;
400 init.use_native_vao = false;
401 InitDecoder(init); 401 InitDecoder(init);
402 SetupDefaultProgram(); 402 SetupDefaultProgram();
403 403
404 AddExpectationsForGenVertexArraysOES(); 404 AddExpectationsForGenVertexArraysOES();
405 GenHelper<GenVertexArraysOESImmediate>(client_vertexarray_id_); 405 GenHelper<GenVertexArraysOESImmediate>(client_vertexarray_id_);
406 406
407 vertex_array_deleted_manually_ = false; 407 vertex_array_deleted_manually_ = false;
408 } 408 }
409 }; 409 };
410 410
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
543 // TODO(gman): BufferData 543 // TODO(gman): BufferData
544 544
545 // TODO(gman): BufferDataImmediate 545 // TODO(gman): BufferDataImmediate
546 546
547 // TODO(gman): BufferSubData 547 // TODO(gman): BufferSubData
548 548
549 // TODO(gman): BufferSubDataImmediate 549 // TODO(gman): BufferSubDataImmediate
550 550
551 } // namespace gles2 551 } // namespace gles2
552 } // namespace gpu 552 } // namespace gpu
OLDNEW
« no previous file with comments | « no previous file | gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698