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

Unified Diff: ui/gl/gl_image_x11.cc

Issue 20017005: gpu: Refactor GpuMemoryBuffer framework for multi-process support. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 4 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
« no previous file with comments | « ui/gl/gl_image_win.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_image_x11.cc
diff --git a/ui/gl/gl_image_x11.cc b/ui/gl/gl_image_x11.cc
index a6c09a1513710aa8634b4bfa41a0814d4a02f6bf..6f7d8c6e85b3c735d07c1d0feccbee89d5c458be 100644
--- a/ui/gl/gl_image_x11.cc
+++ b/ui/gl/gl_image_x11.cc
@@ -35,7 +35,9 @@ scoped_refptr<GLImage> GLImage::CreateGLImage(gfx::PluginWindowHandle window) {
}
scoped_refptr<GLImage> GLImage::CreateGLImageForGpuMemoryBuffer(
- gfx::GpuMemoryBufferHandle buffer, gfx::Size size) {
+ gfx::GpuMemoryBufferHandle buffer,
+ gfx::Size size,
+ unsigned internalformat) {
TRACE_EVENT0("gpu", "GLImage::CreateGLImageForGpuMemoryBuffer");
switch (GetGLImplementation()) {
case kGLImplementationOSMesaGL:
@@ -43,7 +45,8 @@ scoped_refptr<GLImage> GLImage::CreateGLImageForGpuMemoryBuffer(
case kGLImplementationEGLGLES2:
switch (buffer.type) {
case SHARED_MEMORY_BUFFER: {
- scoped_refptr<GLImageShm> image(new GLImageShm(size));
+ scoped_refptr<GLImageShm> image(
+ new GLImageShm(size, internalformat));
if (!image->Initialize(buffer))
return NULL;
« no previous file with comments | « ui/gl/gl_image_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698