| 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(OS_ANDROID) |
| 13 #include <third_party/khronos/EGL/egl.h> | 13 #include <third_party/khronos/EGL/egl.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 DMA_BUFFER, |
| 22 ANDROID_NATIVE_BUFFER, | 23 ANDROID_NATIVE_BUFFER, |
| 23 SURFACE_TEXTURE_BUFFER, | 24 SURFACE_TEXTURE_BUFFER, |
| 24 GPU_MEMORY_BUFFER_TYPE_LAST = SURFACE_TEXTURE_BUFFER | 25 GPU_MEMORY_BUFFER_TYPE_LAST = SURFACE_TEXTURE_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) {} |
| (...skipping 10 matching lines...) Expand all Loading... |
| 42 : primary_id(primary_id), secondary_id(secondary_id) {} | 43 : primary_id(primary_id), secondary_id(secondary_id) {} |
| 43 int32 primary_id; | 44 int32 primary_id; |
| 44 int32 secondary_id; | 45 int32 secondary_id; |
| 45 }; | 46 }; |
| 46 | 47 |
| 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; |
| 53 base::SharedMemoryHandle card_handle; |
| 54 int stride; |
| 52 GpuMemoryBufferId global_id; | 55 GpuMemoryBufferId global_id; |
| 53 #if defined(OS_MACOSX) | 56 #if defined(OS_MACOSX) |
| 54 uint32 io_surface_id; | 57 uint32 io_surface_id; |
| 55 #endif | 58 #endif |
| 56 #if defined(OS_ANDROID) | 59 #if defined(OS_ANDROID) |
| 57 EGLClientBuffer native_buffer; | 60 EGLClientBuffer native_buffer; |
| 58 SurfaceTextureId surface_texture_id; | 61 SurfaceTextureId surface_texture_id; |
| 59 #endif | 62 #endif |
| 60 }; | 63 }; |
| 61 | 64 |
| (...skipping 21 matching lines...) Expand all Loading... |
| 83 // Returns the stride in bytes for the buffer. | 86 // Returns the stride in bytes for the buffer. |
| 84 virtual uint32 GetStride() const = 0; | 87 virtual uint32 GetStride() const = 0; |
| 85 | 88 |
| 86 // Returns a platform specific handle for this buffer. | 89 // Returns a platform specific handle for this buffer. |
| 87 virtual GpuMemoryBufferHandle GetHandle() const = 0; | 90 virtual GpuMemoryBufferHandle GetHandle() const = 0; |
| 88 }; | 91 }; |
| 89 | 92 |
| 90 } // namespace gfx | 93 } // namespace gfx |
| 91 | 94 |
| 92 #endif // UI_GFX_GPU_MEMORY_BUFFER_H_ | 95 #endif // UI_GFX_GPU_MEMORY_BUFFER_H_ |
| OLD | NEW |