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

Side by Side Diff: gpu/gles2_conform_support/egl/display.h

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
« no previous file with comments | « gpu/command_buffer_service.gypi ('k') | gpu/gles2_conform_support/egl/display.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_GLES2_CONFORM_SUPPORT_EGL_DISPLAY_H_ 5 #ifndef GPU_GLES2_CONFORM_SUPPORT_EGL_DISPLAY_H_
6 #define GPU_GLES2_CONFORM_SUPPORT_EGL_DISPLAY_H_ 6 #define GPU_GLES2_CONFORM_SUPPORT_EGL_DISPLAY_H_
7 7
8 #include <EGL/egl.h> 8 #include <EGL/egl.h>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "gpu/command_buffer/client/gles2_cmd_helper.h" 11 #include "gpu/command_buffer/client/gles2_cmd_helper.h"
12 #include "gpu/command_buffer/client/gpu_control.h" 12 #include "gpu/command_buffer/client/gpu_control.h"
13 #include "gpu/command_buffer/service/command_buffer_service.h" 13 #include "gpu/command_buffer/service/command_buffer_service.h"
14 #include "gpu/command_buffer/service/gles2_cmd_decoder.h" 14 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
15 #include "gpu/command_buffer/service/gpu_control_service.h"
16 #include "gpu/command_buffer/service/gpu_scheduler.h" 15 #include "gpu/command_buffer/service/gpu_scheduler.h"
17 #include "ui/gfx/native_widget_types.h" 16 #include "ui/gfx/native_widget_types.h"
18 #include "ui/gl/gl_context.h" 17 #include "ui/gl/gl_context.h"
19 #include "ui/gl/gl_surface.h" 18 #include "ui/gl/gl_surface.h"
20 19
21 namespace gpu { 20 namespace gpu {
22 class CommandBufferService; 21 class CommandBufferService;
23 class GpuControl; 22 class GpuControl;
24 class GpuScheduler; 23 class GpuScheduler;
25 class TransferBuffer; 24 class TransferBuffer;
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 97
99 bool is_initialized_; 98 bool is_initialized_;
100 bool create_offscreen_; 99 bool create_offscreen_;
101 int create_offscreen_width_; 100 int create_offscreen_width_;
102 int create_offscreen_height_; 101 int create_offscreen_height_;
103 102
104 scoped_ptr<gpu::TransferBufferManagerInterface> transfer_buffer_manager_; 103 scoped_ptr<gpu::TransferBufferManagerInterface> transfer_buffer_manager_;
105 scoped_ptr<gpu::CommandBufferService> command_buffer_; 104 scoped_ptr<gpu::CommandBufferService> command_buffer_;
106 scoped_ptr<gpu::GpuScheduler> gpu_scheduler_; 105 scoped_ptr<gpu::GpuScheduler> gpu_scheduler_;
107 scoped_ptr<gpu::gles2::GLES2Decoder> decoder_; 106 scoped_ptr<gpu::gles2::GLES2Decoder> decoder_;
108 scoped_ptr<gpu::GpuControlService> gpu_control_service_;
109 scoped_refptr<gfx::GLContext> gl_context_; 107 scoped_refptr<gfx::GLContext> gl_context_;
110 scoped_refptr<gfx::GLSurface> gl_surface_; 108 scoped_refptr<gfx::GLSurface> gl_surface_;
111 scoped_ptr<gpu::gles2::GLES2CmdHelper> gles2_cmd_helper_; 109 scoped_ptr<gpu::gles2::GLES2CmdHelper> gles2_cmd_helper_;
112 scoped_ptr<gpu::TransferBuffer> transfer_buffer_; 110 scoped_ptr<gpu::TransferBuffer> transfer_buffer_;
113 111
114 // TODO(alokp): Support more than one config, surface, and context. 112 // TODO(alokp): Support more than one config, surface, and context.
115 scoped_ptr<Config> config_; 113 scoped_ptr<Config> config_;
116 scoped_ptr<Surface> surface_; 114 scoped_ptr<Surface> surface_;
117 scoped_ptr<gpu::gles2::GLES2Implementation> context_; 115 scoped_ptr<gpu::gles2::GLES2Implementation> context_;
118 116
119 DISALLOW_COPY_AND_ASSIGN(Display); 117 DISALLOW_COPY_AND_ASSIGN(Display);
120 }; 118 };
121 119
122 } // namespace egl 120 } // namespace egl
123 121
124 #endif // GPU_GLES2_CONFORM_SUPPORT_EGL_DISPLAY_H_ 122 #endif // GPU_GLES2_CONFORM_SUPPORT_EGL_DISPLAY_H_
OLDNEW
« no previous file with comments | « gpu/command_buffer_service.gypi ('k') | gpu/gles2_conform_support/egl/display.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698