Chromium Code Reviews| Index: ui/gfx/gpu_memory_buffer.h |
| diff --git a/ui/gfx/gpu_memory_buffer.h b/ui/gfx/gpu_memory_buffer.h |
| index 3510a911c0493ca3c4781120a3abd0976f78781f..0ceae68866184e1ac5e6853dde791119b650fa78 100644 |
| --- a/ui/gfx/gpu_memory_buffer.h |
| +++ b/ui/gfx/gpu_memory_buffer.h |
| @@ -20,7 +20,8 @@ enum GpuMemoryBufferType { |
| SHARED_MEMORY_BUFFER, |
| EGL_CLIENT_BUFFER, |
| IO_SURFACE_BUFFER, |
| - GPU_MEMORY_BUFFER_TYPE_LAST = IO_SURFACE_BUFFER |
| + SURFACE_TEXTURE_BUFFER, |
| + GPU_MEMORY_BUFFER_TYPE_LAST = SURFACE_TEXTURE_BUFFER |
| }; |
| struct GpuMemoryBufferHandle { |
| @@ -33,6 +34,9 @@ struct GpuMemoryBufferHandle { |
| #if defined(OS_MACOSX) |
| , io_surface_id(0) |
| #endif |
| +#if defined(OS_ANDROID) |
| + , surface_texture_id(0) |
| +#endif |
| { |
| } |
| bool is_null() const { return type == EMPTY_BUFFER; } |
| @@ -44,7 +48,9 @@ struct GpuMemoryBufferHandle { |
| #if defined(OS_MACOSX) |
| uint32 io_surface_id; |
| #endif |
| - |
| +#if defined(OS_ANDROID) |
| + uint32 surface_texture_id; |
|
epennerAtGoogle
2014/03/12 00:45:06
Throughout this patch, I'd like it if we can make
reveman
2014/03/12 16:07:06
Would a simple typedef int SurfaceTextureID help?
epennerAtGoogle
2014/03/12 19:46:28
Yeppers!
reveman
2014/03/13 21:36:00
I started doing this but realized I need to put it
|
| +#endif |
| }; |
| // Interface for creating and accessing a zero-copy GPU memory buffer. |