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

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

Issue 331723003: gpu: Remove Create/DeleteImage IPC by adding an X11_PIXMAP_BUFFER GpuMemoryBuffer type. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 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 | Annotate | Revision Log
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 <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 SetupMockGLBehaviors(); 161 SetupMockGLBehaviors();
162 162
163 // Only create stream texture manager if extension is requested. 163 // Only create stream texture manager if extension is requested.
164 std::vector<std::string> list; 164 std::vector<std::string> list;
165 base::SplitString(normalized_init.extensions, ' ', &list); 165 base::SplitString(normalized_init.extensions, ' ', &list);
166 scoped_refptr<FeatureInfo> feature_info; 166 scoped_refptr<FeatureInfo> feature_info;
167 if (command_line) 167 if (command_line)
168 feature_info = new FeatureInfo(*command_line); 168 feature_info = new FeatureInfo(*command_line);
169 group_ = scoped_refptr<ContextGroup>( 169 group_ = scoped_refptr<ContextGroup>(
170 new ContextGroup(NULL, 170 new ContextGroup(NULL,
171 NULL,
172 memory_tracker_, 171 memory_tracker_,
173 new ShaderTranslatorCache, 172 new ShaderTranslatorCache,
174 feature_info.get(), 173 feature_info.get(),
175 normalized_init.bind_generates_resource)); 174 normalized_init.bind_generates_resource));
176 bool use_default_textures = normalized_init.bind_generates_resource; 175 bool use_default_textures = normalized_init.bind_generates_resource;
177 176
178 InSequence sequence; 177 InSequence sequence;
179 178
180 surface_ = new gfx::GLSurfaceStub; 179 surface_ = new gfx::GLSurfaceStub;
181 surface_->SetSize(gfx::Size(kBackBufferWidth, kBackBufferHeight)); 180 surface_->SetSize(gfx::Size(kBackBufferWidth, kBackBufferHeight));
(...skipping 1480 matching lines...) Expand 10 before | Expand all | Expand 10 after
1662 SetupDefaultProgram(); 1661 SetupDefaultProgram();
1663 } 1662 }
1664 1663
1665 // Include the auto-generated part of this file. We split this because it means 1664 // Include the auto-generated part of this file. We split this because it means
1666 // we can easily edit the non-auto generated parts right here in this file 1665 // we can easily edit the non-auto generated parts right here in this file
1667 // instead of having to edit some template or the code generator. 1666 // instead of having to edit some template or the code generator.
1668 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_0_autogen.h" 1667 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_0_autogen.h"
1669 1668
1670 } // namespace gles2 1669 } // namespace gles2
1671 } // namespace gpu 1670 } // namespace gpu
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698