| OLD | NEW |
| 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 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 226 } | 226 } |
| 227 } | 227 } |
| 228 } | 228 } |
| 229 | 229 |
| 230 class GLES2DecoderVertexArraysOESTest : public GLES2DecoderWithShaderTest { | 230 class GLES2DecoderVertexArraysOESTest : public GLES2DecoderWithShaderTest { |
| 231 public: | 231 public: |
| 232 GLES2DecoderVertexArraysOESTest() {} | 232 GLES2DecoderVertexArraysOESTest() {} |
| 233 | 233 |
| 234 bool vertex_array_deleted_manually_; | 234 bool vertex_array_deleted_manually_; |
| 235 | 235 |
| 236 virtual void SetUp() { | 236 void SetUp() override { |
| 237 InitState init; | 237 InitState init; |
| 238 init.gl_version = "opengl es 2.0"; | 238 init.gl_version = "opengl es 2.0"; |
| 239 init.bind_generates_resource = true; | 239 init.bind_generates_resource = true; |
| 240 InitDecoder(init); | 240 InitDecoder(init); |
| 241 SetupDefaultProgram(); | 241 SetupDefaultProgram(); |
| 242 | 242 |
| 243 AddExpectationsForGenVertexArraysOES(); | 243 AddExpectationsForGenVertexArraysOES(); |
| 244 GenHelper<GenVertexArraysOESImmediate>(client_vertexarray_id_); | 244 GenHelper<GenVertexArraysOESImmediate>(client_vertexarray_id_); |
| 245 | 245 |
| 246 vertex_array_deleted_manually_ = false; | 246 vertex_array_deleted_manually_ = false; |
| 247 } | 247 } |
| 248 | 248 |
| 249 virtual void TearDown() { | 249 void TearDown() override { |
| 250 // This should only be set if the test handled deletion of the vertex array | 250 // This should only be set if the test handled deletion of the vertex array |
| 251 // itself. Necessary because vertex_array_objects are not sharable, and thus | 251 // itself. Necessary because vertex_array_objects are not sharable, and thus |
| 252 // not managed in the ContextGroup, meaning they will be destroyed during | 252 // not managed in the ContextGroup, meaning they will be destroyed during |
| 253 // test tear down | 253 // test tear down |
| 254 if (!vertex_array_deleted_manually_) { | 254 if (!vertex_array_deleted_manually_) { |
| 255 AddExpectationsForDeleteVertexArraysOES(); | 255 AddExpectationsForDeleteVertexArraysOES(); |
| 256 } | 256 } |
| 257 | 257 |
| 258 GLES2DecoderWithShaderTest::TearDown(); | 258 GLES2DecoderWithShaderTest::TearDown(); |
| 259 } | 259 } |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 348 | 348 |
| 349 INSTANTIATE_TEST_CASE_P(Service, | 349 INSTANTIATE_TEST_CASE_P(Service, |
| 350 GLES2DecoderVertexArraysOESTest, | 350 GLES2DecoderVertexArraysOESTest, |
| 351 ::testing::Bool()); | 351 ::testing::Bool()); |
| 352 | 352 |
| 353 class GLES2DecoderEmulatedVertexArraysOESTest | 353 class GLES2DecoderEmulatedVertexArraysOESTest |
| 354 : public GLES2DecoderVertexArraysOESTest { | 354 : public GLES2DecoderVertexArraysOESTest { |
| 355 public: | 355 public: |
| 356 GLES2DecoderEmulatedVertexArraysOESTest() {} | 356 GLES2DecoderEmulatedVertexArraysOESTest() {} |
| 357 | 357 |
| 358 virtual void SetUp() { | 358 void SetUp() override { |
| 359 InitState init; | 359 InitState init; |
| 360 init.gl_version = "3.0"; | 360 init.gl_version = "3.0"; |
| 361 init.bind_generates_resource = true; | 361 init.bind_generates_resource = true; |
| 362 init.use_native_vao = false; | 362 init.use_native_vao = false; |
| 363 InitDecoder(init); | 363 InitDecoder(init); |
| 364 SetupDefaultProgram(); | 364 SetupDefaultProgram(); |
| 365 | 365 |
| 366 AddExpectationsForGenVertexArraysOES(); | 366 AddExpectationsForGenVertexArraysOES(); |
| 367 GenHelper<GenVertexArraysOESImmediate>(client_vertexarray_id_); | 367 GenHelper<GenVertexArraysOESImmediate>(client_vertexarray_id_); |
| 368 | 368 |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 475 // TODO(gman): BufferData | 475 // TODO(gman): BufferData |
| 476 | 476 |
| 477 // TODO(gman): BufferDataImmediate | 477 // TODO(gman): BufferDataImmediate |
| 478 | 478 |
| 479 // TODO(gman): BufferSubData | 479 // TODO(gman): BufferSubData |
| 480 | 480 |
| 481 // TODO(gman): BufferSubDataImmediate | 481 // TODO(gman): BufferSubDataImmediate |
| 482 | 482 |
| 483 } // namespace gles2 | 483 } // namespace gles2 |
| 484 } // namespace gpu | 484 } // namespace gpu |
| OLD | NEW |