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

Unified Diff: mojo/gpu/gl_context.cc

Issue 1310003004: Convert surfaces/service and dependents to MGL (Closed) Base URL: git@github.com:domokit/mojo.git@mgl_signal_sync_point
Patch Set: Created 5 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 | « mojo/gpu/gl_context.h ('k') | mojo/gpu/gl_texture.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/gpu/gl_context.cc
diff --git a/mojo/gpu/gl_context.cc b/mojo/gpu/gl_context.cc
index 3b4830a779915afb1fd96cdf1492c5e0b180b3db..7a78ea648a6765cef607e99349042a08d427c9d0 100644
--- a/mojo/gpu/gl_context.cc
+++ b/mojo/gpu/gl_context.cc
@@ -22,14 +22,16 @@ GLContext::GLContext(Shell* shell) : weak_factory_(this) {
ConnectToService(native_viewport.get(), &gpu_service);
CommandBufferPtr command_buffer;
gpu_service->CreateOffscreenGLES2Context(GetProxy(&command_buffer));
- context_ = MojoGLES2CreateContext(
+ context_ = MGLCreateContext(
+ MGL_API_VERSION_GLES2,
command_buffer.PassInterface().PassHandle().release().value(),
- &ContextLostThunk, this, Environment::GetDefaultAsyncWaiter());
+ MGL_NO_CONTEXT, &ContextLostThunk, this,
+ Environment::GetDefaultAsyncWaiter());
gl_impl_.reset(new MojoGLES2Impl(context_));
}
GLContext::~GLContext() {
- MojoGLES2DestroyContext(context_);
+ MGLDestroyContext(context_);
}
base::WeakPtr<GLContext> GLContext::Create(Shell* shell) {
@@ -37,7 +39,7 @@ base::WeakPtr<GLContext> GLContext::Create(Shell* shell) {
}
void GLContext::MakeCurrent() {
- MojoGLES2MakeCurrent(context_);
+ MGLDestroyContext(context_);
}
void GLContext::Destroy() {
« no previous file with comments | « mojo/gpu/gl_context.h ('k') | mojo/gpu/gl_texture.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698