Use C bindings to Mojo GL entry points exclusively.

mojo/gpu/gl_context.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/gpu/gl_context.h"
-
-#include "mojo/gpu/mojo_gles2_impl_autogen.h"
 #include "mojo/public/cpp/application/connect.h"
 #include "mojo/public/interfaces/application/shell.mojom.h"
 #include "mojo/services/gpu/interfaces/gpu.mojom.h"
 
 namespace mojo {
 
 GLContext::Observer::~Observer() {}
 
 GLContext::GLContext(CommandBufferPtr command_buffer) : weak_factory_(this) {
   context_ = MGLCreateContext(
       MGL_API_VERSION_GLES2,
       command_buffer.PassInterface().PassHandle().release().value(),
       MGL_NO_CONTEXT, &ContextLostThunk, this,
       Environment::GetDefaultAsyncWaiter());
-  gl_impl_.reset(new MojoGLES2Impl(context_));
+  DCHECK(context_ != MGL_NO_CONTEXT);
 }
 
 GLContext::~GLContext() {
   MGLDestroyContext(context_);
 }
 
 base::WeakPtr<GLContext> GLContext::Create(Shell* shell) {
   ServiceProviderPtr native_viewport;
   shell->ConnectToApplication("mojo:native_viewport_service",
                               GetProxy(&native_viewport), nullptr);
   GpuPtr gpu_service;
   ConnectToService(native_viewport.get(), &gpu_service);
   CommandBufferPtr command_buffer;
   gpu_service->CreateOffscreenGLES2Context(GetProxy(&command_buffer));
   return CreateFromCommandBuffer(command_buffer.Pass());
 }
 
 base::WeakPtr<GLContext> GLContext::CreateFromCommandBuffer(
     CommandBufferPtr command_buffer) {
   return (new GLContext(command_buffer.Pass()))->weak_factory_.GetWeakPtr();
 }
 
 void GLContext::MakeCurrent() {
   MGLMakeCurrent(context_);
 }
 
+bool GLContext::IsCurrent() {
+  return context_ == MGLGetCurrentContext();
+}
+
 void GLContext::Destroy() {
   delete this;
 }
 
-gpu::gles2::GLES2Interface* GLContext::gl() const {
-  return gl_impl_.get();
-}
-
 void GLContext::AddObserver(Observer* observer) {
   observers_.AddObserver(observer);
 }
 
 void GLContext::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
 void GLContext::ContextLostThunk(void* self) {
   static_cast<GLContext*>(self)->OnContextLost();
 }
 
 void GLContext::OnContextLost() {
   FOR_EACH_OBSERVER(Observer, observers_, OnContextLost());
 }
 
 }  // namespace mojo