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

Unified Diff: ui/gfx/gpu_memory_buffer.h

Issue 195583003: Add initial GpuMemoryBufferSurfaceTexture implementation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: use base::ProcessHandle explicitly in a few places Created 6 years, 9 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 side-by-side diff with in-line comments
Download patch
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..08f75329e6b425891f8e898e95d00417b9af78fb 100644
--- a/ui/gfx/gpu_memory_buffer.h
+++ b/ui/gfx/gpu_memory_buffer.h
@@ -20,9 +20,20 @@ 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
};
+#if defined(OS_ANDROID)
+struct SurfaceTextureId {
+ SurfaceTextureId() : primary_id(0), secondary_id(0) {}
+ SurfaceTextureId(int32 primary_id, int32 secondary_id)
+ : primary_id(primary_id), secondary_id(secondary_id) {}
+ int32 primary_id;
+ int32 secondary_id;
+};
+#endif
+
struct GpuMemoryBufferHandle {
GpuMemoryBufferHandle()
: type(EMPTY_BUFFER),
@@ -44,7 +55,9 @@ struct GpuMemoryBufferHandle {
#if defined(OS_MACOSX)
uint32 io_surface_id;
#endif
-
+#if defined(OS_ANDROID)
+ SurfaceTextureId surface_texture_id;
piman 2014/03/27 01:07:25 nit: can we factor that into the #if in line 53?
reveman 2014/03/27 14:48:11 Done.
+#endif
};
// Interface for creating and accessing a zero-copy GPU memory buffer.

Powered by Google App Engine
This is Rietveld 408576698