diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-09 21:16:02 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-09 21:16:02 +0000 |
| commit | d37231fa18e0978822c6aa2c9d03e7a56e61810b (patch) | |
| tree | 2765f8b09fe2f23a667cc1c0fb821d384a35dbd0 /gpu/command_buffer/service/gl_utils.h | |
| parent | 7b70a92006d329a3e2df40ec6b61322212f75d95 (diff) | |
| download | chromium_src-d37231fa18e0978822c6aa2c9d03e7a56e61810b.zip chromium_src-d37231fa18e0978822c6aa2c9d03e7a56e61810b.tar.gz chromium_src-d37231fa18e0978822c6aa2c9d03e7a56e61810b.tar.bz2 | |
- Extracted platform specific code from GLES2 command decoder to platform specific GLContext classes.
- GLContext encapsulates management of GL contexts on each platform.
- ReadPixels uses actual current window size to validate source rectangle.
TEST=trybots, running Pepper 3D and WebGL demos on all platforms
BUG=none
Review URL: http://codereview.chromium.org/1605014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44129 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer/service/gl_utils.h')
| -rw-r--r-- | gpu/command_buffer/service/gl_utils.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gpu/command_buffer/service/gl_utils.h b/gpu/command_buffer/service/gl_utils.h index 943681c..c5a3c98 100644 --- a/gpu/command_buffer/service/gl_utils.h +++ b/gpu/command_buffer/service/gl_utils.h @@ -53,8 +53,12 @@ #include <GL/glew.h> // NOLINT #if defined(OS_WIN) #include <GL/wglew.h> // NOLINT + #include <windows.h> // NOLINT #elif defined(OS_LINUX) #include <GL/glxew.h> // NOLINT + #include <GL/glx.h> // NOLINT + #elif defined(OS_MACOSX) + #include <OpenGL/OpenGL.h> // NOLINT #endif // OS_WIN // GLES2 defines not part of Desktop GL |