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

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

Issue 2443553002: Create correct GLES3 context for GLES3 unittest (Closed)
Patch Set: remove context_type since it is equivalent to enable_es3 Created 4 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 (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/program_manager.h" 5 #include "gpu/command_buffer/service/program_manager.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 nullptr, kMaxVaryingVectors, kMaxDrawBuffers, kMaxDualSourceDrawBuffers, 63 nullptr, kMaxVaryingVectors, kMaxDrawBuffers, kMaxDualSourceDrawBuffers,
64 kMaxVertexAttribs, gpu_preferences_, feature_info_.get(), nullptr)); 64 kMaxVertexAttribs, gpu_preferences_, feature_info_.get(), nullptr));
65 } 65 }
66 void SetUpBase(const char* gl_version, 66 void SetUpBase(const char* gl_version,
67 const char* gl_extensions, 67 const char* gl_extensions,
68 FeatureInfo* feature_info = nullptr) { 68 FeatureInfo* feature_info = nullptr) {
69 GpuServiceTest::SetUpWithGLVersion(gl_version, gl_extensions); 69 GpuServiceTest::SetUpWithGLVersion(gl_version, gl_extensions);
70 if (!feature_info) 70 if (!feature_info)
71 feature_info = new FeatureInfo(); 71 feature_info = new FeatureInfo();
72 TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion( 72 TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion(
73 gl_.get(), gl_extensions, "", gl_version, feature_info->context_type()); 73 gl_.get(), gl_extensions, "", gl_version);
74 feature_info->InitializeForTesting(); 74 feature_info->InitializeForTesting();
75 feature_info_ = feature_info; 75 feature_info_ = feature_info;
76 SetupProgramManager(); 76 SetupProgramManager();
77 } 77 }
78 void SetUp() override { 78 void SetUp() override {
79 // Parameters same as GpuServiceTest::SetUp 79 // Parameters same as GpuServiceTest::SetUp
80 SetUpBase("2.0", "GL_EXT_framebuffer_object"); 80 SetUpBase("2.0", "GL_EXT_framebuffer_object");
81 } 81 }
82 void TearDown() override { 82 void TearDown() override {
83 manager_->Destroy(false); 83 manager_->Destroy(false);
(...skipping 2429 matching lines...) Expand 10 before | Expand all | Expand 10 after
2513 ProgramManagerDualSourceBlendingES2Test, 2513 ProgramManagerDualSourceBlendingES2Test,
2514 testing::Values( 2514 testing::Values(
2515 make_gl_ext_tuple("3.2", 2515 make_gl_ext_tuple("3.2",
2516 "GL_ARB_draw_buffers GL_ARB_blend_func_extended " 2516 "GL_ARB_draw_buffers GL_ARB_blend_func_extended "
2517 "GL_ARB_program_interface_query"), 2517 "GL_ARB_program_interface_query"),
2518 make_gl_ext_tuple("opengl es 3.1", 2518 make_gl_ext_tuple("opengl es 3.1",
2519 "GL_EXT_draw_buffers GL_EXT_blend_func_extended"))); 2519 "GL_EXT_draw_buffers GL_EXT_blend_func_extended")));
2520 2520
2521 } // namespace gles2 2521 } // namespace gles2
2522 } // namespace gpu 2522 } // namespace gpu
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698