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

Side by Side Diff: gpu/command_buffer/tests/gl_manager.h

Issue 2126183002: Revert of Fix initialization ordering in GLES2CmdDecoder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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/command_buffer/service/gles2_cmd_decoder.cc ('k') | gpu/command_buffer/tests/gl_manager.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 #ifndef GPU_COMMAND_BUFFER_TESTS_GL_MANAGER_H_ 5 #ifndef GPU_COMMAND_BUFFER_TESTS_GL_MANAGER_H_
6 #define GPU_COMMAND_BUFFER_TESTS_GL_MANAGER_H_ 6 #define GPU_COMMAND_BUFFER_TESTS_GL_MANAGER_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 bool context_lost_allowed; 75 bool context_lost_allowed;
76 gles2::ContextType context_type; 76 gles2::ContextType context_type;
77 // Force shader name hashing for all context types. 77 // Force shader name hashing for all context types.
78 bool force_shader_name_hashing; 78 bool force_shader_name_hashing;
79 // Whether the buffer is multisampled. 79 // Whether the buffer is multisampled.
80 bool multisampled; 80 bool multisampled;
81 // Whether the backbuffer has an alpha channel. 81 // Whether the backbuffer has an alpha channel.
82 bool backbuffer_alpha; 82 bool backbuffer_alpha;
83 // The ImageFactory to use to generate images for the backbuffer. 83 // The ImageFactory to use to generate images for the backbuffer.
84 gpu::ImageFactory* image_factory; 84 gpu::ImageFactory* image_factory;
85 // Enable the feature |arb_texture_rectangle|.
86 bool enable_arb_texture_rectangle;
85 }; 87 };
86 GLManager(); 88 GLManager();
87 ~GLManager() override; 89 ~GLManager() override;
88 90
89 std::unique_ptr<gfx::GpuMemoryBuffer> CreateGpuMemoryBuffer( 91 std::unique_ptr<gfx::GpuMemoryBuffer> CreateGpuMemoryBuffer(
90 const gfx::Size& size, 92 const gfx::Size& size,
91 gfx::BufferFormat format); 93 gfx::BufferFormat format);
92 94
93 void Initialize(const Options& options); 95 void Initialize(const Options& options);
94 void InitializeWithCommandLine(const Options& options, 96 void InitializeWithCommandLine(const Options& options,
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 // Used on Android to virtualize GL for all contexts. 194 // Used on Android to virtualize GL for all contexts.
193 static int use_count_; 195 static int use_count_;
194 static scoped_refptr<gl::GLShareGroup>* base_share_group_; 196 static scoped_refptr<gl::GLShareGroup>* base_share_group_;
195 static scoped_refptr<gl::GLSurface>* base_surface_; 197 static scoped_refptr<gl::GLSurface>* base_surface_;
196 static scoped_refptr<gl::GLContext>* base_context_; 198 static scoped_refptr<gl::GLContext>* base_context_;
197 }; 199 };
198 200
199 } // namespace gpu 201 } // namespace gpu
200 202
201 #endif // GPU_COMMAND_BUFFER_TESTS_GL_MANAGER_H_ 203 #endif // GPU_COMMAND_BUFFER_TESTS_GL_MANAGER_H_
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder.cc ('k') | gpu/command_buffer/tests/gl_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698