diff options
| author | kmadhusu@chromium.org <kmadhusu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-27 20:28:00 +0000 |
|---|---|---|
| committer | kmadhusu@chromium.org <kmadhusu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-27 20:28:00 +0000 |
| commit | 4ecea1a2d0aa5318a2a4d7a790839103cfa8b59e (patch) | |
| tree | b747deb597e80e74f210da590b5e2075d46aad74 /gpu/GLES2/gl2chromium.h | |
| parent | a031c970f7b7a36c417214bb4bbe3fd39af9b7f1 (diff) | |
| download | chromium_src-4ecea1a2d0aa5318a2a4d7a790839103cfa8b59e.zip chromium_src-4ecea1a2d0aa5318a2a4d7a790839103cfa8b59e.tar.gz chromium_src-4ecea1a2d0aa5318a2a4d7a790839103cfa8b59e.tar.bz2 | |
Revert 174687
> Extract Chromium-specific parts out of third_party/khronos/GLES2 .
>
> BUG=161389
>
> Review URL: https://codereview.chromium.org/11679005
TBR=phajdan.jr@chromium.org
Review URL: https://codereview.chromium.org/11676011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174695 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/GLES2/gl2chromium.h')
| -rw-r--r-- | gpu/GLES2/gl2chromium.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/gpu/GLES2/gl2chromium.h b/gpu/GLES2/gl2chromium.h index ff22141..7cc84f0 100644 --- a/gpu/GLES2/gl2chromium.h +++ b/gpu/GLES2/gl2chromium.h @@ -6,16 +6,12 @@ // gpu/command_buffer/build_gles2_cmd_buffer.py // DO NOT EDIT! -// This file contains Chromium-specific GLES2 declarations. +// Because we are using both the real system GL and our own. +// emulated GL we need to use different names to avoid conflicts. #ifndef GPU_GLES2_GL2CHROMIUM_H_ #define GPU_GLES2_GL2CHROMIUM_H_ -#include <GLES2/gl2platform.h> -#define GL_CONTEXT_LOST 0x300E - -// Because we are using both the real system GL and our own -// emulated GL we need to use different names to avoid conflicts. #if defined(GLES2_USE_CPP_BINDINGS) #define GLES2_GET_FUN(name) gles2::GetGLContext()->name #else |