ui/gfx/gpu_memory_buffer.h - Issue 331723003: gpu: Remove Create/DeleteImage IPC by adding an X11_PIXMAP_BUFFER GpuMemoryBuffer type.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/gfx/gpu_memory_buffer.h

Issue 331723003: gpu: Remove Create/DeleteImage IPC by adding an X11_PIXMAP_BUFFER GpuMemoryBuffer type. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 5 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 1a622016c7c003f212ec8428f96cf3f1ae0cedba..d21725a31dc25ffc59d5ed6a3245e94419a5ae0c 100644

--- a/ui/gfx/gpu_memory_buffer.h

+++ b/ui/gfx/gpu_memory_buffer.h

@@ -9,8 +9,8 @@

#include "build/build_config.h"

#include "ui/gfx/gfx_export.h"

-#if defined(OS_ANDROID)

-#include <third_party/khronos/EGL/egl.h>

+#if defined(USE_X11)

+#include "ui/gfx/x/x11_types.h"

#endif

namespace gfx {

@@ -21,7 +21,8 @@ enum GpuMemoryBufferType {

IO_SURFACE_BUFFER,

ANDROID_NATIVE_BUFFER,

SURFACE_TEXTURE_BUFFER,

- GPU_MEMORY_BUFFER_TYPE_LAST = SURFACE_TEXTURE_BUFFER

+ X11_PIXMAP_BUFFER,

+ GPU_MEMORY_BUFFER_TYPE_LAST = X11_PIXMAP_BUFFER

};

// TODO(alexst): Merge this with GpuMemoryBufferId as part of switchover to

@@ -54,9 +55,12 @@ struct GFX_EXPORT GpuMemoryBufferHandle {

uint32 io_surface_id;

#endif

#if defined(OS_ANDROID)

- EGLClientBuffer native_buffer;

+ long buffer_id;

SurfaceTextureId surface_texture_id;

#endif

+#if defined(USE_X11)

+ XID pixmap;

+#endif

};

// This interface typically correspond to a type of shared memory that is also

« no previous file with comments | « mojo/services/gles2/command_buffer_impl.cc ('k') | ui/gfx/gpu_memory_buffer.cc » ('j') | no next file with comments »