OLD | NEW |
---|---|
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_GFX_GPU_MEMORY_BUFFER_H_ | 5 #ifndef UI_GFX_GPU_MEMORY_BUFFER_H_ |
6 #define UI_GFX_GPU_MEMORY_BUFFER_H_ | 6 #define UI_GFX_GPU_MEMORY_BUFFER_H_ |
7 | 7 |
8 #include "base/memory/shared_memory.h" | 8 #include "base/memory/shared_memory.h" |
9 #include "build/build_config.h" | 9 #include "build/build_config.h" |
10 #include "ui/gfx/gfx_export.h" | 10 #include "ui/gfx/gfx_export.h" |
11 | 11 |
12 #if defined(OS_ANDROID) | 12 #if defined(USE_X11) |
13 #include <third_party/khronos/EGL/egl.h> | 13 #include "ui/gfx/x/x11_types.h" |
14 #endif | 14 #endif |
15 | 15 |
16 namespace gfx { | 16 namespace gfx { |
17 | 17 |
18 enum GpuMemoryBufferType { | 18 enum GpuMemoryBufferType { |
19 EMPTY_BUFFER, | 19 EMPTY_BUFFER, |
20 SHARED_MEMORY_BUFFER, | 20 SHARED_MEMORY_BUFFER, |
21 IO_SURFACE_BUFFER, | 21 IO_SURFACE_BUFFER, |
22 ANDROID_NATIVE_BUFFER, | 22 ANDROID_NATIVE_BUFFER, |
23 SURFACE_TEXTURE_BUFFER, | 23 SURFACE_TEXTURE_BUFFER, |
24 GPU_MEMORY_BUFFER_TYPE_LAST = SURFACE_TEXTURE_BUFFER | 24 X11_PIXMAP_BUFFER, |
25 GPU_MEMORY_BUFFER_TYPE_LAST = X11_PIXMAP_BUFFER | |
25 }; | 26 }; |
26 | 27 |
27 // TODO(alexst): Merge this with GpuMemoryBufferId as part of switchover to | 28 // TODO(alexst): Merge this with GpuMemoryBufferId as part of switchover to |
28 // the new API for GpuMemoryBuffer allocation when it's done. | 29 // the new API for GpuMemoryBuffer allocation when it's done. |
29 #if defined(OS_ANDROID) | 30 #if defined(OS_ANDROID) |
30 struct SurfaceTextureId { | 31 struct SurfaceTextureId { |
31 SurfaceTextureId() : primary_id(0), secondary_id(0) {} | 32 SurfaceTextureId() : primary_id(0), secondary_id(0) {} |
32 SurfaceTextureId(int32 primary_id, int32 secondary_id) | 33 SurfaceTextureId(int32 primary_id, int32 secondary_id) |
33 : primary_id(primary_id), secondary_id(secondary_id) {} | 34 : primary_id(primary_id), secondary_id(secondary_id) {} |
34 int32 primary_id; | 35 int32 primary_id; |
(...skipping 12 matching lines...) Expand all Loading... | |
47 struct GFX_EXPORT GpuMemoryBufferHandle { | 48 struct GFX_EXPORT GpuMemoryBufferHandle { |
48 GpuMemoryBufferHandle(); | 49 GpuMemoryBufferHandle(); |
49 bool is_null() const { return type == EMPTY_BUFFER; } | 50 bool is_null() const { return type == EMPTY_BUFFER; } |
50 GpuMemoryBufferType type; | 51 GpuMemoryBufferType type; |
51 base::SharedMemoryHandle handle; | 52 base::SharedMemoryHandle handle; |
52 GpuMemoryBufferId global_id; | 53 GpuMemoryBufferId global_id; |
53 #if defined(OS_MACOSX) | 54 #if defined(OS_MACOSX) |
54 uint32 io_surface_id; | 55 uint32 io_surface_id; |
55 #endif | 56 #endif |
56 #if defined(OS_ANDROID) | 57 #if defined(OS_ANDROID) |
57 EGLClientBuffer native_buffer; | 58 long buffer_id; |
no sievers
2014/07/11 18:33:29
nit: why change this?
reveman
2014/07/11 21:08:06
Everything in this struct is expected to be serial
| |
58 SurfaceTextureId surface_texture_id; | 59 SurfaceTextureId surface_texture_id; |
59 #endif | 60 #endif |
61 #if defined(USE_X11) | |
62 XID pixmap; | |
63 #endif | |
60 }; | 64 }; |
61 | 65 |
62 // This interface typically correspond to a type of shared memory that is also | 66 // This interface typically correspond to a type of shared memory that is also |
63 // shared with the GPU. A GPU memory buffer can be written to directly by | 67 // shared with the GPU. A GPU memory buffer can be written to directly by |
64 // regular CPU code, but can also be read by the GPU. | 68 // regular CPU code, but can also be read by the GPU. |
65 class GFX_EXPORT GpuMemoryBuffer { | 69 class GFX_EXPORT GpuMemoryBuffer { |
66 public: | 70 public: |
67 GpuMemoryBuffer(); | 71 GpuMemoryBuffer(); |
68 virtual ~GpuMemoryBuffer(); | 72 virtual ~GpuMemoryBuffer(); |
69 | 73 |
(...skipping 13 matching lines...) Expand all Loading... | |
83 // Returns the stride in bytes for the buffer. | 87 // Returns the stride in bytes for the buffer. |
84 virtual uint32 GetStride() const = 0; | 88 virtual uint32 GetStride() const = 0; |
85 | 89 |
86 // Returns a platform specific handle for this buffer. | 90 // Returns a platform specific handle for this buffer. |
87 virtual GpuMemoryBufferHandle GetHandle() const = 0; | 91 virtual GpuMemoryBufferHandle GetHandle() const = 0; |
88 }; | 92 }; |
89 | 93 |
90 } // namespace gfx | 94 } // namespace gfx |
91 | 95 |
92 #endif // UI_GFX_GPU_MEMORY_BUFFER_H_ | 96 #endif // UI_GFX_GPU_MEMORY_BUFFER_H_ |
OLD | NEW |