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

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

Issue 893213002: Revert of Make GL bindings conditional (Closed) Base URL: https://chromium.googlesource.com/chromium/src.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
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 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 GLES2DecoderVertexArraysOESTest, 349 GLES2DecoderVertexArraysOESTest,
350 ::testing::Bool()); 350 ::testing::Bool());
351 351
352 class GLES2DecoderEmulatedVertexArraysOESTest 352 class GLES2DecoderEmulatedVertexArraysOESTest
353 : public GLES2DecoderVertexArraysOESTest { 353 : public GLES2DecoderVertexArraysOESTest {
354 public: 354 public:
355 GLES2DecoderEmulatedVertexArraysOESTest() {} 355 GLES2DecoderEmulatedVertexArraysOESTest() {}
356 356
357 void SetUp() override { 357 void SetUp() override {
358 InitState init; 358 InitState init;
359 init.gl_version = "3.0";
359 init.bind_generates_resource = true; 360 init.bind_generates_resource = true;
360 init.use_native_vao = false; 361 init.use_native_vao = false;
361 InitDecoder(init); 362 InitDecoder(init);
362 SetupDefaultProgram(); 363 SetupDefaultProgram();
363 364
364 AddExpectationsForGenVertexArraysOES(); 365 AddExpectationsForGenVertexArraysOES();
365 GenHelper<GenVertexArraysOESImmediate>(client_vertexarray_id_); 366 GenHelper<GenVertexArraysOESImmediate>(client_vertexarray_id_);
366 367
367 vertex_array_deleted_manually_ = false; 368 vertex_array_deleted_manually_ = false;
368 } 369 }
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
473 // TODO(gman): BufferData 474 // TODO(gman): BufferData
474 475
475 // TODO(gman): BufferDataImmediate 476 // TODO(gman): BufferDataImmediate
476 477
477 // TODO(gman): BufferSubData 478 // TODO(gman): BufferSubData
478 479
479 // TODO(gman): BufferSubDataImmediate 480 // TODO(gman): BufferSubDataImmediate
480 481
481 } // namespace gles2 482 } // namespace gles2
482 } // namespace gpu 483 } // namespace gpu
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698