summaryrefslogtreecommitdiffstats
path: root/ui/gl/gl_image_android_native_buffer.cc
diff options
context:
space:
mode:
authorreveman@chromium.org <reveman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-18 15:40:59 +0000
committerreveman@chromium.org <reveman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-18 15:40:59 +0000
commitb63f1d6dc0569a970a43c5a456d38cd543eea27c (patch)
treef3dd7ee9d94aafb84caab814c189c22662c53d6a /ui/gl/gl_image_android_native_buffer.cc
parent602b5a29f74202a4c36acfedcf1562f78abfce3c (diff)
downloadchromium_src-b63f1d6dc0569a970a43c5a456d38cd543eea27c.zip
chromium_src-b63f1d6dc0569a970a43c5a456d38cd543eea27c.tar.gz
chromium_src-b63f1d6dc0569a970a43c5a456d38cd543eea27c.tar.bz2
gpu: Remove Create/DeleteImage IPC by adding an X11_PIXMAP_BUFFER GpuMemoryBuffer type.
This adds a new GpuMemoryBuffer type that can be used to create a GpuMemoryBuffer from an existing X11 pixmap. This removes Create/DeleteImage IPC and reduces complexity significantly as it allows the ImageManager to be moved to the decoder and simply track images. A new platform dependent GpuMemoryBufferFactory interface is introduced to allow this new type of buffer to be created on the GPU service side. To avoid the need for any global variables, this factory instance is also responsible for creating GLImage instances. The old factory interface used by android_webview is renamed InProcessGpuMemoryBufferFactory until it can be removed in favor of this new interface. BUG=368716 TEST=gpu_unittests, gl_tests --gtest_filter=GpuMemoryBufferTest.Lifecycle Review URL: https://codereview.chromium.org/331723003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284097 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gl/gl_image_android_native_buffer.cc')
-rw-r--r--ui/gl/gl_image_android_native_buffer.cc11
1 files changed, 5 insertions, 6 deletions
diff --git a/ui/gl/gl_image_android_native_buffer.cc b/ui/gl/gl_image_android_native_buffer.cc
index 6d11497..5e311ee 100644
--- a/ui/gl/gl_image_android_native_buffer.cc
+++ b/ui/gl/gl_image_android_native_buffer.cc
@@ -9,22 +9,21 @@
namespace gfx {
-GLImageAndroidNativeBuffer::GLImageAndroidNativeBuffer(gfx::Size size)
+GLImageAndroidNativeBuffer::GLImageAndroidNativeBuffer(const gfx::Size& size)
: GLImageEGL(size),
release_after_use_(false),
in_use_(false),
target_(0),
egl_image_for_unbind_(EGL_NO_IMAGE_KHR),
- texture_id_for_unbind_(0) {}
+ texture_id_for_unbind_(0) {
+}
GLImageAndroidNativeBuffer::~GLImageAndroidNativeBuffer() { Destroy(); }
-bool GLImageAndroidNativeBuffer::Initialize(gfx::GpuMemoryBufferHandle buffer) {
- DCHECK(buffer.native_buffer);
-
+bool GLImageAndroidNativeBuffer::Initialize(EGLClientBuffer native_buffer) {
EGLint attrs[] = {EGL_IMAGE_PRESERVED_KHR, EGL_TRUE, EGL_NONE};
return GLImageEGL::Initialize(
- EGL_NATIVE_BUFFER_ANDROID, buffer.native_buffer, attrs);
+ EGL_NATIVE_BUFFER_ANDROID, native_buffer, attrs);
}
void GLImageAndroidNativeBuffer::Destroy() {