diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-09 22:06:15 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-09 22:06:15 +0000 |
| commit | b9363b2794c6f287be68eebb361117cdfbf060ca (patch) | |
| tree | 74408c31f3920ae183663b0f16e633349805798e /app/surface | |
| parent | c8c9712650efaa201c97ad6ff4edb6aa092dfd17 (diff) | |
| download | chromium_src-b9363b2794c6f287be68eebb361117cdfbf060ca.zip chromium_src-b9363b2794c6f287be68eebb361117cdfbf060ca.tar.gz chromium_src-b9363b2794c6f287be68eebb361117cdfbf060ca.tar.bz2 | |
Added EGL based GLContext.
Python script to generate code to dynamically bind to GL functions (native GL, OSMesa, EGL or mock GL for unit tests). This replaces GLEW because GLEW doesn't bind to the GLES dialect of GL.
Moved the mock GL code into app/gfx/gl.
Updated the GPU code and AcceleratedSurface to use the new GL bindings.
TEST=trybots
BUG=none
Review URL: http://codereview.chromium.org/2134006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49332 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/surface')
| -rw-r--r-- | app/surface/accelerated_surface_mac.cc | 1 | ||||
| -rw-r--r-- | app/surface/accelerated_surface_mac.h | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/app/surface/accelerated_surface_mac.cc b/app/surface/accelerated_surface_mac.cc index 2d6ac7a..06e48ddb 100644 --- a/app/surface/accelerated_surface_mac.cc +++ b/app/surface/accelerated_surface_mac.cc @@ -4,6 +4,7 @@ #include "app/surface/accelerated_surface_mac.h" +#include "app/gfx/gl/gl_bindings.h" #include "app/surface/io_surface_support_mac.h" #include "base/logging.h" #include "gfx/rect.h" diff --git a/app/surface/accelerated_surface_mac.h b/app/surface/accelerated_surface_mac.h index f01bbc7..d1fe311 100644 --- a/app/surface/accelerated_surface_mac.h +++ b/app/surface/accelerated_surface_mac.h @@ -6,7 +6,6 @@ #define APP_SURFACE_ACCELERATED_SURFACE_MAC_H_ #include <CoreFoundation/CoreFoundation.h> -#include <OpenGL/OpenGL.h> #include "app/surface/transport_dib.h" #include "base/callback.h" @@ -15,6 +14,13 @@ #include "gfx/rect.h" #include "gfx/size.h" +// Should not include GL headers in a header file. Forward declare these types +// instead. +typedef struct _CGLContextObject* CGLContextObj; +typedef struct _CGLPBufferObject* CGLPBufferObj; +typedef unsigned int GLenum; +typedef unsigned int GLuint; + namespace gfx { class Rect; } |