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

Unified Diff: mojo/gpu/gl_context.h

Issue 1534813003: Use C bindings to Mojo GL entry points exclusively. (Closed) Base URL: git@github.com:domokit/mojo.git@moz-6
Patch Set: rebase Created 4 years, 11 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/BUILD.gn ('k') | mojo/gpu/gl_context.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/gpu/gl_context.h
diff --git a/mojo/gpu/gl_context.h b/mojo/gpu/gl_context.h
index d8197a51aafda23c6c8b6091fccd18c381f0b6b2..2ccdaaddafe88014f5109283e8942f4eaa474e8a 100644
--- a/mojo/gpu/gl_context.h
+++ b/mojo/gpu/gl_context.h
@@ -5,23 +5,15 @@
#ifndef MOJO_GPU_GL_CONTEXT_H_
#define MOJO_GPU_GL_CONTEXT_H_
-#include <MGL/mgl.h>
-
#include "base/basictypes.h"
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
+#include "mojo/public/c/gpu/MGL/mgl.h"
#include "mojo/public/cpp/bindings/interface_ptr.h"
-namespace gpu {
-namespace gles2 {
-class GLES2Interface;
-}
-}
-
namespace mojo {
class CommandBuffer;
using CommandBufferPtr = InterfacePtr<CommandBuffer>;
-class MojoGLES2Impl;
class Shell;
class GLContext {
@@ -39,10 +31,9 @@ class GLContext {
CommandBufferPtr command_buffer);
void MakeCurrent();
+ bool IsCurrent();
void Destroy();
- gpu::gles2::GLES2Interface* gl() const;
-
void AddObserver(Observer* observer);
void RemoveObserver(Observer* observer);
@@ -54,7 +45,6 @@ class GLContext {
void OnContextLost();
MGLContext context_;
- scoped_ptr<MojoGLES2Impl> gl_impl_;
base::ObserverList<Observer> observers_;
base::WeakPtrFactory<GLContext> weak_factory_;
« no previous file with comments | « mojo/gpu/BUILD.gn ('k') | mojo/gpu/gl_context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698