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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/gfx/gl/gl_context_osmesa.cc

Issue 7980006: Implement OSMesa image transport for TOUCH_UI builds (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Rebase onto newer trunk Created 9 years, 3 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
« content/common/gpu/image_transport_surface_linux.cc ('K') | « content/common/gpu/image_transport_surface_linux.cc ('k') | ui/gfx/gl/gl_surface_glx.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/gl/gl_context_osmesa.cc
diff --git a/ui/gfx/gl/gl_context_osmesa.cc b/ui/gfx/gl/gl_context_osmesa.cc
index 0db285f38dd86d4bd52aa004cc130aa13809e984..4e145ac400f456128890d4f9e0a86ca60ccaf424 100644
--- a/ui/gfx/gl/gl_context_osmesa.cc
+++ b/ui/gfx/gl/gl_context_osmesa.cc
@@ -29,6 +29,7 @@ bool GLContextOSMesa::Initialize(GLSurface* compatible_surface) {
GLuint format =
static_cast<GLSurfaceOSMesa*>(compatible_surface)->GetFormat();
+ DCHECK_NE(format, (unsigned)0);
context_ = OSMesaCreateContextExt(format,
0, // depth bits
0, // stencil bits
@@ -54,7 +55,7 @@ bool GLContextOSMesa::MakeCurrent(GLSurface* surface) {
gfx::Size size = surface->GetSize();
- if (!OSMesaMakeCurrent(static_cast<OSMesaContext>(context_),
+ if (!OSMesaMakeCurrent(context_,
surface->GetHandle(),
GL_UNSIGNED_BYTE,
size.width(),
« content/common/gpu/image_transport_surface_linux.cc ('K') | « content/common/gpu/image_transport_surface_linux.cc ('k') | ui/gfx/gl/gl_surface_glx.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698