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

Side by Side Diff: ui/ozone/demo/surfaceless_gl_renderer.h

Issue 846283002: [Ozone-Demo] Fix surfaceless renderer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@re-add-surface-mode
Patch Set: Created 5 years, 11 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 | « ui/ozone/demo/gl_renderer.h ('k') | ui/ozone/demo/surfaceless_gl_renderer.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 UI_OZONE_DEMO_SURFACELESS_GL_RENDERER_H_ 5 #ifndef UI_OZONE_DEMO_SURFACELESS_GL_RENDERER_H_
6 #define UI_OZONE_DEMO_SURFACELESS_GL_RENDERER_H_ 6 #define UI_OZONE_DEMO_SURFACELESS_GL_RENDERER_H_
7 7
8 #include "base/memory/weak_ptr.h"
8 #include "ui/ozone/demo/gl_renderer.h" 9 #include "ui/ozone/demo/gl_renderer.h"
9 #include "ui/ozone/gpu/gpu_memory_buffer_factory_ozone_native_buffer.h" 10 #include "ui/ozone/gpu/gpu_memory_buffer_factory_ozone_native_buffer.h"
10 11
11 namespace gfx { 12 namespace gfx {
12 class GLImage; 13 class GLImage;
13 } // namespace gfx 14 } // namespace gfx
14 15
15 namespace ui { 16 namespace ui {
16 17
17 class SurfacelessGlRenderer : public GlRenderer { 18 class SurfacelessGlRenderer : public GlRenderer {
18 public: 19 public:
19 SurfacelessGlRenderer(gfx::AcceleratedWidget widget, const gfx::Size& size); 20 SurfacelessGlRenderer(gfx::AcceleratedWidget widget, const gfx::Size& size);
20 ~SurfacelessGlRenderer() override; 21 ~SurfacelessGlRenderer() override;
21 22
22 // Renderer: 23 // Renderer:
23 bool Initialize() override; 24 bool Initialize() override;
24 void RenderFrame() override; 25 void RenderFrame() override;
25 26
26 private: 27 private:
28 // Called by swap buffers when the actual swap finished.
29 void OnSwapBuffersAck();
30
27 class BufferWrapper { 31 class BufferWrapper {
28 public: 32 public:
29 BufferWrapper(); 33 BufferWrapper();
30 ~BufferWrapper(); 34 ~BufferWrapper();
31 35
32 bool Initialize(GpuMemoryBufferFactoryOzoneNativeBuffer* buffer_factory, 36 bool Initialize(GpuMemoryBufferFactoryOzoneNativeBuffer* buffer_factory,
33 gfx::AcceleratedWidget widget, 37 gfx::AcceleratedWidget widget,
34 const gfx::Size& size); 38 const gfx::Size& size);
35 void BindFramebuffer(); 39 void BindFramebuffer();
36 void SchedulePlane(); 40 void SchedulePlane();
37 41
38 private: 42 private:
39 gfx::AcceleratedWidget widget_; 43 gfx::AcceleratedWidget widget_;
40 gfx::Size size_; 44 gfx::Size size_;
41 45
42 scoped_refptr<gfx::GLImage> image_; 46 scoped_refptr<gfx::GLImage> image_;
43 unsigned int gl_fb_; 47 unsigned int gl_fb_;
44 unsigned int gl_tex_; 48 unsigned int gl_tex_;
45 }; 49 };
46 50
47 GpuMemoryBufferFactoryOzoneNativeBuffer buffer_factory_; 51 GpuMemoryBufferFactoryOzoneNativeBuffer buffer_factory_;
48 BufferWrapper buffers_[2]; 52 BufferWrapper buffers_[2];
49 int back_buffer_; 53 int back_buffer_;
54 bool is_swapping_buffers_;
55
56 base::WeakPtrFactory<SurfacelessGlRenderer> weak_ptr_factory_;
50 57
51 DISALLOW_COPY_AND_ASSIGN(SurfacelessGlRenderer); 58 DISALLOW_COPY_AND_ASSIGN(SurfacelessGlRenderer);
52 }; 59 };
53 60
54 } // namespace ui 61 } // namespace ui
55 62
56 #endif // UI_OZONE_DEMO_SURFACELESS_GL_RENDERER_H_ 63 #endif // UI_OZONE_DEMO_SURFACELESS_GL_RENDERER_H_
OLDNEW
« no previous file with comments | « ui/ozone/demo/gl_renderer.h ('k') | ui/ozone/demo/surfaceless_gl_renderer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698