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

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

Issue 682743002: Standardize usage of virtual/override/final specifiers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 50
51 namespace gpu { 51 namespace gpu {
52 namespace gles2 { 52 namespace gles2 {
53 53
54 using namespace cmds; 54 using namespace cmds;
55 55
56 class GLES2DecoderGeometryInstancingTest : public GLES2DecoderWithShaderTest { 56 class GLES2DecoderGeometryInstancingTest : public GLES2DecoderWithShaderTest {
57 public: 57 public:
58 GLES2DecoderGeometryInstancingTest() : GLES2DecoderWithShaderTest() {} 58 GLES2DecoderGeometryInstancingTest() : GLES2DecoderWithShaderTest() {}
59 59
60 virtual void SetUp() { 60 void SetUp() override {
61 InitState init; 61 InitState init;
62 init.extensions = "GL_ANGLE_instanced_arrays"; 62 init.extensions = "GL_ANGLE_instanced_arrays";
63 init.gl_version = "opengl es 2.0"; 63 init.gl_version = "opengl es 2.0";
64 init.has_alpha = true; 64 init.has_alpha = true;
65 init.has_depth = true; 65 init.has_depth = true;
66 init.request_alpha = true; 66 init.request_alpha = true;
67 init.request_depth = true; 67 init.request_depth = true;
68 init.bind_generates_resource = true; 68 init.bind_generates_resource = true;
69 InitDecoder(init); 69 InitDecoder(init);
70 SetupDefaultProgram(); 70 SetupDefaultProgram();
(...skipping 2316 matching lines...) Expand 10 before | Expand all | Expand 10 after
2387 .Times(1) 2387 .Times(1)
2388 .RetiresOnSaturation(); 2388 .RetiresOnSaturation();
2389 DrawArrays cmd; 2389 DrawArrays cmd;
2390 cmd.Init(GL_TRIANGLES, 0, kNumVertices); 2390 cmd.Init(GL_TRIANGLES, 0, kNumVertices);
2391 EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); 2391 EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
2392 EXPECT_EQ(GL_NO_ERROR, GetGLError()); 2392 EXPECT_EQ(GL_NO_ERROR, GetGLError());
2393 } 2393 }
2394 2394
2395 } // namespace gles2 2395 } // namespace gles2
2396 } // namespace gpu 2396 } // namespace gpu
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698