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

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

Issue 2778833002: Revert changes to GPU test MessageLoop type. (Closed)
Patch Set: Created 3 years, 8 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
« no previous file with comments | « gpu/BUILD.gn ('k') | gpu/command_buffer/service/gpu_service_test.cc » ('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 (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/gles2_cmd_decoder_unittest_base.h" 5 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.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>
11 #include <memory> 11 #include <memory>
12 #include <string> 12 #include <string>
13 #include <vector> 13 #include <vector>
14 14
15 #include "base/strings/string_number_conversions.h" 15 #include "base/strings/string_number_conversions.h"
16 #include "base/strings/string_split.h" 16 #include "base/strings/string_split.h"
17 #include "gpu/command_buffer/common/gles2_cmd_format.h" 17 #include "gpu/command_buffer/common/gles2_cmd_format.h"
18 #include "gpu/command_buffer/common/gles2_cmd_utils.h" 18 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
19 #include "gpu/command_buffer/service/cmd_buffer_engine.h" 19 #include "gpu/command_buffer/service/cmd_buffer_engine.h"
20 #include "gpu/command_buffer/service/context_group.h" 20 #include "gpu/command_buffer/service/context_group.h"
21 #include "gpu/command_buffer/service/logger.h" 21 #include "gpu/command_buffer/service/logger.h"
22 #include "gpu/command_buffer/service/mailbox_manager.h" 22 #include "gpu/command_buffer/service/mailbox_manager.h"
23 #include "gpu/command_buffer/service/program_manager.h" 23 #include "gpu/command_buffer/service/program_manager.h"
24 #include "gpu/command_buffer/service/test_helper.h" 24 #include "gpu/command_buffer/service/test_helper.h"
25 #include "gpu/command_buffer/service/vertex_attrib_manager.h" 25 #include "gpu/command_buffer/service/vertex_attrib_manager.h"
26 #include "gpu/test_message_loop_type.h"
27 #include "testing/gtest/include/gtest/gtest.h" 26 #include "testing/gtest/include/gtest/gtest.h"
28 #include "ui/gl/gl_mock.h" 27 #include "ui/gl/gl_mock.h"
29 #include "ui/gl/init/gl_factory.h" 28 #include "ui/gl/init/gl_factory.h"
30 #include "ui/gl/test/gl_surface_test_support.h" 29 #include "ui/gl/test/gl_surface_test_support.h"
31 30
32 using ::gl::MockGLInterface; 31 using ::gl::MockGLInterface;
33 using ::testing::_; 32 using ::testing::_;
34 using ::testing::AnyNumber; 33 using ::testing::AnyNumber;
35 using ::testing::AtMost; 34 using ::testing::AtMost;
36 using ::testing::DoAll; 35 using ::testing::DoAll;
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 service_renderbuffer_id_(0), 116 service_renderbuffer_id_(0),
118 service_renderbuffer_valid_(false), 117 service_renderbuffer_valid_(false),
119 ignore_cached_state_for_test_(GetParam()), 118 ignore_cached_state_for_test_(GetParam()),
120 cached_color_mask_red_(true), 119 cached_color_mask_red_(true),
121 cached_color_mask_green_(true), 120 cached_color_mask_green_(true),
122 cached_color_mask_blue_(true), 121 cached_color_mask_blue_(true),
123 cached_color_mask_alpha_(true), 122 cached_color_mask_alpha_(true),
124 cached_depth_mask_(true), 123 cached_depth_mask_(true),
125 cached_stencil_front_mask_(static_cast<GLuint>(-1)), 124 cached_stencil_front_mask_(static_cast<GLuint>(-1)),
126 cached_stencil_back_mask_(static_cast<GLuint>(-1)), 125 cached_stencil_back_mask_(static_cast<GLuint>(-1)),
127 shader_language_version_(100), 126 shader_language_version_(100) {
128 message_loop_(test::GetMessageLoopTypeForGpu()) {
129 memset(immediate_buffer_, 0xEE, sizeof(immediate_buffer_)); 127 memset(immediate_buffer_, 0xEE, sizeof(immediate_buffer_));
130 } 128 }
131 129
132 GLES2DecoderTestBase::~GLES2DecoderTestBase() {} 130 GLES2DecoderTestBase::~GLES2DecoderTestBase() {}
133 131
134 void GLES2DecoderTestBase::SetUp() { 132 void GLES2DecoderTestBase::SetUp() {
135 InitState init; 133 InitState init;
136 // Autogenerated tests do not overwrite version or extension string, 134 // Autogenerated tests do not overwrite version or extension string,
137 // so we have to pick something that supports everything here. 135 // so we have to pick something that supports everything here.
138 init.gl_version = "4.4"; 136 init.gl_version = "4.4";
(...skipping 2046 matching lines...) Expand 10 before | Expand all | Expand 10 after
2185 SetupDefaultProgram(); 2183 SetupDefaultProgram();
2186 } 2184 }
2187 2185
2188 // Include the auto-generated part of this file. We split this because it means 2186 // Include the auto-generated part of this file. We split this because it means
2189 // we can easily edit the non-auto generated parts right here in this file 2187 // we can easily edit the non-auto generated parts right here in this file
2190 // instead of having to edit some template or the code generator. 2188 // instead of having to edit some template or the code generator.
2191 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_0_autogen.h" 2189 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_0_autogen.h"
2192 2190
2193 } // namespace gles2 2191 } // namespace gles2
2194 } // namespace gpu 2192 } // namespace gpu
OLDNEW
« no previous file with comments | « gpu/BUILD.gn ('k') | gpu/command_buffer/service/gpu_service_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698