diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
| commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
| tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebCore/platform/graphics/GraphicsContext3D.h | |
| parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
| download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 | |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebCore/platform/graphics/GraphicsContext3D.h')
| -rw-r--r-- | Source/WebCore/platform/graphics/GraphicsContext3D.h | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/Source/WebCore/platform/graphics/GraphicsContext3D.h b/Source/WebCore/platform/graphics/GraphicsContext3D.h index d6c1cec..a9db650 100644 --- a/Source/WebCore/platform/graphics/GraphicsContext3D.h +++ b/Source/WebCore/platform/graphics/GraphicsContext3D.h @@ -28,6 +28,7 @@ #include "IntSize.h" #include "GraphicsLayer.h" +#include "GraphicsTypes3D.h" #include "PlatformString.h" #include <wtf/HashMap.h> @@ -42,25 +43,6 @@ #undef VERSION #endif -// GC3D types match the corresponding GL types as defined in OpenGL ES 2.0 -// header file gl2.h from khronos.org. -typedef unsigned int GC3Denum; -typedef unsigned char GC3Dboolean; -typedef unsigned int GC3Dbitfield; -typedef signed char GC3Dbyte; -typedef unsigned char GC3Dubyte; -typedef short GC3Dshort; -typedef unsigned short GC3Dushort; -typedef int GC3Dint; -typedef int GC3Dsizei; -typedef unsigned int GC3Duint; -typedef float GC3Dfloat; -typedef float GC3Dclampf; -typedef signed long int GC3Dintptr; -typedef signed long int GC3Dsizeiptr; - -typedef GC3Duint Platform3DObject; - #if PLATFORM(MAC) #include "ANGLEWebKitBridge.h" #include <OpenGL/OpenGL.h> |