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

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: wip 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 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 SetupMockGLBehaviors(); 159 SetupMockGLBehaviors();
160 160
161 // Only create stream texture manager if extension is requested. 161 // Only create stream texture manager if extension is requested.
162 std::vector<std::string> list; 162 std::vector<std::string> list;
163 base::SplitString(normalized_init.extensions, ' ', &list); 163 base::SplitString(normalized_init.extensions, ' ', &list);
164 scoped_refptr<FeatureInfo> feature_info; 164 scoped_refptr<FeatureInfo> feature_info;
165 if (command_line) 165 if (command_line)
166 feature_info = new FeatureInfo(*command_line); 166 feature_info = new FeatureInfo(*command_line);
167 group_ = scoped_refptr<ContextGroup>( 167 group_ = scoped_refptr<ContextGroup>(
168 new ContextGroup(NULL, 168 new ContextGroup(NULL,
169 NULL,
170 memory_tracker_, 169 memory_tracker_,
171 new ShaderTranslatorCache, 170 new ShaderTranslatorCache,
172 feature_info.get(), 171 feature_info.get(),
173 normalized_init.bind_generates_resource)); 172 normalized_init.bind_generates_resource));
174 bool use_default_textures = normalized_init.bind_generates_resource; 173 bool use_default_textures = normalized_init.bind_generates_resource;
175 174
176 InSequence sequence; 175 InSequence sequence;
177 176
178 surface_ = new gfx::GLSurfaceStub; 177 surface_ = new gfx::GLSurfaceStub;
179 surface_->SetSize(gfx::Size(kBackBufferWidth, kBackBufferHeight)); 178 surface_->SetSize(gfx::Size(kBackBufferWidth, kBackBufferHeight));
(...skipping 1435 matching lines...) Expand 10 before | Expand all | Expand 10 after
1615 SetupDefaultProgram(); 1614 SetupDefaultProgram();
1616 } 1615 }
1617 1616
1618 // Include the auto-generated part of this file. We split this because it means 1617 // Include the auto-generated part of this file. We split this because it means
1619 // we can easily edit the non-auto generated parts right here in this file 1618 // we can easily edit the non-auto generated parts right here in this file
1620 // instead of having to edit some template or the code generator. 1619 // instead of having to edit some template or the code generator.
1621 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_0_autogen.h" 1620 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_0_autogen.h"
1622 1621
1623 } // namespace gles2 1622 } // namespace gles2
1624 } // namespace gpu 1623 } // namespace gpu
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698