Fixed building on Android, added SDL_opengles2.h, removed unnecessary SDL_glesfuncs.h
authorSam Lantinga <slouken@libsdl.org>
Sun, 06 Feb 2011 02:35:14 -0800
changeset 5204 daa5463466c5
parent 5203 25ffd4e5255c
child 5205 af7caea67886
Fixed building on Android, added SDL_opengles2.h, removed unnecessary SDL_glesfuncs.h
Android.mk
Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj
include/SDL_config_android.h
include/SDL_opengles.h
include/SDL_opengles2.h
src/render/opengl/SDL_glfuncs.h
src/render/opengl/SDL_render_gl.c
src/render/opengles/SDL_render_gles.c
src/render/opengles2/SDL_render_gles2.c
src/render/opengles2/SDL_shaders_gles2.c
src/render/opengles2/SDL_shaders_gles2.h
src/video/SDL_glesfuncs.h
src/video/SDL_glfuncs.h
src/video/android/SDL_androidgl.c
--- a/Android.mk	Sun Feb 06 00:48:41 2011 -0800
+++ b/Android.mk	Sun Feb 06 02:35:14 2011 -0800
@@ -31,8 +31,7 @@
 	$(wildcard $(LOCAL_PATH)/src/loadso/dlopen/*.c) \
 	$(wildcard $(LOCAL_PATH)/src/power/*.c) \
 	$(wildcard $(LOCAL_PATH)/src/render/*.c) \
-	$(wildcard $(LOCAL_PATH)/src/render/opengles/*.c) \
-	$(wildcard $(LOCAL_PATH)/src/render/software/*.c) \
+	$(wildcard $(LOCAL_PATH)/src/render/*/*.c) \
 	$(wildcard $(LOCAL_PATH)/src/stdlib/*.c) \
 	$(wildcard $(LOCAL_PATH)/src/thread/*.c) \
 	$(wildcard $(LOCAL_PATH)/src/thread/pthread/*.c) \
@@ -41,6 +40,6 @@
 	$(wildcard $(LOCAL_PATH)/src/video/*.c) \
 	$(wildcard $(LOCAL_PATH)/src/video/android/*.c))
 
-LOCAL_LDLIBS := -ldl -lGLESv1_CM -llog
+LOCAL_LDLIBS := -ldl -lGLESv1_CM -lGLESv2 -llog
 
 include $(BUILD_SHARED_LIBRARY)
--- a/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj	Sun Feb 06 00:48:41 2011 -0800
+++ b/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj	Sun Feb 06 02:35:14 2011 -0800
@@ -65,6 +65,7 @@
 		0402A85812FE70C600CECEE3 /* SDL_render_gles2.c in Sources */ = {isa = PBXBuildFile; fileRef = 0402A85512FE70C600CECEE3 /* SDL_render_gles2.c */; };
 		0402A85912FE70C600CECEE3 /* SDL_shaders_gles2.c in Sources */ = {isa = PBXBuildFile; fileRef = 0402A85612FE70C600CECEE3 /* SDL_shaders_gles2.c */; };
 		0402A85A12FE70C600CECEE3 /* SDL_shaders_gles2.h in Headers */ = {isa = PBXBuildFile; fileRef = 0402A85712FE70C600CECEE3 /* SDL_shaders_gles2.h */; };
+		04043B8D12FEA9350076DB1F /* SDL_opengles2.h in Headers */ = {isa = PBXBuildFile; fileRef = 04043B8C12FEA9350076DB1F /* SDL_opengles2.h */; };
 		041B2CD912FA0E9E0087D585 /* SDL_render.h in Headers */ = {isa = PBXBuildFile; fileRef = 041B2CD812FA0E9E0087D585 /* SDL_render.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		041B2CF112FA0F680087D585 /* SDL_render.c in Sources */ = {isa = PBXBuildFile; fileRef = 041B2CEA12FA0F680087D585 /* SDL_render.c */; };
 		041B2CF212FA0F680087D585 /* SDL_sysrender.h in Headers */ = {isa = PBXBuildFile; fileRef = 041B2CEB12FA0F680087D585 /* SDL_sysrender.h */; };
@@ -89,8 +90,6 @@
 		047677BC0EA76A31008ABAF1 /* SDL_haptic.c in Sources */ = {isa = PBXBuildFile; fileRef = 047677B90EA76A31008ABAF1 /* SDL_haptic.c */; };
 		047677BD0EA76A31008ABAF1 /* SDL_syshaptic.h in Headers */ = {isa = PBXBuildFile; fileRef = 047677BA0EA76A31008ABAF1 /* SDL_syshaptic.h */; };
 		047AF1B30EA98D6C00811173 /* SDL_sysloadso.c in Sources */ = {isa = PBXBuildFile; fileRef = 047AF1B20EA98D6C00811173 /* SDL_sysloadso.c */; };
-		0495E68A0E97408800152DFE /* SDL_glesfuncs.h in Headers */ = {isa = PBXBuildFile; fileRef = 0495E6840E97408800152DFE /* SDL_glesfuncs.h */; };
-		0495E68B0E97408800152DFE /* SDL_glfuncs.h in Headers */ = {isa = PBXBuildFile; fileRef = 0495E6850E97408800152DFE /* SDL_glfuncs.h */; };
 		04B2ECEC1025CE4800F9BC5F /* SDL_atomic.h in Headers */ = {isa = PBXBuildFile; fileRef = 04B2ECE61025CE4800F9BC5F /* SDL_atomic.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		04B2ECED1025CE4800F9BC5F /* SDL_power.h in Headers */ = {isa = PBXBuildFile; fileRef = 04B2ECE71025CE4800F9BC5F /* SDL_power.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		04B2ECEE1025CE4800F9BC5F /* SDL_revision.h in Headers */ = {isa = PBXBuildFile; fileRef = 04B2ECE81025CE4800F9BC5F /* SDL_revision.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -330,6 +329,7 @@
 		0402A85512FE70C600CECEE3 /* SDL_render_gles2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_render_gles2.c; sourceTree = "<group>"; };
 		0402A85612FE70C600CECEE3 /* SDL_shaders_gles2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_shaders_gles2.c; sourceTree = "<group>"; };
 		0402A85712FE70C600CECEE3 /* SDL_shaders_gles2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_shaders_gles2.h; sourceTree = "<group>"; };
+		04043B8C12FEA9350076DB1F /* SDL_opengles2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_opengles2.h; path = ../../include/SDL_opengles2.h; sourceTree = SOURCE_ROOT; };
 		041B2CD812FA0E9E0087D585 /* SDL_render.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_render.h; path = ../../include/SDL_render.h; sourceTree = SOURCE_ROOT; };
 		041B2CEA12FA0F680087D585 /* SDL_render.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_render.c; sourceTree = "<group>"; };
 		041B2CEB12FA0F680087D585 /* SDL_sysrender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_sysrender.h; sourceTree = "<group>"; };
@@ -354,8 +354,6 @@
 		047677B90EA76A31008ABAF1 /* SDL_haptic.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_haptic.c; path = ../../src/haptic/SDL_haptic.c; sourceTree = SOURCE_ROOT; };
 		047677BA0EA76A31008ABAF1 /* SDL_syshaptic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_syshaptic.h; path = ../../src/haptic/SDL_syshaptic.h; sourceTree = SOURCE_ROOT; };
 		047AF1B20EA98D6C00811173 /* SDL_sysloadso.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_sysloadso.c; sourceTree = "<group>"; };
-		0495E6840E97408800152DFE /* SDL_glesfuncs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_glesfuncs.h; sourceTree = "<group>"; };
-		0495E6850E97408800152DFE /* SDL_glfuncs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_glfuncs.h; sourceTree = "<group>"; };
 		04B2ECE61025CE4800F9BC5F /* SDL_atomic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_atomic.h; path = ../../include/SDL_atomic.h; sourceTree = SOURCE_ROOT; };
 		04B2ECE71025CE4800F9BC5F /* SDL_power.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_power.h; path = ../../include/SDL_power.h; sourceTree = SOURCE_ROOT; };
 		04B2ECE81025CE4800F9BC5F /* SDL_revision.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_revision.h; path = ../../include/SDL_revision.h; sourceTree = SOURCE_ROOT; };
@@ -941,6 +939,7 @@
 				FD99B8E50DD52EB400FB1D6B /* SDL_name.h */,
 				FD99B8E60DD52EB400FB1D6B /* SDL_opengl.h */,
 				FD8BD7AB0E27DCA400B52CD5 /* SDL_opengles.h */,
+				04043B8C12FEA9350076DB1F /* SDL_opengles2.h */,
 				FD99B8E70DD52EB400FB1D6B /* SDL_pixels.h */,
 				FD99B8E80DD52EB400FB1D6B /* SDL_platform.h */,
 				04B2ECE71025CE4800F9BC5F /* SDL_power.h */,
@@ -1124,8 +1123,6 @@
 			children = (
 				FD689F090E26E5D900F90B21 /* uikit */,
 				FDA685F40DF244C800F98A1A /* dummy */,
-				0495E6850E97408800152DFE /* SDL_glfuncs.h */,
-				0495E6840E97408800152DFE /* SDL_glesfuncs.h */,
 				FDA683000DF2374E00F98A1A /* SDL_blit.c */,
 				FDA683010DF2374E00F98A1A /* SDL_blit.h */,
 				FDA683020DF2374E00F98A1A /* SDL_blit_0.c */,
@@ -1232,8 +1229,6 @@
 				FD8BD7AC0E27DCA400B52CD5 /* SDL_opengles.h in Headers */,
 				FDC656490E560DF800311C8E /* jumphack.h in Headers */,
 				FD24846D0E5655AE0021E198 /* SDL_uikitkeyboard.h in Headers */,
-				0495E68A0E97408800152DFE /* SDL_glesfuncs.h in Headers */,
-				0495E68B0E97408800152DFE /* SDL_glfuncs.h in Headers */,
 				047677BD0EA76A31008ABAF1 /* SDL_syshaptic.h in Headers */,
 				04461DEE0EA76BA3006C462D /* SDL_haptic.h in Headers */,
 				046387420F0B5B7D0041FD65 /* SDL_blit_slow.h in Headers */,
@@ -1267,6 +1262,7 @@
 				0442EC4B12FE1BFF004C9285 /* SDL_hints.h in Headers */,
 				0442EC5012FE1C1E004C9285 /* SDL_render_sw_c.h in Headers */,
 				0402A85A12FE70C600CECEE3 /* SDL_shaders_gles2.h in Headers */,
+				04043B8D12FEA9350076DB1F /* SDL_opengles2.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
--- a/include/SDL_config_android.h	Sun Feb 06 00:48:41 2011 -0800
+++ b/include/SDL_config_android.h	Sun Feb 06 02:35:14 2011 -0800
@@ -142,5 +142,6 @@
 /* Enable OpenGL ES */
 #define SDL_VIDEO_OPENGL_ES	1
 #define SDL_VIDEO_RENDER_OGL_ES	1
+#define SDL_VIDEO_RENDER_OGL_ES2	1
 
 #endif /* _SDL_config_minimal_h */
--- a/include/SDL_opengles.h	Sun Feb 06 00:48:41 2011 -0800
+++ b/include/SDL_opengles.h	Sun Feb 06 02:35:14 2011 -0800
@@ -1,1039 +1,39 @@
 /*
- SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2010 Sam Lantinga
- 
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
- 
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
- 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- 
- Sam Lantinga
- slouken@libsdl.org
- */
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2010 Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+*/
 
 /**
  *  \file SDL_opengles.h
  *  
- *  This is a simple file to encapsulate the OpenGL ES API headers.
- *  
- *  Headers copied from The Kronos Group website.
- *  	http://www.khronos.org/opengles/
+ *  This is a simple file to encapsulate the OpenGL ES 1.X API headers.
  */
 
-#ifndef __gles_h_
-#define __gles_h_
-
-/* $Id: gl.h 4533 2007-11-26 11:19:35Z markc $ */
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 #ifdef __IPHONEOS__
-#include <OpenGLES/ES1/gl.h>    /* Header File For The OpenGL ES Library */
+#include <OpenGLES/ES1/gl.h>
+#include <OpenGLES/ES1/glext.h>
+#else
+#include <GLES/gl.h>
+#include <GLES/glext.h>
 #endif
 
 #ifndef APIENTRY
 #define APIENTRY
 #endif
-
-#ifndef GL_APIENTRY
-#define GL_APIENTRY
-#endif
-
-#ifndef GL_API
-#define GL_API
-#endif                          /* GL_API */
-
-/*
-** License Applicability. Except to the extent portions of this file are
-** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 1.0 (the "License"), the contents of this
-** file are subject only to the provisions of the License. You may not use
-** this file except in compliance with the License. You may obtain a copy
-** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
-**
-** http://oss.sgi.com/projects/FreeB
-**
-** Note that, as provided in the License, the Software is distributed on an
-** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
-** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-**
-** Original Code. The Original Code is: OpenGL Sample Implementation,
-** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-**
-** Additional Notice Provisions: The application programming interfaces
-** established by SGI in conjunction with the Original Code are The
-** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
-** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
-** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
-** Window System(R) (Version 1.3), released October 19, 1998. This software
-** was created using the OpenGL(R) version 1.2.1 Sample Implementation
-** published by SGI, but has not been independently verified as being
-** compliant with the OpenGL(R) version 1.2.1 Specification.
-*/
-
-    typedef unsigned int GLenum;
-    typedef unsigned char GLboolean;
-    typedef unsigned int GLbitfield;
-    typedef signed char GLbyte;
-    typedef short GLshort;
-    typedef int GLint;
-    typedef int GLsizei;
-    typedef unsigned char GLubyte;
-    typedef unsigned short GLushort;
-    typedef unsigned int GLuint;
-    typedef float GLfloat;
-    typedef float GLclampf;
-    typedef void GLvoid;
-    typedef int GLfixed;
-    typedef int GLclampx;
-
-    typedef int GLintptr;
-    typedef int GLsizeiptr;
-
-
-/*************************************************************/
-
-/* OpenGL ES core versions */
-#define GL_VERSION_ES_CM_1_0		  1
-#define GL_VERSION_ES_CL_1_0		  1
-#define GL_VERSION_ES_CM_1_1		  1
-#define GL_VERSION_ES_CL_1_1		  1
-
-/* ClearBufferMask */
-#define GL_DEPTH_BUFFER_BIT               0x00000100
-#define GL_STENCIL_BUFFER_BIT             0x00000400
-#define GL_COLOR_BUFFER_BIT               0x00004000
-
-/* Boolean */
-#define GL_FALSE                          0
-#define GL_TRUE                           1
-
-/* BeginMode */
-#define GL_POINTS                         0x0000
-#define GL_LINES                          0x0001
-#define GL_LINE_LOOP                      0x0002
-#define GL_LINE_STRIP                     0x0003
-#define GL_TRIANGLES                      0x0004
-#define GL_TRIANGLE_STRIP                 0x0005
-#define GL_TRIANGLE_FAN                   0x0006
-
-/* AlphaFunction */
-#define GL_NEVER                          0x0200
-#define GL_LESS                           0x0201
-#define GL_EQUAL                          0x0202
-#define GL_LEQUAL                         0x0203
-#define GL_GREATER                        0x0204
-#define GL_NOTEQUAL                       0x0205
-#define GL_GEQUAL                         0x0206
-#define GL_ALWAYS                         0x0207
-
-/* BlendingFactorDest */
-#define GL_ZERO                           0
-#define GL_ONE                            1
-#define GL_SRC_COLOR                      0x0300
-#define GL_ONE_MINUS_SRC_COLOR            0x0301
-#define GL_SRC_ALPHA                      0x0302
-#define GL_ONE_MINUS_SRC_ALPHA            0x0303
-#define GL_DST_ALPHA                      0x0304
-#define GL_ONE_MINUS_DST_ALPHA            0x0305
-
-/* BlendingFactorSrc */
-/*      GL_ZERO */
-/*      GL_ONE */
-#define GL_DST_COLOR                      0x0306
-#define GL_ONE_MINUS_DST_COLOR            0x0307
-#define GL_SRC_ALPHA_SATURATE             0x0308
-/*      GL_SRC_ALPHA */
-/*      GL_ONE_MINUS_SRC_ALPHA */
-/*      GL_DST_ALPHA */
-/*      GL_ONE_MINUS_DST_ALPHA */
-
-/* ClipPlaneName */
-#define GL_CLIP_PLANE0                    0x3000
-#define GL_CLIP_PLANE1                    0x3001
-#define GL_CLIP_PLANE2                    0x3002
-#define GL_CLIP_PLANE3                    0x3003
-#define GL_CLIP_PLANE4                    0x3004
-#define GL_CLIP_PLANE5                    0x3005
-
-/* ColorMaterialFace */
-/*      GL_FRONT_AND_BACK */
-
-/* ColorMaterialParameter */
-/*      GL_AMBIENT_AND_DIFFUSE */
-
-/* ColorPointerType */
-/*      GL_UNSIGNED_BYTE */
-/*      GL_FLOAT */
-/*      GL_FIXED */
-
-/* CullFaceMode */
-#define GL_FRONT                          0x0404
-#define GL_BACK                           0x0405
-#define GL_FRONT_AND_BACK                 0x0408
-
-/* DepthFunction */
-/*      GL_NEVER */
-/*      GL_LESS */
-/*      GL_EQUAL */
-/*      GL_LEQUAL */
-/*      GL_GREATER */
-/*      GL_NOTEQUAL */
-/*      GL_GEQUAL */
-/*      GL_ALWAYS */
-
-/* EnableCap */
-#define GL_FOG                            0x0B60
-#define GL_LIGHTING                       0x0B50
-#define GL_TEXTURE_2D                     0x0DE1
-#define GL_CULL_FACE                      0x0B44
-#define GL_ALPHA_TEST                     0x0BC0
-#define GL_BLEND                          0x0BE2
-#define GL_COLOR_LOGIC_OP                 0x0BF2
-#define GL_DITHER                         0x0BD0
-#define GL_STENCIL_TEST                   0x0B90
-#define GL_DEPTH_TEST                     0x0B71
-/*      GL_LIGHT0 */
-/*      GL_LIGHT1 */
-/*      GL_LIGHT2 */
-/*      GL_LIGHT3 */
-/*      GL_LIGHT4 */
-/*      GL_LIGHT5 */
-/*      GL_LIGHT6 */
-/*      GL_LIGHT7 */
-#define GL_POINT_SMOOTH                   0x0B10
-#define GL_LINE_SMOOTH                    0x0B20
-#define GL_SCISSOR_TEST                   0x0C11
-#define GL_COLOR_MATERIAL                 0x0B57
-#define GL_NORMALIZE                      0x0BA1
-#define GL_RESCALE_NORMAL                 0x803A
-#define GL_POLYGON_OFFSET_FILL            0x8037
-#define GL_VERTEX_ARRAY                   0x8074
-#define GL_NORMAL_ARRAY                   0x8075
-#define GL_COLOR_ARRAY                    0x8076
-#define GL_TEXTURE_COORD_ARRAY            0x8078
-#define GL_MULTISAMPLE                    0x809D
-#define GL_SAMPLE_ALPHA_TO_COVERAGE       0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE            0x809F
-#define GL_SAMPLE_COVERAGE                0x80A0
-
-/* ErrorCode */
-#define GL_NO_ERROR                       0
-#define GL_INVALID_ENUM                   0x0500
-#define GL_INVALID_VALUE                  0x0501
-#define GL_INVALID_OPERATION              0x0502
-#define GL_STACK_OVERFLOW                 0x0503
-#define GL_STACK_UNDERFLOW                0x0504
-#define GL_OUT_OF_MEMORY                  0x0505
-
-/* FogMode */
-/*      GL_LINEAR */
-#define GL_EXP                            0x0800
-#define GL_EXP2                           0x0801
-
-/* FogParameter */
-#define GL_FOG_DENSITY                    0x0B62
-#define GL_FOG_START                      0x0B63
-#define GL_FOG_END                        0x0B64
-#define GL_FOG_MODE                       0x0B65
-#define GL_FOG_COLOR                      0x0B66
-
-/* FrontFaceDirection */
-#define GL_CW                             0x0900
-#define GL_CCW                            0x0901
-
-/* GetPName */
-#define GL_CURRENT_COLOR                  0x0B00
-#define GL_CURRENT_NORMAL                 0x0B02
-#define GL_CURRENT_TEXTURE_COORDS         0x0B03
-#define GL_POINT_SIZE                     0x0B11
-#define GL_POINT_SIZE_MIN                 0x8126
-#define GL_POINT_SIZE_MAX                 0x8127
-#define GL_POINT_FADE_THRESHOLD_SIZE      0x8128
-#define GL_POINT_DISTANCE_ATTENUATION     0x8129
-#define GL_SMOOTH_POINT_SIZE_RANGE        0x0B12
-#define GL_LINE_WIDTH                     0x0B21
-#define GL_SMOOTH_LINE_WIDTH_RANGE        0x0B22
-#define GL_ALIASED_POINT_SIZE_RANGE       0x846D
-#define GL_ALIASED_LINE_WIDTH_RANGE       0x846E
-#define GL_CULL_FACE_MODE                 0x0B45
-#define GL_FRONT_FACE                     0x0B46
-#define GL_SHADE_MODEL                    0x0B54
-#define GL_DEPTH_RANGE                    0x0B70
-#define GL_DEPTH_WRITEMASK                0x0B72
-#define GL_DEPTH_CLEAR_VALUE              0x0B73
-#define GL_DEPTH_FUNC                     0x0B74
-#define GL_STENCIL_CLEAR_VALUE            0x0B91
-#define GL_STENCIL_FUNC                   0x0B92
-#define GL_STENCIL_VALUE_MASK             0x0B93
-#define GL_STENCIL_FAIL                   0x0B94
-#define GL_STENCIL_PASS_DEPTH_FAIL        0x0B95
-#define GL_STENCIL_PASS_DEPTH_PASS        0x0B96
-#define GL_STENCIL_REF                    0x0B97
-#define GL_STENCIL_WRITEMASK              0x0B98
-#define GL_MATRIX_MODE                    0x0BA0
-#define GL_VIEWPORT                       0x0BA2
-#define GL_MODELVIEW_STACK_DEPTH          0x0BA3
-#define GL_PROJECTION_STACK_DEPTH         0x0BA4
-#define GL_TEXTURE_STACK_DEPTH            0x0BA5
-#define GL_MODELVIEW_MATRIX               0x0BA6
-#define GL_PROJECTION_MATRIX              0x0BA7
-#define GL_TEXTURE_MATRIX                 0x0BA8
-#define GL_ALPHA_TEST_FUNC                0x0BC1
-#define GL_ALPHA_TEST_REF                 0x0BC2
-#define GL_BLEND_DST                      0x0BE0
-#define GL_BLEND_SRC                      0x0BE1
-#define GL_LOGIC_OP_MODE                  0x0BF0
-#define GL_SCISSOR_BOX                    0x0C10
-#define GL_SCISSOR_TEST                   0x0C11
-#define GL_COLOR_CLEAR_VALUE              0x0C22
-#define GL_COLOR_WRITEMASK                0x0C23
-#define GL_UNPACK_ALIGNMENT               0x0CF5
-#define GL_PACK_ALIGNMENT                 0x0D05
-#define GL_MAX_LIGHTS                     0x0D31
-#define GL_MAX_CLIP_PLANES                0x0D32
-#define GL_MAX_TEXTURE_SIZE               0x0D33
-#define GL_MAX_MODELVIEW_STACK_DEPTH      0x0D36
-#define GL_MAX_PROJECTION_STACK_DEPTH     0x0D38
-#define GL_MAX_TEXTURE_STACK_DEPTH        0x0D39
-#define GL_MAX_VIEWPORT_DIMS              0x0D3A
-#define GL_MAX_TEXTURE_UNITS              0x84E2
-#define GL_SUBPIXEL_BITS                  0x0D50
-#define GL_RED_BITS                       0x0D52
-#define GL_GREEN_BITS                     0x0D53
-#define GL_BLUE_BITS                      0x0D54
-#define GL_ALPHA_BITS                     0x0D55
-#define GL_DEPTH_BITS                     0x0D56
-#define GL_STENCIL_BITS                   0x0D57
-#define GL_POLYGON_OFFSET_UNITS           0x2A00
-#define GL_POLYGON_OFFSET_FILL            0x8037
-#define GL_POLYGON_OFFSET_FACTOR          0x8038
-#define GL_TEXTURE_BINDING_2D             0x8069
-#define GL_VERTEX_ARRAY_SIZE              0x807A
-#define GL_VERTEX_ARRAY_TYPE              0x807B
-#define GL_VERTEX_ARRAY_STRIDE            0x807C
-#define GL_NORMAL_ARRAY_TYPE              0x807E
-#define GL_NORMAL_ARRAY_STRIDE            0x807F
-#define GL_COLOR_ARRAY_SIZE               0x8081
-#define GL_COLOR_ARRAY_TYPE               0x8082
-#define GL_COLOR_ARRAY_STRIDE             0x8083
-#define GL_TEXTURE_COORD_ARRAY_SIZE       0x8088
-#define GL_TEXTURE_COORD_ARRAY_TYPE       0x8089
-#define GL_TEXTURE_COORD_ARRAY_STRIDE     0x808A
-#define GL_VERTEX_ARRAY_POINTER           0x808E
-#define GL_NORMAL_ARRAY_POINTER           0x808F
-#define GL_COLOR_ARRAY_POINTER            0x8090
-#define GL_TEXTURE_COORD_ARRAY_POINTER    0x8092
-#define GL_SAMPLE_BUFFERS                 0x80A8
-#define GL_SAMPLES                        0x80A9
-#define GL_SAMPLE_COVERAGE_VALUE          0x80AA
-#define GL_SAMPLE_COVERAGE_INVERT         0x80AB
-
-/* OpenGL ES 1.0 defines, they gone in 1.1 and 2.0 */
-#ifndef GL_MAX_ELEMENTS_VERTICES
-#define GL_MAX_ELEMENTS_VERTICES          0x80E8
-#endif                          /* GL_MAX_ELEMENTS_VERTICES */
-#ifndef GL_MAX_ELEMENTS_INDICES
-#define GL_MAX_ELEMENTS_INDICES           0x80E9
-#endif                          /* GL_MAX_ELEMENTS_INDICES */
-
-/* GetTextureParameter */
-/*      GL_TEXTURE_MAG_FILTER */
-/*      GL_TEXTURE_MIN_FILTER */
-/*      GL_TEXTURE_WRAP_S */
-/*      GL_TEXTURE_WRAP_T */
-
-#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
-#define GL_COMPRESSED_TEXTURE_FORMATS     0x86A3
-
-/* HintMode */
-#define GL_DONT_CARE                      0x1100
-#define GL_FASTEST                        0x1101
-#define GL_NICEST                         0x1102
-
-/* HintTarget */
-#define GL_PERSPECTIVE_CORRECTION_HINT    0x0C50
-#define GL_POINT_SMOOTH_HINT              0x0C51
-#define GL_LINE_SMOOTH_HINT               0x0C52
-#define GL_FOG_HINT                       0x0C54
-#define GL_GENERATE_MIPMAP_HINT           0x8192
-
-/* LightModelParameter */
-#define GL_LIGHT_MODEL_AMBIENT            0x0B53
-#define GL_LIGHT_MODEL_TWO_SIDE           0x0B52
-
-/* LightParameter */
-#define GL_AMBIENT                        0x1200
-#define GL_DIFFUSE                        0x1201
-#define GL_SPECULAR                       0x1202
-#define GL_POSITION                       0x1203
-#define GL_SPOT_DIRECTION                 0x1204
-#define GL_SPOT_EXPONENT                  0x1205
-#define GL_SPOT_CUTOFF                    0x1206
-#define GL_CONSTANT_ATTENUATION           0x1207
-#define GL_LINEAR_ATTENUATION             0x1208
-#define GL_QUADRATIC_ATTENUATION          0x1209
-
-/* DataType */
-#define GL_BYTE                           0x1400
-#define GL_UNSIGNED_BYTE                  0x1401
-#define GL_SHORT                          0x1402
-#define GL_UNSIGNED_SHORT                 0x1403
-#define GL_FLOAT                          0x1406
-#define GL_FIXED                          0x140C
-
-/* LogicOp */
-#define GL_CLEAR                          0x1500
-#define GL_AND                            0x1501
-#define GL_AND_REVERSE                    0x1502
-#define GL_COPY                           0x1503
-#define GL_AND_INVERTED                   0x1504
-#define GL_NOOP                           0x1505
-#define GL_XOR                            0x1506
-#define GL_OR                             0x1507
-#define GL_NOR                            0x1508
-#define GL_EQUIV                          0x1509
-#define GL_INVERT                         0x150A
-#define GL_OR_REVERSE                     0x150B
-#define GL_COPY_INVERTED                  0x150C
-#define GL_OR_INVERTED                    0x150D
-#define GL_NAND                           0x150E
-#define GL_SET                            0x150F
-
-/* MaterialFace */
-/*      GL_FRONT_AND_BACK */
-
-/* MaterialParameter */
-#define GL_EMISSION                       0x1600
-#define GL_SHININESS                      0x1601
-#define GL_AMBIENT_AND_DIFFUSE            0x1602
-/*      GL_AMBIENT */
-/*      GL_DIFFUSE */
-/*      GL_SPECULAR */
-
-/* MatrixMode */
-#define GL_MODELVIEW                      0x1700
-#define GL_PROJECTION                     0x1701
-#define GL_TEXTURE                        0x1702
-
-/* NormalPointerType */
-/*      GL_BYTE */
-/*      GL_SHORT */
-/*      GL_FLOAT */
-/*      GL_FIXED */
-
-/* PixelFormat */
-#define GL_ALPHA                          0x1906
-#define GL_RGB                            0x1907
-#define GL_RGBA                           0x1908
-#define GL_LUMINANCE                      0x1909
-#define GL_LUMINANCE_ALPHA                0x190A
-
-/* PixelStoreParameter */
-#define GL_UNPACK_ALIGNMENT               0x0CF5
-#define GL_PACK_ALIGNMENT                 0x0D05
-
-/* PixelType */
-/*      GL_UNSIGNED_BYTE */
-#define GL_UNSIGNED_SHORT_4_4_4_4         0x8033
-#define GL_UNSIGNED_SHORT_5_5_5_1         0x8034
-#define GL_UNSIGNED_SHORT_5_6_5           0x8363
-
-/* ShadingModel */
-#define GL_FLAT                           0x1D00
-#define GL_SMOOTH                         0x1D01
-
-/* StencilFunction */
-/*      GL_NEVER */
-/*      GL_LESS */
-/*      GL_EQUAL */
-/*      GL_LEQUAL */
-/*      GL_GREATER */
-/*      GL_NOTEQUAL */
-/*      GL_GEQUAL */
-/*      GL_ALWAYS */
-
-/* StencilOp */
-/*      GL_ZERO */
-#define GL_KEEP                           0x1E00
-#define GL_REPLACE                        0x1E01
-#define GL_INCR                           0x1E02
-#define GL_DECR                           0x1E03
-/*      GL_INVERT */
-
-/* StringName */
-#define GL_VENDOR                         0x1F00
-#define GL_RENDERER                       0x1F01
-#define GL_VERSION                        0x1F02
-#define GL_EXTENSIONS                     0x1F03
-
-/* TexCoordPointerType */
-/*      GL_SHORT */
-/*      GL_FLOAT */
-/*      GL_FIXED */
-/*      GL_BYTE */
-
-/* TextureEnvMode */
-#define GL_MODULATE                       0x2100
-#define GL_DECAL                          0x2101
-/*      GL_BLEND */
-#define GL_ADD                            0x0104
-/*      GL_REPLACE */
-
-/* TextureEnvParameter */
-#define GL_TEXTURE_ENV_MODE               0x2200
-#define GL_TEXTURE_ENV_COLOR              0x2201
-
-/* TextureEnvTarget */
-#define GL_TEXTURE_ENV                    0x2300
-
-/* TextureMagFilter */
-#define GL_NEAREST                        0x2600
-#define GL_LINEAR                         0x2601
-
-/* TextureMinFilter */
-/*      GL_NEAREST */
-/*      GL_LINEAR */
-#define GL_NEAREST_MIPMAP_NEAREST         0x2700
-#define GL_LINEAR_MIPMAP_NEAREST          0x2701
-#define GL_NEAREST_MIPMAP_LINEAR          0x2702
-#define GL_LINEAR_MIPMAP_LINEAR           0x2703
-
-/* TextureParameterName */
-#define GL_TEXTURE_MAG_FILTER             0x2800
-#define GL_TEXTURE_MIN_FILTER             0x2801
-#define GL_TEXTURE_WRAP_S                 0x2802
-#define GL_TEXTURE_WRAP_T                 0x2803
-#define GL_GENERATE_MIPMAP                0x8191
-
-/* TextureTarget */
-/*      GL_TEXTURE_2D */
-
-/* TextureUnit */
-#define GL_TEXTURE0                       0x84C0
-#define GL_TEXTURE1                       0x84C1
-#define GL_TEXTURE2                       0x84C2
-#define GL_TEXTURE3                       0x84C3
-#define GL_TEXTURE4                       0x84C4
-#define GL_TEXTURE5                       0x84C5
-#define GL_TEXTURE6                       0x84C6
-#define GL_TEXTURE7                       0x84C7
-#define GL_TEXTURE8                       0x84C8
-#define GL_TEXTURE9                       0x84C9
-#define GL_TEXTURE10                      0x84CA
-#define GL_TEXTURE11                      0x84CB
-#define GL_TEXTURE12                      0x84CC
-#define GL_TEXTURE13                      0x84CD
-#define GL_TEXTURE14                      0x84CE
-#define GL_TEXTURE15                      0x84CF
-#define GL_TEXTURE16                      0x84D0
-#define GL_TEXTURE17                      0x84D1
-#define GL_TEXTURE18                      0x84D2
-#define GL_TEXTURE19                      0x84D3
-#define GL_TEXTURE20                      0x84D4
-#define GL_TEXTURE21                      0x84D5
-#define GL_TEXTURE22                      0x84D6
-#define GL_TEXTURE23                      0x84D7
-#define GL_TEXTURE24                      0x84D8
-#define GL_TEXTURE25                      0x84D9
-#define GL_TEXTURE26                      0x84DA
-#define GL_TEXTURE27                      0x84DB
-#define GL_TEXTURE28                      0x84DC
-#define GL_TEXTURE29                      0x84DD
-#define GL_TEXTURE30                      0x84DE
-#define GL_TEXTURE31                      0x84DF
-#define GL_ACTIVE_TEXTURE                 0x84E0
-#define GL_CLIENT_ACTIVE_TEXTURE          0x84E1
-
-/* TextureWrapMode */
-#define GL_REPEAT                         0x2901
-#define GL_CLAMP_TO_EDGE                  0x812F
-
-/* VertexPointerType */
-/*      GL_SHORT */
-/*      GL_FLOAT */
-/*      GL_FIXED */
-/*      GL_BYTE */
-
-/* LightName */
-#define GL_LIGHT0                         0x4000
-#define GL_LIGHT1                         0x4001
-#define GL_LIGHT2                         0x4002
-#define GL_LIGHT3                         0x4003
-#define GL_LIGHT4                         0x4004
-#define GL_LIGHT5                         0x4005
-#define GL_LIGHT6                         0x4006
-#define GL_LIGHT7                         0x4007
-
-/* Buffer Objects */
-#define GL_ARRAY_BUFFER                   0x8892
-#define GL_ELEMENT_ARRAY_BUFFER           0x8893
-
-#define GL_ARRAY_BUFFER_BINDING               0x8894
-#define GL_ELEMENT_ARRAY_BUFFER_BINDING       0x8895
-#define GL_VERTEX_ARRAY_BUFFER_BINDING        0x8896
-#define GL_NORMAL_ARRAY_BUFFER_BINDING        0x8897
-#define GL_COLOR_ARRAY_BUFFER_BINDING         0x8898
-#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING 0x889A
-
-#define GL_STATIC_DRAW                    0x88E4
-#define GL_DYNAMIC_DRAW                   0x88E8
-
-#define GL_BUFFER_SIZE                    0x8764
-#define GL_BUFFER_USAGE                   0x8765
-
-/* Texture combine + dot3 */
-#define GL_SUBTRACT                       0x84E7
-#define GL_COMBINE                        0x8570
-#define GL_COMBINE_RGB                    0x8571
-#define GL_COMBINE_ALPHA                  0x8572
-#define GL_RGB_SCALE                      0x8573
-#define GL_ADD_SIGNED                     0x8574
-#define GL_INTERPOLATE                    0x8575
-#define GL_CONSTANT                       0x8576
-#define GL_PRIMARY_COLOR                  0x8577
-#define GL_PREVIOUS                       0x8578
-#define GL_OPERAND0_RGB                   0x8590
-#define GL_OPERAND1_RGB                   0x8591
-#define GL_OPERAND2_RGB                   0x8592
-#define GL_OPERAND0_ALPHA                 0x8598
-#define GL_OPERAND1_ALPHA                 0x8599
-#define GL_OPERAND2_ALPHA                 0x859A
-
-#define GL_ALPHA_SCALE                    0x0D1C
-
-#define GL_SRC0_RGB                       0x8580
-#define GL_SRC1_RGB                       0x8581
-#define GL_SRC2_RGB                       0x8582
-#define GL_SRC0_ALPHA                     0x8588
-#define GL_SRC1_ALPHA                     0x8589
-#define GL_SRC2_ALPHA                     0x858A
-
-#define GL_DOT3_RGB                       0x86AE
-#define GL_DOT3_RGBA                      0x86AF
-
-/*------------------------------------------------------------------------*
- * required OES extension tokens
- *------------------------------------------------------------------------*/
-
-/* OES_read_format */
-#ifndef GL_OES_read_format
-#define GL_IMPLEMENTATION_COLOR_READ_TYPE_OES                   0x8B9A
-#define GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES                 0x8B9B
-#endif
-
-/* GL_OES_compressed_paletted_texture */
-#ifndef GL_OES_compressed_paletted_texture
-#define GL_PALETTE4_RGB8_OES                                    0x8B90
-#define GL_PALETTE4_RGBA8_OES                                   0x8B91
-#define GL_PALETTE4_R5_G6_B5_OES                                0x8B92
-#define GL_PALETTE4_RGBA4_OES                                   0x8B93
-#define GL_PALETTE4_RGB5_A1_OES                                 0x8B94
-#define GL_PALETTE8_RGB8_OES                                    0x8B95
-#define GL_PALETTE8_RGBA8_OES                                   0x8B96
-#define GL_PALETTE8_R5_G6_B5_OES                                0x8B97
-#define GL_PALETTE8_RGBA4_OES                                   0x8B98
-#define GL_PALETTE8_RGB5_A1_OES                                 0x8B99
-#endif
-
-/* OES_point_size_array */
-#ifndef GL_OES_point_size_array
-#define GL_POINT_SIZE_ARRAY_OES                                 0x8B9C
-#define GL_POINT_SIZE_ARRAY_TYPE_OES                            0x898A
-#define GL_POINT_SIZE_ARRAY_STRIDE_OES                          0x898B
-#define GL_POINT_SIZE_ARRAY_POINTER_OES                         0x898C
-#define GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES                  0x8B9F
-#endif
-
-/* GL_OES_point_sprite */
-#ifndef GL_OES_point_sprite
-#define GL_POINT_SPRITE_OES                                     0x8861
-#define GL_COORD_REPLACE_OES                                    0x8862
-#endif
-
-/* GL_OES_draw_texture */
-#ifndef GL_OES_draw_texture
-#define GL_TEXTURE_CROP_RECT_OES                                0x8B9D
-#endif                          /* GL_OES_draw_texture */
-
-/*  GL_OES_vertex_buffer_object */
-#ifndef GL_OES_vertex_buffer_object
-#define GL_ARRAY_BUFFER_OES                                     0x8892
-#define GL_ELEMENT_ARRAY_BUFFER_OES                             0x8893
-#define GL_ARRAY_BUFFER_BINDING_OES                             0x8894
-#define GL_ELEMENT_ARRAY_BUFFER_BINDING_OES                     0x8895
-#define GL_VERTEX_ARRAY_BUFFER_BINDING_OES                      0x8896
-#define GL_NORMAL_ARRAY_BUFFER_BINDING_OES                      0x8897
-#define GL_COLOR_ARRAY_BUFFER_BINDING_OES                       0x8898
-#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_OES               0x889A
-#define GL_STATIC_DRAW_OES                                      0x88E4
-#define GL_DYNAMIC_DRAW_OES                                     0x88E8
-#define GL_WRITE_ONLY_OES                                       0x88B9
-#define GL_BUFFER_SIZE_OES                                      0x8764
-#define GL_BUFFER_USAGE_OES                                     0x8765
-#define GL_BUFFER_ACCESS_OES                                    0x88BB
-#endif                          /* GL_OES_vertex_buffer_object */
-
-/*************************************************************/
-
-/* Available only in Common profile */
-    GL_API void GL_APIENTRY glAlphaFunc(GLenum func, GLclampf ref);
-    GL_API void GL_APIENTRY glClearColor(GLclampf red, GLclampf green,
-                                         GLclampf blue, GLclampf alpha);
-    GL_API void GL_APIENTRY glClearDepthf(GLclampf depth);
-    GL_API void GL_APIENTRY glClipPlanef(GLenum plane,
-                                         const GLfloat * equation);
-    GL_API void GL_APIENTRY glColor4f(GLfloat red, GLfloat green,
-                                      GLfloat blue, GLfloat alpha);
-    GL_API void GL_APIENTRY glDepthRangef(GLclampf zNear, GLclampf zFar);
-    GL_API void GL_APIENTRY glFogf(GLenum pname, GLfloat param);
-    GL_API void GL_APIENTRY glFogfv(GLenum pname, const GLfloat * params);
-    GL_API void GL_APIENTRY glFrustumf(GLfloat left, GLfloat right,
-                                       GLfloat bottom, GLfloat top,
-                                       GLfloat zNear, GLfloat zFar);
-    GL_API void GL_APIENTRY glGetClipPlanef(GLenum pname, GLfloat eqn[4]);
-    GL_API void GL_APIENTRY glGetFloatv(GLenum pname, GLfloat * params);
-    GL_API void GL_APIENTRY glGetLightfv(GLenum light, GLenum pname,
-                                         GLfloat * params);
-    GL_API void GL_APIENTRY glGetMaterialfv(GLenum face, GLenum pname,
-                                            GLfloat * params);
-    GL_API void GL_APIENTRY glGetTexEnvfv(GLenum env, GLenum pname,
-                                          GLfloat * params);
-    GL_API void GL_APIENTRY glGetTexParameterfv(GLenum target, GLenum pname,
-                                                GLfloat * params);
-    GL_API void GL_APIENTRY glLightModelf(GLenum pname, GLfloat param);
-    GL_API void GL_APIENTRY glLightModelfv(GLenum pname,
-                                           const GLfloat * params);
-    GL_API void GL_APIENTRY glLightf(GLenum light, GLenum pname,
-                                     GLfloat param);
-    GL_API void GL_APIENTRY glLightfv(GLenum light, GLenum pname,
-                                      const GLfloat * params);
-    GL_API void GL_APIENTRY glLineWidth(GLfloat width);
-    GL_API void GL_APIENTRY glLoadMatrixf(const GLfloat * m);
-    GL_API void GL_APIENTRY glMaterialf(GLenum face, GLenum pname,
-                                        GLfloat param);
-    GL_API void GL_APIENTRY glMaterialfv(GLenum face, GLenum pname,
-                                         const GLfloat * params);
-    GL_API void GL_APIENTRY glMultMatrixf(const GLfloat * m);
-    GL_API void GL_APIENTRY glMultiTexCoord4f(GLenum target, GLfloat s,
-                                              GLfloat t, GLfloat r,
-                                              GLfloat q);
-    GL_API void GL_APIENTRY glNormal3f(GLfloat nx, GLfloat ny, GLfloat nz);
-    GL_API void GL_APIENTRY glOrthof(GLfloat left, GLfloat right,
-                                     GLfloat bottom, GLfloat top,
-                                     GLfloat zNear, GLfloat zFar);
-    GL_API void GL_APIENTRY glPointParameterf(GLenum pname, GLfloat param);
-    GL_API void GL_APIENTRY glPointParameterfv(GLenum pname,
-                                               const GLfloat * params);
-    GL_API void GL_APIENTRY glPointSize(GLfloat size);
-    GL_API void GL_APIENTRY glPolygonOffset(GLfloat factor, GLfloat units);
-    GL_API void GL_APIENTRY glRotatef(GLfloat angle, GLfloat x, GLfloat y,
-                                      GLfloat z);
-    GL_API void GL_APIENTRY glScalef(GLfloat x, GLfloat y, GLfloat z);
-    GL_API void GL_APIENTRY glTexEnvf(GLenum target, GLenum pname,
-                                      GLfloat param);
-    GL_API void GL_APIENTRY glTexEnvfv(GLenum target, GLenum pname,
-                                       const GLfloat * params);
-    GL_API void GL_APIENTRY glTexParameterf(GLenum target, GLenum pname,
-                                            GLfloat param);
-    GL_API void GL_APIENTRY glTexParameterfv(GLenum target, GLenum pname,
-                                             const GLfloat * params);
-    GL_API void GL_APIENTRY glTranslatef(GLfloat x, GLfloat y, GLfloat z);
-
-/* Available in both Common and Common-Lite profiles */
-    GL_API void GL_APIENTRY glActiveTexture(GLenum texture);
-    GL_API void GL_APIENTRY glAlphaFuncx(GLenum func, GLclampx ref);
-    GL_API void GL_APIENTRY glBindBuffer(GLenum target, GLuint buffer);
-    GL_API void GL_APIENTRY glBindTexture(GLenum target, GLuint texture);
-    GL_API void GL_APIENTRY glBlendFunc(GLenum sfactor, GLenum dfactor);
-    GL_API void GL_APIENTRY glBufferData(GLenum target, GLsizeiptr size,
-                                         const GLvoid * data, GLenum usage);
-    GL_API void GL_APIENTRY glBufferSubData(GLenum target, GLintptr offset,
-                                            GLsizeiptr size,
-                                            const GLvoid * data);
-    GL_API void GL_APIENTRY glClear(GLbitfield mask);
-    GL_API void GL_APIENTRY glClearColorx(GLclampx red, GLclampx green,
-                                          GLclampx blue, GLclampx alpha);
-    GL_API void GL_APIENTRY glClearDepthx(GLclampx depth);
-    GL_API void GL_APIENTRY glClearStencil(GLint s);
-    GL_API void GL_APIENTRY glClientActiveTexture(GLenum texture);
-    GL_API void GL_APIENTRY glClipPlanex(GLenum plane,
-                                         const GLfixed * equation);
-    GL_API void GL_APIENTRY glColor4ub(GLubyte red, GLubyte green,
-                                       GLubyte blue, GLubyte alpha);
-    GL_API void GL_APIENTRY glColor4x(GLfixed red, GLfixed green,
-                                      GLfixed blue, GLfixed alpha);
-    GL_API void GL_APIENTRY glColorMask(GLboolean red, GLboolean green,
-                                        GLboolean blue, GLboolean alpha);
-    GL_API void GL_APIENTRY glColorPointer(GLint size, GLenum type,
-                                           GLsizei stride,
-                                           const GLvoid * pointer);
-    GL_API void GL_APIENTRY glCompressedTexImage2D(GLenum target, GLint level,
-                                                   GLenum internalformat,
-                                                   GLsizei width,
-                                                   GLsizei height,
-                                                   GLint border,
-                                                   GLsizei imageSize,
-                                                   const GLvoid * data);
-    GL_API void GL_APIENTRY glCompressedTexSubImage2D(GLenum target,
-                                                      GLint level,
-                                                      GLint xoffset,
-                                                      GLint yoffset,
-                                                      GLsizei width,
-                                                      GLsizei height,
-                                                      GLenum format,
-                                                      GLsizei imageSize,
-                                                      const GLvoid * data);
-    GL_API void GL_APIENTRY glCopyTexImage2D(GLenum target, GLint level,
-                                             GLenum internalformat, GLint x,
-                                             GLint y, GLsizei width,
-                                             GLsizei height, GLint border);
-    GL_API void GL_APIENTRY glCopyTexSubImage2D(GLenum target, GLint level,
-                                                GLint xoffset, GLint yoffset,
-                                                GLint x, GLint y,
-                                                GLsizei width,
-                                                GLsizei height);
-    GL_API void GL_APIENTRY glCullFace(GLenum mode);
-    GL_API void GL_APIENTRY glDeleteBuffers(GLsizei n,
-                                            const GLuint * buffers);
-    GL_API void GL_APIENTRY glDeleteTextures(GLsizei n,
-                                             const GLuint * textures);
-    GL_API void GL_APIENTRY glDepthFunc(GLenum func);
-    GL_API void GL_APIENTRY glDepthMask(GLboolean flag);
-    GL_API void GL_APIENTRY glDepthRangex(GLclampx zNear, GLclampx zFar);
-    GL_API void GL_APIENTRY glDisable(GLenum cap);
-    GL_API void GL_APIENTRY glDisableClientState(GLenum array);
-    GL_API void GL_APIENTRY glDrawArrays(GLenum mode, GLint first,
-                                         GLsizei count);
-    GL_API void GL_APIENTRY glDrawElements(GLenum mode, GLsizei count,
-                                           GLenum type,
-                                           const GLvoid * indices);
-    GL_API void GL_APIENTRY glEnable(GLenum cap);
-    GL_API void GL_APIENTRY glEnableClientState(GLenum array);
-    GL_API void GL_APIENTRY glFinish(void);
-    GL_API void GL_APIENTRY glFlush(void);
-    GL_API void GL_APIENTRY glFogx(GLenum pname, GLfixed param);
-    GL_API void GL_APIENTRY glFogxv(GLenum pname, const GLfixed * params);
-    GL_API void GL_APIENTRY glFrontFace(GLenum mode);
-    GL_API void GL_APIENTRY glFrustumx(GLfixed left, GLfixed right,
-                                       GLfixed bottom, GLfixed top,
-                                       GLfixed zNear, GLfixed zFar);
-    GL_API void GL_APIENTRY glGetBooleanv(GLenum pname, GLboolean * params);
-    GL_API void GL_APIENTRY glGetBufferParameteriv(GLenum target,
-                                                   GLenum pname,
-                                                   GLint * params);
-    GL_API void GL_APIENTRY glGetClipPlanex(GLenum pname, GLfixed eqn[4]);
-    GL_API void GL_APIENTRY glGenBuffers(GLsizei n, GLuint * buffers);
-    GL_API void GL_APIENTRY glGenTextures(GLsizei n, GLuint * textures);
-    GL_API GLenum GL_APIENTRY glGetError(void);
-    GL_API void GL_APIENTRY glGetFixedv(GLenum pname, GLfixed * params);
-    GL_API void GL_APIENTRY glGetIntegerv(GLenum pname, GLint * params);
-    GL_API void GL_APIENTRY glGetLightxv(GLenum light, GLenum pname,
-                                         GLfixed * params);
-    GL_API void GL_APIENTRY glGetMaterialxv(GLenum face, GLenum pname,
-                                            GLfixed * params);
-    GL_API void GL_APIENTRY glGetPointerv(GLenum pname, void **params);
-    GL_API const GLubyte *GL_APIENTRY glGetString(GLenum name);
-    GL_API void GL_APIENTRY glGetTexEnviv(GLenum env, GLenum pname,
-                                          GLint * params);
-    GL_API void GL_APIENTRY glGetTexEnvxv(GLenum env, GLenum pname,
-                                          GLfixed * params);
-    GL_API void GL_APIENTRY glGetTexParameteriv(GLenum target, GLenum pname,
-                                                GLint * params);
-    GL_API void GL_APIENTRY glGetTexParameterxv(GLenum target, GLenum pname,
-                                                GLfixed * params);
-    GL_API void GL_APIENTRY glHint(GLenum target, GLenum mode);
-    GL_API GLboolean GL_APIENTRY glIsBuffer(GLuint buffer);
-    GL_API GLboolean GL_APIENTRY glIsEnabled(GLenum cap);
-    GL_API GLboolean GL_APIENTRY glIsTexture(GLuint texture);
-    GL_API void GL_APIENTRY glLightModelx(GLenum pname, GLfixed param);
-    GL_API void GL_APIENTRY glLightModelxv(GLenum pname,
-                                           const GLfixed * params);
-    GL_API void GL_APIENTRY glLightx(GLenum light, GLenum pname,
-                                     GLfixed param);
-    GL_API void GL_APIENTRY glLightxv(GLenum light, GLenum pname,
-                                      const GLfixed * params);
-    GL_API void GL_APIENTRY glLineWidthx(GLfixed width);
-    GL_API void GL_APIENTRY glLoadIdentity(void);
-    GL_API void GL_APIENTRY glLoadMatrixx(const GLfixed * m);
-    GL_API void GL_APIENTRY glLogicOp(GLenum opcode);
-    GL_API void GL_APIENTRY glMaterialx(GLenum face, GLenum pname,
-                                        GLfixed param);
-    GL_API void GL_APIENTRY glMaterialxv(GLenum face, GLenum pname,
-                                         const GLfixed * params);
-    GL_API void GL_APIENTRY glMatrixMode(GLenum mode);
-    GL_API void GL_APIENTRY glMultMatrixx(const GLfixed * m);
-    GL_API void GL_APIENTRY glMultiTexCoord4x(GLenum target, GLfixed s,
-                                              GLfixed t, GLfixed r,
-                                              GLfixed q);
-    GL_API void GL_APIENTRY glNormal3x(GLfixed nx, GLfixed ny, GLfixed nz);
-    GL_API void GL_APIENTRY glNormalPointer(GLenum type, GLsizei stride,
-                                            const GLvoid * pointer);
-    GL_API void GL_APIENTRY glOrthox(GLfixed left, GLfixed right,
-                                     GLfixed bottom, GLfixed top,
-                                     GLfixed zNear, GLfixed zFar);
-    GL_API void GL_APIENTRY glPixelStorei(GLenum pname, GLint param);
-    GL_API void GL_APIENTRY glPointParameterx(GLenum pname, GLfixed param);
-    GL_API void GL_APIENTRY glPointParameterxv(GLenum pname,
-                                               const GLfixed * params);
-    GL_API void GL_APIENTRY glPointSizex(GLfixed size);
-    GL_API void GL_APIENTRY glPolygonOffsetx(GLfixed factor, GLfixed units);
-    GL_API void GL_APIENTRY glPopMatrix(void);
-    GL_API void GL_APIENTRY glPushMatrix(void);
-    GL_API void GL_APIENTRY glReadPixels(GLint x, GLint y, GLsizei width,
-                                         GLsizei height, GLenum format,
-                                         GLenum type, GLvoid * pixels);
-    GL_API void GL_APIENTRY glRotatex(GLfixed angle, GLfixed x, GLfixed y,
-                                      GLfixed z);
-    GL_API void GL_APIENTRY glSampleCoverage(GLclampf value,
-                                             GLboolean invert);
-    GL_API void GL_APIENTRY glSampleCoveragex(GLclampx value,
-                                              GLboolean invert);
-    GL_API void GL_APIENTRY glScalex(GLfixed x, GLfixed y, GLfixed z);
-    GL_API void GL_APIENTRY glScissor(GLint x, GLint y, GLsizei width,
-                                      GLsizei height);
-    GL_API void GL_APIENTRY glShadeModel(GLenum mode);
-    GL_API void GL_APIENTRY glStencilFunc(GLenum func, GLint ref,
-                                          GLuint mask);
-    GL_API void GL_APIENTRY glStencilMask(GLuint mask);
-    GL_API void GL_APIENTRY glStencilOp(GLenum fail, GLenum zfail,
-                                        GLenum zpass);
-    GL_API void GL_APIENTRY glTexCoordPointer(GLint size, GLenum type,
-                                              GLsizei stride,
-                                              const GLvoid * pointer);
-    GL_API void GL_APIENTRY glTexEnvi(GLenum target, GLenum pname,
-                                      GLint param);
-    GL_API void GL_APIENTRY glTexEnvx(GLenum target, GLenum pname,
-                                      GLfixed param);
-    GL_API void GL_APIENTRY glTexEnviv(GLenum target, GLenum pname,
-                                       const GLint * params);
-    GL_API void GL_APIENTRY glTexEnvxv(GLenum target, GLenum pname,
-                                       const GLfixed * params);
-    GL_API void GL_APIENTRY glTexImage2D(GLenum target, GLint level,
-                                         GLint internalformat, GLsizei width,
-                                         GLsizei height, GLint border,
-                                         GLenum format, GLenum type,
-                                         const GLvoid * pixels);
-    GL_API void GL_APIENTRY glTexParameteri(GLenum target, GLenum pname,
-                                            GLint param);
-    GL_API void GL_APIENTRY glTexParameterx(GLenum target, GLenum pname,
-                                            GLfixed param);
-    GL_API void GL_APIENTRY glTexParameteriv(GLenum target, GLenum pname,
-                                             const GLint * params);
-    GL_API void GL_APIENTRY glTexParameterxv(GLenum target, GLenum pname,
-                                             const GLfixed * params);
-    GL_API void GL_APIENTRY glTexSubImage2D(GLenum target, GLint level,
-                                            GLint xoffset, GLint yoffset,
-                                            GLsizei width, GLsizei height,
-                                            GLenum format, GLenum type,
-                                            const GLvoid * pixels);
-    GL_API void GL_APIENTRY glTranslatex(GLfixed x, GLfixed y, GLfixed z);
-    GL_API void GL_APIENTRY glVertexPointer(GLint size, GLenum type,
-                                            GLsizei stride,
-                                            const GLvoid * pointer);
-    GL_API void GL_APIENTRY glViewport(GLint x, GLint y, GLsizei width,
-                                       GLsizei height);
-
-/*------------------------------------------------------------------------*
- * Required OES extension functions
- *------------------------------------------------------------------------*/
-
-/* GL_OES_read_format */
-#ifndef GL_OES_read_format
-#define GL_OES_read_format 1
-#endif
-
-/* GL_OES_compressed_paletted_texture */
-#ifndef GL_OES_compressed_paletted_texture
-#define GL_OES_compressed_paletted_texture 1
-#endif
-
-/* GL_OES_point_size_array */
-#ifndef GL_OES_point_size_array
-#define GL_OES_point_size_array 1
-    GL_API void GL_APIENTRY glPointSizePointerOES(GLenum type, GLsizei stride,
-                                                  const GLvoid * pointer);
-#endif
-
-/* GL_OES_query_matrix */
-#ifndef GL_OES_query_matrix
-#define GL_OES_query_matrix 1
-    GL_API GLbitfield GL_APIENTRY glQueryMatrixxOES(GLfixed mantissa[16],
-                                                    GLint exponent[16]);
-#endif                          /* GL_OES_query_matrix */
-
-/* GL_OES_point_sprite */
-#ifndef GL_OES_point_sprite
-#define GL_OES_point_sprite 1
-#endif
-
-/* GL_OES_draw_texture */
-#ifndef GL_OES_draw_texture
-#define GL_OES_draw_texture 1
-    GL_API void GL_APIENTRY glDrawTexsOES(GLshort x, GLshort y, GLshort z,
-                                          GLshort width, GLshort height);
-    GL_API void GL_APIENTRY glDrawTexiOES(GLint x, GLint y, GLint z,
-                                          GLint width, GLint height);
-    GL_API void GL_APIENTRY glDrawTexxOES(GLfixed x, GLfixed y, GLfixed z,
-                                          GLfixed width, GLfixed height);
-    GL_API void GL_APIENTRY glDrawTexsvOES(const GLshort * coords);
-    GL_API void GL_APIENTRY glDrawTexivOES(const GLint * coords);
-    GL_API void GL_APIENTRY glDrawTexxvOES(const GLfixed * coords);
-    GL_API void GL_APIENTRY glDrawTexfOES(GLfloat x, GLfloat y, GLfloat z,
-                                          GLfloat width, GLfloat height);
-    GL_API void GL_APIENTRY glDrawTexfvOES(const GLfloat * coords);
-#endif                          /* GL_OES_draw_texture */
-
-/* GL_OES_single_precision */
-#ifndef GL_OES_single_precision
-#define GL_OES_single_precision 1
-    GL_API void GL_APIENTRY glDepthRangefOES(GLclampf zNear, GLclampf zFar);
-    GL_API void GL_APIENTRY glFrustumfOES(GLfloat left, GLfloat right,
-                                          GLfloat bottom, GLfloat top,
-                                          GLfloat zNear, GLfloat zFar);
-    GL_API void GL_APIENTRY glOrthofOES(GLfloat left, GLfloat right,
-                                        GLfloat bottom, GLfloat top,
-                                        GLfloat zNear, GLfloat zFar);
-    GL_API void GL_APIENTRY glClipPlanefOES(GLenum plane,
-                                            const GLfloat * equation);
-    GL_API void GL_APIENTRY glGetClipPlanefOES(GLenum pname, GLfloat eqn[4]);
-    GL_API void GL_APIENTRY glClearDepthfOES(GLclampf depth);
-#endif                          /* GL_OES_single_precision */
-
-/* GL_OES_vertex_buffer_object */
-#ifndef GL_OES_vertex_buffer_object
-#define GL_OES_vertex_buffer_object 1
-    GL_API void APIENTRY glBindBufferOES(GLenum, GLuint);
-    GL_API void APIENTRY glDeleteBuffersOES(GLsizei, const GLuint *);
-    GL_API void APIENTRY glGenBuffersOES(GLsizei, GLuint *);
-    GL_API GLboolean APIENTRY glIsBufferOES(GLuint);
-    GL_API void APIENTRY glBufferDataOES(GLenum, GLsizeiptr, const GLvoid *,
-                                         GLenum);
-    GL_API void APIENTRY glBufferSubDataOES(GLenum, GLintptr, GLsizeiptr,
-                                            const GLvoid *);
-    GL_API void APIENTRY glGetBufferParameterivOES(GLenum, GLenum, GLint *);
-#endif                          /* GL_OES_vertex_buffer_object */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif                          /* __gles_h_ */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/include/SDL_opengles2.h	Sun Feb 06 02:35:14 2011 -0800
@@ -0,0 +1,39 @@
+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2010 Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+*/
+
+/**
+ *  \file SDL_opengles.h
+ *  
+ *  This is a simple file to encapsulate the OpenGL ES 2.0 API headers.
+ */
+
+#ifdef __IPHONEOS__
+#include <OpenGLES/ES2/gl.h>
+#include <OpenGLES/ES2/glext.h>
+#else
+#include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
+#endif
+
+#ifndef APIENTRY
+#define APIENTRY
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/render/opengl/SDL_glfuncs.h	Sun Feb 06 02:35:14 2011 -0800
@@ -0,0 +1,456 @@
+/* list of OpenGL functions sorted alphabetically
+   If you need to use a GL function from the SDL video subsystem,
+   change it's entry from SDL_PROC_UNUSED to SDL_PROC and rebuild.
+*/
+#define SDL_PROC_UNUSED(ret,func,params)
+
+SDL_PROC_UNUSED(void, glAccum, (GLenum, GLfloat))
+SDL_PROC_UNUSED(void, glAlphaFunc, (GLenum, GLclampf))
+SDL_PROC_UNUSED(GLboolean, glAreTexturesResident,
+                (GLsizei, const GLuint *, GLboolean *))
+SDL_PROC_UNUSED(void, glArrayElement, (GLint))
+SDL_PROC(void, glBegin, (GLenum))
+SDL_PROC(void, glBindTexture, (GLenum, GLuint))
+SDL_PROC_UNUSED(void, glBitmap,
+                (GLsizei, GLsizei, GLfloat, GLfloat, GLfloat, GLfloat,
+                 const GLubyte *))
+SDL_PROC(void, glBlendFunc, (GLenum, GLenum))
+SDL_PROC_UNUSED(void, glCallList, (GLuint))
+SDL_PROC_UNUSED(void, glCallLists, (GLsizei, GLenum, const GLvoid *))
+SDL_PROC(void, glClear, (GLbitfield))
+SDL_PROC_UNUSED(void, glClearAccum, (GLfloat, GLfloat, GLfloat, GLfloat))
+SDL_PROC(void, glClearColor, (GLclampf, GLclampf, GLclampf, GLclampf))
+SDL_PROC_UNUSED(void, glClearDepth, (GLclampd))
+SDL_PROC_UNUSED(void, glClearIndex, (GLfloat))
+SDL_PROC_UNUSED(void, glClearStencil, (GLint))
+SDL_PROC_UNUSED(void, glClipPlane, (GLenum, const GLdouble *))
+SDL_PROC_UNUSED(void, glColor3b, (GLbyte, GLbyte, GLbyte))
+SDL_PROC_UNUSED(void, glColor3bv, (const GLbyte *))
+SDL_PROC_UNUSED(void, glColor3d, (GLdouble, GLdouble, GLdouble))
+SDL_PROC_UNUSED(void, glColor3dv, (const GLdouble *))
+SDL_PROC_UNUSED(void, glColor3f, (GLfloat, GLfloat, GLfloat))
+SDL_PROC_UNUSED(void, glColor3fv, (const GLfloat *))
+SDL_PROC_UNUSED(void, glColor3i, (GLint, GLint, GLint))
+SDL_PROC_UNUSED(void, glColor3iv, (const GLint *))
+SDL_PROC_UNUSED(void, glColor3s, (GLshort, GLshort, GLshort))
+SDL_PROC_UNUSED(void, glColor3sv, (const GLshort *))
+SDL_PROC_UNUSED(void, glColor3ub, (GLubyte, GLubyte, GLubyte))
+SDL_PROC_UNUSED(void, glColor3ubv, (const GLubyte *))
+SDL_PROC_UNUSED(void, glColor3ui, (GLuint, GLuint, GLuint))
+SDL_PROC_UNUSED(void, glColor3uiv, (const GLuint *))
+SDL_PROC_UNUSED(void, glColor3us, (GLushort, GLushort, GLushort))
+SDL_PROC_UNUSED(void, glColor3usv, (const GLushort *))
+SDL_PROC_UNUSED(void, glColor4b, (GLbyte, GLbyte, GLbyte, GLbyte))
+SDL_PROC_UNUSED(void, glColor4bv, (const GLbyte *))
+SDL_PROC_UNUSED(void, glColor4d, (GLdouble, GLdouble, GLdouble, GLdouble))
+SDL_PROC_UNUSED(void, glColor4dv, (const GLdouble *))
+SDL_PROC(void, glColor4f, (GLfloat, GLfloat, GLfloat, GLfloat))
+SDL_PROC_UNUSED(void, glColor4fv, (const GLfloat *))
+SDL_PROC_UNUSED(void, glColor4i, (GLint, GLint, GLint, GLint))
+SDL_PROC_UNUSED(void, glColor4iv, (const GLint *))
+SDL_PROC_UNUSED(void, glColor4s, (GLshort, GLshort, GLshort, GLshort))
+SDL_PROC_UNUSED(void, glColor4sv, (const GLshort *))
+SDL_PROC_UNUSED(void, glColor4ub,
+                (GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha))
+SDL_PROC_UNUSED(void, glColor4ubv, (const GLubyte * v))
+SDL_PROC_UNUSED(void, glColor4ui,
+                (GLuint red, GLuint green, GLuint blue, GLuint alpha))
+SDL_PROC_UNUSED(void, glColor4uiv, (const GLuint * v))
+SDL_PROC_UNUSED(void, glColor4us,
+                (GLushort red, GLushort green, GLushort blue, GLushort alpha))
+SDL_PROC_UNUSED(void, glColor4usv, (const GLushort * v))
+SDL_PROC_UNUSED(void, glColorMask,
+                (GLboolean red, GLboolean green, GLboolean blue,
+                 GLboolean alpha))
+SDL_PROC_UNUSED(void, glColorMaterial, (GLenum face, GLenum mode))
+SDL_PROC_UNUSED(void, glColorPointer,
+                (GLint size, GLenum type, GLsizei stride,
+                 const GLvoid * pointer))
+SDL_PROC_UNUSED(void, glCopyPixels,
+                (GLint x, GLint y, GLsizei width, GLsizei height,
+                 GLenum type))
+SDL_PROC_UNUSED(void, glCopyTexImage1D,
+                (GLenum target, GLint level, GLenum internalFormat, GLint x,
+                 GLint y, GLsizei width, GLint border))
+SDL_PROC_UNUSED(void, glCopyTexImage2D,
+                (GLenum target, GLint level, GLenum internalFormat, GLint x,
+                 GLint y, GLsizei width, GLsizei height, GLint border))
+SDL_PROC_UNUSED(void, glCopyTexSubImage1D,
+                (GLenum target, GLint level, GLint xoffset, GLint x, GLint y,
+                 GLsizei width))
+SDL_PROC_UNUSED(void, glCopyTexSubImage2D,
+                (GLenum target, GLint level, GLint xoffset, GLint yoffset,
+                 GLint x, GLint y, GLsizei width, GLsizei height))
+SDL_PROC_UNUSED(void, glCullFace, (GLenum mode))
+SDL_PROC_UNUSED(void, glDeleteLists, (GLuint list, GLsizei range))
+SDL_PROC(void, glDeleteTextures, (GLsizei n, const GLuint * textures))
+SDL_PROC_UNUSED(void, glDepthFunc, (GLenum func))
+SDL_PROC_UNUSED(void, glDepthMask, (GLboolean flag))
+SDL_PROC_UNUSED(void, glDepthRange, (GLclampd zNear, GLclampd zFar))
+SDL_PROC(void, glDisable, (GLenum cap))
+SDL_PROC_UNUSED(void, glDisableClientState, (GLenum array))
+SDL_PROC_UNUSED(void, glDrawArrays, (GLenum mode, GLint first, GLsizei count))
+SDL_PROC_UNUSED(void, glDrawBuffer, (GLenum mode))
+SDL_PROC_UNUSED(void, glDrawElements,
+                (GLenum mode, GLsizei count, GLenum type,
+                 const GLvoid * indices))
+SDL_PROC(void, glDrawPixels,
+         (GLsizei width, GLsizei height, GLenum format, GLenum type,
+          const GLvoid * pixels))
+SDL_PROC_UNUSED(void, glEdgeFlag, (GLboolean flag))
+SDL_PROC_UNUSED(void, glEdgeFlagPointer,
+                (GLsizei stride, const GLvoid * pointer))
+SDL_PROC_UNUSED(void, glEdgeFlagv, (const GLboolean * flag))
+SDL_PROC(void, glEnable, (GLenum cap))
+SDL_PROC_UNUSED(void, glEnableClientState, (GLenum array))
+SDL_PROC(void, glEnd, (void))
+SDL_PROC_UNUSED(void, glEndList, (void))
+SDL_PROC_UNUSED(void, glEvalCoord1d, (GLdouble u))
+SDL_PROC_UNUSED(void, glEvalCoord1dv, (const GLdouble * u))
+SDL_PROC_UNUSED(void, glEvalCoord1f, (GLfloat u))
+SDL_PROC_UNUSED(void, glEvalCoord1fv, (const GLfloat * u))
+SDL_PROC_UNUSED(void, glEvalCoord2d, (GLdouble u, GLdouble v))
+SDL_PROC_UNUSED(void, glEvalCoord2dv, (const GLdouble * u))
+SDL_PROC_UNUSED(void, glEvalCoord2f, (GLfloat u, GLfloat v))
+SDL_PROC_UNUSED(void, glEvalCoord2fv, (const GLfloat * u))
+SDL_PROC_UNUSED(void, glEvalMesh1, (GLenum mode, GLint i1, GLint i2))
+SDL_PROC_UNUSED(void, glEvalMesh2,
+                (GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2))
+SDL_PROC_UNUSED(void, glEvalPoint1, (GLint i))
+SDL_PROC_UNUSED(void, glEvalPoint2, (GLint i, GLint j))
+SDL_PROC_UNUSED(void, glFeedbackBuffer,
+                (GLsizei size, GLenum type, GLfloat * buffer))
+SDL_PROC_UNUSED(void, glFinish, (void))
+SDL_PROC_UNUSED(void, glFlush, (void))
+SDL_PROC_UNUSED(void, glFogf, (GLenum pname, GLfloat param))
+SDL_PROC_UNUSED(void, glFogfv, (GLenum pname, const GLfloat * params))
+SDL_PROC_UNUSED(void, glFogi, (GLenum pname, GLint param))
+SDL_PROC_UNUSED(void, glFogiv, (GLenum pname, const GLint * params))
+SDL_PROC_UNUSED(void, glFrontFace, (GLenum mode))
+SDL_PROC_UNUSED(void, glFrustum,
+                (GLdouble left, GLdouble right, GLdouble bottom,
+                 GLdouble top, GLdouble zNear, GLdouble zFar))
+SDL_PROC_UNUSED(GLuint, glGenLists, (GLsizei range))
+SDL_PROC(void, glGenTextures, (GLsizei n, GLuint * textures))
+SDL_PROC_UNUSED(void, glGetBooleanv, (GLenum pname, GLboolean * params))
+SDL_PROC_UNUSED(void, glGetClipPlane, (GLenum plane, GLdouble * equation))
+SDL_PROC_UNUSED(void, glGetDoublev, (GLenum pname, GLdouble * params))
+SDL_PROC(GLenum, glGetError, (void))
+SDL_PROC_UNUSED(void, glGetFloatv, (GLenum pname, GLfloat * params))
+SDL_PROC(void, glGetIntegerv, (GLenum pname, GLint * params))
+SDL_PROC_UNUSED(void, glGetLightfv,
+                (GLenum light, GLenum pname, GLfloat * params))
+SDL_PROC_UNUSED(void, glGetLightiv,
+                (GLenum light, GLenum pname, GLint * params))
+SDL_PROC_UNUSED(void, glGetMapdv, (GLenum target, GLenum query, GLdouble * v))
+SDL_PROC_UNUSED(void, glGetMapfv, (GLenum target, GLenum query, GLfloat * v))
+SDL_PROC_UNUSED(void, glGetMapiv, (GLenum target, GLenum query, GLint * v))
+SDL_PROC_UNUSED(void, glGetMaterialfv,
+                (GLenum face, GLenum pname, GLfloat * params))
+SDL_PROC_UNUSED(void, glGetMaterialiv,
+                (GLenum face, GLenum pname, GLint * params))
+SDL_PROC_UNUSED(void, glGetPixelMapfv, (GLenum map, GLfloat * values))
+SDL_PROC_UNUSED(void, glGetPixelMapuiv, (GLenum map, GLuint * values))
+SDL_PROC_UNUSED(void, glGetPixelMapusv, (GLenum map, GLushort * values))
+SDL_PROC_UNUSED(void, glGetPointerv, (GLenum pname, GLvoid * *params))
+SDL_PROC_UNUSED(void, glGetPolygonStipple, (GLubyte * mask))
+SDL_PROC(const GLubyte *, glGetString, (GLenum name))
+SDL_PROC_UNUSED(void, glGetTexEnvfv,
+                (GLenum target, GLenum pname, GLfloat * params))
+SDL_PROC_UNUSED(void, glGetTexEnviv,
+                (GLenum target, GLenum pname, GLint * params))
+SDL_PROC_UNUSED(void, glGetTexGendv,
+                (GLenum coord, GLenum pname, GLdouble * params))
+SDL_PROC_UNUSED(void, glGetTexGenfv,
+                (GLenum coord, GLenum pname, GLfloat * params))
+SDL_PROC_UNUSED(void, glGetTexGeniv,
+                (GLenum coord, GLenum pname, GLint * params))
+SDL_PROC_UNUSED(void, glGetTexImage,
+                (GLenum target, GLint level, GLenum format, GLenum type,
+                 GLvoid * pixels))
+SDL_PROC_UNUSED(void, glGetTexLevelParameterfv,
+                (GLenum target, GLint level, GLenum pname, GLfloat * params))
+SDL_PROC_UNUSED(void, glGetTexLevelParameteriv,
+                (GLenum target, GLint level, GLenum pname, GLint * params))
+SDL_PROC_UNUSED(void, glGetTexParameterfv,
+                (GLenum target, GLenum pname, GLfloat * params))
+SDL_PROC_UNUSED(void, glGetTexParameteriv,
+                (GLenum target, GLenum pname, GLint * params))
+SDL_PROC_UNUSED(void, glHint, (GLenum target, GLenum mode))
+SDL_PROC_UNUSED(void, glIndexMask, (GLuint mask))
+SDL_PROC_UNUSED(void, glIndexPointer,
+                (GLenum type, GLsizei stride, const GLvoid * pointer))
+SDL_PROC_UNUSED(void, glIndexd, (GLdouble c))
+SDL_PROC_UNUSED(void, glIndexdv, (const GLdouble * c))
+SDL_PROC_UNUSED(void, glIndexf, (GLfloat c))
+SDL_PROC_UNUSED(void, glIndexfv, (const GLfloat * c))
+SDL_PROC_UNUSED(void, glIndexi, (GLint c))
+SDL_PROC_UNUSED(void, glIndexiv, (const GLint * c))
+SDL_PROC_UNUSED(void, glIndexs, (GLshort c))
+SDL_PROC_UNUSED(void, glIndexsv, (const GLshort * c))
+SDL_PROC_UNUSED(void, glIndexub, (GLubyte c))
+SDL_PROC_UNUSED(void, glIndexubv, (const GLubyte * c))
+SDL_PROC_UNUSED(void, glInitNames, (void))
+SDL_PROC_UNUSED(void, glInterleavedArrays,
+                (GLenum format, GLsizei stride, const GLvoid * pointer))
+SDL_PROC_UNUSED(GLboolean, glIsEnabled, (GLenum cap))
+SDL_PROC_UNUSED(GLboolean, glIsList, (GLuint list))
+SDL_PROC_UNUSED(GLboolean, glIsTexture, (GLuint texture))
+SDL_PROC_UNUSED(void, glLightModelf, (GLenum pname, GLfloat param))
+SDL_PROC_UNUSED(void, glLightModelfv, (GLenum pname, const GLfloat * params))
+SDL_PROC_UNUSED(void, glLightModeli, (GLenum pname, GLint param))
+SDL_PROC_UNUSED(void, glLightModeliv, (GLenum pname, const GLint * params))
+SDL_PROC_UNUSED(void, glLightf, (GLenum light, GLenum pname, GLfloat param))
+SDL_PROC_UNUSED(void, glLightfv,
+                (GLenum light, GLenum pname, const GLfloat * params))
+SDL_PROC_UNUSED(void, glLighti, (GLenum light, GLenum pname, GLint param))
+SDL_PROC_UNUSED(void, glLightiv,
+                (GLenum light, GLenum pname, const GLint * params))
+SDL_PROC_UNUSED(void, glLineStipple, (GLint factor, GLushort pattern))
+SDL_PROC(void, glLineWidth, (GLfloat width))
+SDL_PROC_UNUSED(void, glListBase, (GLuint base))
+SDL_PROC(void, glLoadIdentity, (void))
+SDL_PROC_UNUSED(void, glLoadMatrixd, (const GLdouble * m))
+SDL_PROC_UNUSED(void, glLoadMatrixf, (const GLfloat * m))
+SDL_PROC_UNUSED(void, glLoadName, (GLuint name))
+SDL_PROC_UNUSED(void, glLogicOp, (GLenum opcode))
+SDL_PROC_UNUSED(void, glMap1d,
+                (GLenum target, GLdouble u1, GLdouble u2, GLint stride,
+                 GLint order, const GLdouble * points))
+SDL_PROC_UNUSED(void, glMap1f,
+                (GLenum target, GLfloat u1, GLfloat u2, GLint stride,
+                 GLint order, const GLfloat * points))
+SDL_PROC_UNUSED(void, glMap2d,
+                (GLenum target, GLdouble u1, GLdouble u2, GLint ustride,
+                 GLint uorder, GLdouble v1, GLdouble v2, GLint vstride,
+                 GLint vorder, const GLdouble * points))
+SDL_PROC_UNUSED(void, glMap2f,
+                (GLenum target, GLfloat u1, GLfloat u2, GLint ustride,
+                 GLint uorder, GLfloat v1, GLfloat v2, GLint vstride,
+                 GLint vorder, const GLfloat * points))
+SDL_PROC_UNUSED(void, glMapGrid1d, (GLint un, GLdouble u1, GLdouble u2))
+SDL_PROC_UNUSED(void, glMapGrid1f, (GLint un, GLfloat u1, GLfloat u2))
+SDL_PROC_UNUSED(void, glMapGrid2d,
+                (GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1,
+                 GLdouble v2))
+SDL_PROC_UNUSED(void, glMapGrid2f,
+                (GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1,
+                 GLfloat v2))
+SDL_PROC_UNUSED(void, glMaterialf, (GLenum face, GLenum pname, GLfloat param))
+SDL_PROC_UNUSED(void, glMaterialfv,
+                (GLenum face, GLenum pname, const GLfloat * params))
+SDL_PROC_UNUSED(void, glMateriali, (GLenum face, GLenum pname, GLint param))
+SDL_PROC_UNUSED(void, glMaterialiv,
+                (GLenum face, GLenum pname, const GLint * params))
+SDL_PROC(void, glMatrixMode, (GLenum mode))
+SDL_PROC_UNUSED(void, glMultMatrixd, (const GLdouble * m))
+SDL_PROC_UNUSED(void, glMultMatrixf, (const GLfloat * m))
+SDL_PROC_UNUSED(void, glNewList, (GLuint list, GLenum mode))
+SDL_PROC_UNUSED(void, glNormal3b, (GLbyte nx, GLbyte ny, GLbyte nz))
+SDL_PROC_UNUSED(void, glNormal3bv, (const GLbyte * v))
+SDL_PROC_UNUSED(void, glNormal3d, (GLdouble nx, GLdouble ny, GLdouble nz))
+SDL_PROC_UNUSED(void, glNormal3dv, (const GLdouble * v))
+SDL_PROC_UNUSED(void, glNormal3f, (GLfloat nx, GLfloat ny, GLfloat nz))
+SDL_PROC_UNUSED(void, glNormal3fv, (const GLfloat * v))
+SDL_PROC_UNUSED(void, glNormal3i, (GLint nx, GLint ny, GLint nz))
+SDL_PROC_UNUSED(void, glNormal3iv, (const GLint * v))
+SDL_PROC_UNUSED(void, glNormal3s, (GLshort nx, GLshort ny, GLshort nz))
+SDL_PROC_UNUSED(void, glNormal3sv, (const GLshort * v))
+SDL_PROC_UNUSED(void, glNormalPointer,
+                (GLenum type, GLsizei stride, const GLvoid * pointer))
+SDL_PROC(void, glOrtho,
+         (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top,
+          GLdouble zNear, GLdouble zFar))
+SDL_PROC_UNUSED(void, glPassThrough, (GLfloat token))
+SDL_PROC_UNUSED(void, glPixelMapfv,
+                (GLenum map, GLsizei mapsize, const GLfloat * values))
+SDL_PROC_UNUSED(void, glPixelMapuiv,
+                (GLenum map, GLsizei mapsize, const GLuint * values))
+SDL_PROC_UNUSED(void, glPixelMapusv,
+                (GLenum map, GLsizei mapsize, const GLushort * values))
+SDL_PROC_UNUSED(void, glPixelStoref, (GLenum pname, GLfloat param))
+SDL_PROC(void, glPixelStorei, (GLenum pname, GLint param))
+SDL_PROC_UNUSED(void, glPixelTransferf, (GLenum pname, GLfloat param))
+SDL_PROC_UNUSED(void, glPixelTransferi, (GLenum pname, GLint param))
+SDL_PROC_UNUSED(void, glPixelZoom, (GLfloat xfactor, GLfloat yfactor))
+SDL_PROC(void, glPointSize, (GLfloat size))
+SDL_PROC_UNUSED(void, glPolygonMode, (GLenum face, GLenum mode))
+SDL_PROC_UNUSED(void, glPolygonOffset, (GLfloat factor, GLfloat units))
+SDL_PROC_UNUSED(void, glPolygonStipple, (const GLubyte * mask))
+SDL_PROC_UNUSED(void, glPopAttrib, (void))
+SDL_PROC_UNUSED(void, glPopClientAttrib, (void))
+SDL_PROC_UNUSED(void, glPopMatrix, (void))
+SDL_PROC_UNUSED(void, glPopName, (void))
+SDL_PROC_UNUSED(void, glPrioritizeTextures,
+                (GLsizei n, const GLuint * textures,
+                 const GLclampf * priorities))
+SDL_PROC_UNUSED(void, glPushAttrib, (GLbitfield mask))
+SDL_PROC_UNUSED(void, glPushClientAttrib, (GLbitfield mask))
+SDL_PROC_UNUSED(void, glPushMatrix, (void))
+SDL_PROC_UNUSED(void, glPushName, (GLuint name))
+SDL_PROC_UNUSED(void, glRasterPos2d, (GLdouble x, GLdouble y))
+SDL_PROC_UNUSED(void, glRasterPos2dv, (const GLdouble * v))
+SDL_PROC_UNUSED(void, glRasterPos2f, (GLfloat x, GLfloat y))
+SDL_PROC_UNUSED(void, glRasterPos2fv, (const GLfloat * v))
+SDL_PROC(void, glRasterPos2i, (GLint x, GLint y))
+SDL_PROC_UNUSED(void, glRasterPos2iv, (const GLint * v))
+SDL_PROC_UNUSED(void, glRasterPos2s, (GLshort x, GLshort y))
+SDL_PROC_UNUSED(void, glRasterPos2sv, (const GLshort * v))
+SDL_PROC_UNUSED(void, glRasterPos3d, (GLdouble x, GLdouble y, GLdouble z))
+SDL_PROC_UNUSED(void, glRasterPos3dv, (const GLdouble * v))
+SDL_PROC_UNUSED(void, glRasterPos3f, (GLfloat x, GLfloat y, GLfloat z))
+SDL_PROC_UNUSED(void, glRasterPos3fv, (const GLfloat * v))
+SDL_PROC_UNUSED(void, glRasterPos3i, (GLint x, GLint y, GLint z))
+SDL_PROC_UNUSED(void, glRasterPos3iv, (const GLint * v))
+SDL_PROC_UNUSED(void, glRasterPos3s, (GLshort x, GLshort y, GLshort z))
+SDL_PROC_UNUSED(void, glRasterPos3sv, (const GLshort * v))
+SDL_PROC_UNUSED(void, glRasterPos4d,
+                (GLdouble x, GLdouble y, GLdouble z, GLdouble w))
+SDL_PROC_UNUSED(void, glRasterPos4dv, (const GLdouble * v))
+SDL_PROC_UNUSED(void, glRasterPos4f,
+                (GLfloat x, GLfloat y, GLfloat z, GLfloat w))
+SDL_PROC_UNUSED(void, glRasterPos4fv, (const GLfloat * v))
+SDL_PROC_UNUSED(void, glRasterPos4i, (GLint x, GLint y, GLint z, GLint w))
+SDL_PROC_UNUSED(void, glRasterPos4iv, (const GLint * v))
+SDL_PROC_UNUSED(void, glRasterPos4s,
+                (GLshort x, GLshort y, GLshort z, GLshort w))
+SDL_PROC_UNUSED(void, glRasterPos4sv, (const GLshort * v))
+SDL_PROC(void, glReadBuffer, (GLenum mode))
+SDL_PROC(void, glReadPixels,
+         (GLint x, GLint y, GLsizei width, GLsizei height,
+          GLenum format, GLenum type, GLvoid * pixels))
+SDL_PROC_UNUSED(void, glRectd,
+                (GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2))
+SDL_PROC_UNUSED(void, glRectdv, (const GLdouble * v1, const GLdouble * v2))
+SDL_PROC_UNUSED(void, glRectf,
+                (GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2))
+SDL_PROC_UNUSED(void, glRectfv, (const GLfloat * v1, const GLfloat * v2))
+SDL_PROC(void, glRecti, (GLint x1, GLint y1, GLint x2, GLint y2))
+SDL_PROC_UNUSED(void, glRectiv, (const GLint * v1, const GLint * v2))
+SDL_PROC_UNUSED(void, glRects,
+                (GLshort x1, GLshort y1, GLshort x2, GLshort y2))
+SDL_PROC_UNUSED(void, glRectsv, (const GLshort * v1, const GLshort * v2))
+SDL_PROC_UNUSED(GLint, glRenderMode, (GLenum mode))
+SDL_PROC_UNUSED(void, glRotated,
+                (GLdouble angle, GLdouble x, GLdouble y, GLdouble z))
+SDL_PROC_UNUSED(void, glRotatef,
+                (GLfloat angle, GLfloat x, GLfloat y, GLfloat z))
+SDL_PROC_UNUSED(void, glScaled, (GLdouble x, GLdouble y, GLdouble z))
+SDL_PROC_UNUSED(void, glScalef, (GLfloat x, GLfloat y, GLfloat z))
+SDL_PROC_UNUSED(void, glScissor,
+                (GLint x, GLint y, GLsizei width, GLsizei height))
+SDL_PROC_UNUSED(void, glSelectBuffer, (GLsizei size, GLuint * buffer))
+SDL_PROC_UNUSED(void, glShadeModel, (GLenum mode))
+SDL_PROC_UNUSED(void, glStencilFunc, (GLenum func, GLint ref, GLuint mask))
+SDL_PROC_UNUSED(void, glStencilMask, (GLuint mask))
+SDL_PROC_UNUSED(void, glStencilOp, (GLenum fail, GLenum zfail, GLenum zpass))
+SDL_PROC_UNUSED(void, glTexCoord1d, (GLdouble s))
+SDL_PROC_UNUSED(void, glTexCoord1dv, (const GLdouble * v))
+SDL_PROC_UNUSED(void, glTexCoord1f, (GLfloat s))
+SDL_PROC_UNUSED(void, glTexCoord1fv, (const GLfloat * v))
+SDL_PROC_UNUSED(void, glTexCoord1i, (GLint s))
+SDL_PROC_UNUSED(void, glTexCoord1iv, (const GLint * v))
+SDL_PROC_UNUSED(void, glTexCoord1s, (GLshort s))
+SDL_PROC_UNUSED(void, glTexCoord1sv, (const GLshort * v))
+SDL_PROC_UNUSED(void, glTexCoord2d, (GLdouble s, GLdouble t))
+SDL_PROC_UNUSED(void, glTexCoord2dv, (const GLdouble * v))
+SDL_PROC(void, glTexCoord2f, (GLfloat s, GLfloat t))
+SDL_PROC_UNUSED(void, glTexCoord2fv, (const GLfloat * v))
+SDL_PROC_UNUSED(void, glTexCoord2i, (GLint s, GLint t))
+SDL_PROC_UNUSED(void, glTexCoord2iv, (const GLint * v))
+SDL_PROC_UNUSED(void, glTexCoord2s, (GLshort s, GLshort t))
+SDL_PROC_UNUSED(void, glTexCoord2sv, (const GLshort * v))
+SDL_PROC_UNUSED(void, glTexCoord3d, (GLdouble s, GLdouble t, GLdouble r))
+SDL_PROC_UNUSED(void, glTexCoord3dv, (const GLdouble * v))
+SDL_PROC_UNUSED(void, glTexCoord3f, (GLfloat s, GLfloat t, GLfloat r))
+SDL_PROC_UNUSED(void, glTexCoord3fv, (const GLfloat * v))
+SDL_PROC_UNUSED(void, glTexCoord3i, (GLint s, GLint t, GLint r))
+SDL_PROC_UNUSED(void, glTexCoord3iv, (const GLint * v))
+SDL_PROC_UNUSED(void, glTexCoord3s, (GLshort s, GLshort t, GLshort r))
+SDL_PROC_UNUSED(void, glTexCoord3sv, (const GLshort * v))
+SDL_PROC_UNUSED(void, glTexCoord4d,
+                (GLdouble s, GLdouble t, GLdouble r, GLdouble q))
+SDL_PROC_UNUSED(void, glTexCoord4dv, (const GLdouble * v))
+SDL_PROC_UNUSED(void, glTexCoord4f,
+                (GLfloat s, GLfloat t, GLfloat r, GLfloat q))
+SDL_PROC_UNUSED(void, glTexCoord4fv, (const GLfloat * v))
+SDL_PROC_UNUSED(void, glTexCoord4i, (GLint s, GLint t, GLint r, GLint q))
+SDL_PROC_UNUSED(void, glTexCoord4iv, (const GLint * v))
+SDL_PROC_UNUSED(void, glTexCoord4s,
+                (GLshort s, GLshort t, GLshort r, GLshort q))
+SDL_PROC_UNUSED(void, glTexCoord4sv, (const GLshort * v))
+SDL_PROC_UNUSED(void, glTexCoordPointer,
+                (GLint size, GLenum type, GLsizei stride,
+                 const GLvoid * pointer))
+SDL_PROC(void, glTexEnvf, (GLenum target, GLenum pname, GLfloat param))
+SDL_PROC_UNUSED(void, glTexEnvfv,
+                (GLenum target, GLenum pname, const GLfloat * params))
+SDL_PROC_UNUSED(void, glTexEnvi, (GLenum target, GLenum pname, GLint param))
+SDL_PROC_UNUSED(void, glTexEnviv,
+                (GLenum target, GLenum pname, const GLint * params))
+SDL_PROC_UNUSED(void, glTexGend, (GLenum coord, GLenum pname, GLdouble param))
+SDL_PROC_UNUSED(void, glTexGendv,
+                (GLenum coord, GLenum pname, const GLdouble * params))
+SDL_PROC_UNUSED(void, glTexGenf, (GLenum coord, GLenum pname, GLfloat param))
+SDL_PROC_UNUSED(void, glTexGenfv,
+                (GLenum coord, GLenum pname, const GLfloat * params))
+SDL_PROC_UNUSED(void, glTexGeni, (GLenum coord, GLenum pname, GLint param))
+SDL_PROC_UNUSED(void, glTexGeniv,
+                (GLenum coord, GLenum pname, const GLint * params))
+SDL_PROC_UNUSED(void, glTexImage1D,
+                (GLenum target, GLint level, GLint internalformat,
+                 GLsizei width, GLint border, GLenum format, GLenum type,
+                 const GLvoid * pixels))
+SDL_PROC(void, glTexImage2D,
+         (GLenum target, GLint level, GLint internalformat, GLsizei width,
+          GLsizei height, GLint border, GLenum format, GLenum type,
+          const GLvoid * pixels))
+SDL_PROC_UNUSED(void, glTexParameterf,
+                (GLenum target, GLenum pname, GLfloat param))
+SDL_PROC_UNUSED(void, glTexParameterfv,
+                (GLenum target, GLenum pname, const GLfloat * params))
+SDL_PROC(void, glTexParameteri, (GLenum target, GLenum pname, GLint param))
+SDL_PROC_UNUSED(void, glTexParameteriv,
+                (GLenum target, GLenum pname, const GLint * params))
+SDL_PROC_UNUSED(void, glTexSubImage1D,
+                (GLenum target, GLint level, GLint xoffset, GLsizei width,
+                 GLenum format, GLenum type, const GLvoid * pixels))
+SDL_PROC(void, glTexSubImage2D,
+         (GLenum target, GLint level, GLint xoffset, GLint yoffset,
+          GLsizei width, GLsizei height, GLenum format, GLenum type,
+          const GLvoid * pixels))
+SDL_PROC_UNUSED(void, glTranslated, (GLdouble x, GLdouble y, GLdouble z))
+SDL_PROC_UNUSED(void, glTranslatef, (GLfloat x, GLfloat y, GLfloat z))
+SDL_PROC_UNUSED(void, glVertex2d, (GLdouble x, GLdouble y))
+SDL_PROC_UNUSED(void, glVertex2dv, (const GLdouble * v))
+SDL_PROC(void, glVertex2f, (GLfloat x, GLfloat y))
+SDL_PROC_UNUSED(void, glVertex2fv, (const GLfloat * v))
+SDL_PROC_UNUSED(void, glVertex2i, (GLint x, GLint y))
+SDL_PROC_UNUSED(void, glVertex2iv, (const GLint * v))
+SDL_PROC_UNUSED(void, glVertex2s, (GLshort x, GLshort y))
+SDL_PROC_UNUSED(void, glVertex2sv, (const GLshort * v))
+SDL_PROC_UNUSED(void, glVertex3d, (GLdouble x, GLdouble y, GLdouble z))
+SDL_PROC_UNUSED(void, glVertex3dv, (const GLdouble * v))
+SDL_PROC_UNUSED(void, glVertex3f, (GLfloat x, GLfloat y, GLfloat z))
+SDL_PROC_UNUSED(void, glVertex3fv, (const GLfloat * v))
+SDL_PROC_UNUSED(void, glVertex3i, (GLint x, GLint y, GLint z))
+SDL_PROC_UNUSED(void, glVertex3iv, (const GLint * v))
+SDL_PROC_UNUSED(void, glVertex3s, (GLshort x, GLshort y, GLshort z))
+SDL_PROC_UNUSED(void, glVertex3sv, (const GLshort * v))
+SDL_PROC_UNUSED(void, glVertex4d,
+                (GLdouble x, GLdouble y, GLdouble z, GLdouble w))
+SDL_PROC_UNUSED(void, glVertex4dv, (const GLdouble * v))
+SDL_PROC_UNUSED(void, glVertex4f,
+                (GLfloat x, GLfloat y, GLfloat z, GLfloat w))
+SDL_PROC_UNUSED(void, glVertex4fv, (const GLfloat * v))
+SDL_PROC_UNUSED(void, glVertex4i, (GLint x, GLint y, GLint z, GLint w))
+SDL_PROC_UNUSED(void, glVertex4iv, (const GLint * v))
+SDL_PROC_UNUSED(void, glVertex4s,
+                (GLshort x, GLshort y, GLshort z, GLshort w))
+SDL_PROC_UNUSED(void, glVertex4sv, (const GLshort * v))
+SDL_PROC_UNUSED(void, glVertexPointer,
+                (GLint size, GLenum type, GLsizei stride,
+                 const GLvoid * pointer))
+SDL_PROC(void, glViewport, (GLint x, GLint y, GLsizei width, GLsizei height))
+
+/* vi: set ts=4 sw=4 expandtab: */
--- a/src/render/opengl/SDL_render_gl.c	Sun Feb 06 00:48:41 2011 -0800
+++ b/src/render/opengl/SDL_render_gl.c	Sun Feb 06 02:35:14 2011 -0800
@@ -88,7 +88,7 @@
 
     /* OpenGL functions */
 #define SDL_PROC(ret,func,params) ret (APIENTRY *func) params;
-#include "../../video/SDL_glfuncs.h"
+#include "SDL_glfuncs.h"
 #undef SDL_PROC
 
     void (*glTextureRangeAPPLE) (GLenum target, GLsizei length,
@@ -161,7 +161,7 @@
     } while ( 0 );
 #endif /* __SDL_NOGETPROCADDR__ */
 
-#include "../../video/SDL_glfuncs.h"
+#include "SDL_glfuncs.h"
 #undef SDL_PROC
     return 0;
 }
@@ -213,11 +213,6 @@
 
     renderer->info.flags = SDL_RENDERER_ACCELERATED;
 
-    if (GL_LoadFunctions(data) < 0) {
-        GL_DestroyRenderer(renderer);
-        return NULL;
-    }
-
     data->context = SDL_GL_CreateContext(window);
     if (!data->context) {
         GL_DestroyRenderer(renderer);
@@ -227,6 +222,12 @@
         GL_DestroyRenderer(renderer);
         return NULL;
     }
+
+    if (GL_LoadFunctions(data) < 0) {
+        GL_DestroyRenderer(renderer);
+        return NULL;
+    }
+
 #ifdef __MACOSX__
     /* Enable multi-threaded rendering */
     /* Disabled until Ryan finishes his VBO/PBO code...
--- a/src/render/opengles/SDL_render_gles.c	Sun Feb 06 00:48:41 2011 -0800
+++ b/src/render/opengles/SDL_render_gles.c	Sun Feb 06 02:35:14 2011 -0800
@@ -88,18 +88,8 @@
     SDL_bool updateSize;
     int blendMode;
 
-#ifndef APIENTRY
-#define APIENTRY
-#endif
-
     SDL_bool useDrawTexture;
     SDL_bool GL_OES_draw_texture_supported;
-
-    /* OpenGL ES functions */
-#define SDL_PROC(ret,func,params) ret (APIENTRY *func) params;
-#include "../../video/SDL_glesfuncs.h"
-#undef SDL_PROC
-
 } GLES_RenderData;
 
 typedef struct
@@ -148,18 +138,6 @@
     SDL_SetError("%s: %s", prefix, error);
 }
 
-static int
-GLES_LoadFunctions(GLES_RenderData * data)
-{
-
-#define SDL_PROC(ret,func,params) \
-    data->func = func;
-#include "../../video/SDL_glesfuncs.h"
-#undef SDL_PROC
-
-    return 0;
-}
-
 SDL_Renderer *
 GLES_CreateRenderer(SDL_Window * window, Uint32 flags)
 {
@@ -206,11 +184,6 @@
 
     renderer->info.flags = SDL_RENDERER_ACCELERATED;
 
-    if (GLES_LoadFunctions(data) < 0) {
-        GLES_DestroyRenderer(renderer);
-        return NULL;
-    }
-
     data->context = SDL_GL_CreateContext(window);
     if (!data->context) {
         GLES_DestroyRenderer(renderer);
@@ -243,19 +216,19 @@
     }
 #endif
 
-    data->glGetIntegerv(GL_MAX_TEXTURE_SIZE, &value);
+    glGetIntegerv(GL_MAX_TEXTURE_SIZE, &value);
     renderer->info.max_texture_width = value;
-    data->glGetIntegerv(GL_MAX_TEXTURE_SIZE, &value);
+    glGetIntegerv(GL_MAX_TEXTURE_SIZE, &value);
     renderer->info.max_texture_height = value;
 
     /* Set up parameters for rendering */
     data->blendMode = -1;
-    data->glDisable(GL_DEPTH_TEST);
-    data->glDisable(GL_CULL_FACE);
+    glDisable(GL_DEPTH_TEST);
+    glDisable(GL_CULL_FACE);
     data->updateSize = SDL_TRUE;
 
-    data->glEnableClientState(GL_VERTEX_ARRAY);
-    data->glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+    glEnableClientState(GL_VERTEX_ARRAY);
+    glEnableClientState(GL_TEXTURE_COORD_ARRAY);
     
     return renderer;
 }
@@ -278,12 +251,12 @@
         int w, h;
 
         SDL_GetWindowSize(window, &w, &h);
-        data->glMatrixMode(GL_PROJECTION);
-        data->glLoadIdentity();
-        data->glMatrixMode(GL_MODELVIEW);
-        data->glLoadIdentity();
-        data->glViewport(0, 0, w, h);
-        data->glOrthof(0.0, (GLfloat) w, (GLfloat) h, 0.0, 0.0, 1.0);
+        glMatrixMode(GL_PROJECTION);
+        glLoadIdentity();
+        glMatrixMode(GL_MODELVIEW);
+        glLoadIdentity();
+        glViewport(0, 0, w, h);
+        glOrthof(0.0, (GLfloat) w, (GLfloat) h, 0.0, 0.0, 1.0);
         data->updateSize = SDL_FALSE;
     }
     return 0;
@@ -353,9 +326,9 @@
 
     texture->driverdata = data;
 
-    renderdata->glGetError();
-    renderdata->glEnable(GL_TEXTURE_2D);
-    renderdata->glGenTextures(1, &data->texture);
+    glGetError();
+    glEnable(GL_TEXTURE_2D);
+    glGenTextures(1, &data->texture);
 
     data->type = GL_TEXTURE_2D;
     /* no NPOV textures allowed in OpenGL ES (yet) */
@@ -366,21 +339,21 @@
 
     data->format = format;
     data->formattype = type;
-    renderdata->glBindTexture(data->type, data->texture);
-    renderdata->glTexParameteri(data->type, GL_TEXTURE_MIN_FILTER,
+    glBindTexture(data->type, data->texture);
+    glTexParameteri(data->type, GL_TEXTURE_MIN_FILTER,
                                 GL_LINEAR);
-    renderdata->glTexParameteri(data->type, GL_TEXTURE_MAG_FILTER,
+    glTexParameteri(data->type, GL_TEXTURE_MAG_FILTER,
                                 GL_LINEAR);
-    renderdata->glTexParameteri(data->type, GL_TEXTURE_WRAP_S,
+    glTexParameteri(data->type, GL_TEXTURE_WRAP_S,
                                 GL_CLAMP_TO_EDGE);
-    renderdata->glTexParameteri(data->type, GL_TEXTURE_WRAP_T,
+    glTexParameteri(data->type, GL_TEXTURE_WRAP_T,
                                 GL_CLAMP_TO_EDGE);
 
-    renderdata->glTexImage2D(data->type, 0, internalFormat, texture_w,
+    glTexImage2D(data->type, 0, internalFormat, texture_w,
                              texture_h, 0, format, type, NULL);
-    renderdata->glDisable(GL_TEXTURE_2D);
+    glDisable(GL_TEXTURE_2D);
 
-    result = renderdata->glGetError();
+    result = glGetError();
     if (result != GL_NO_ERROR) {
         GLES_SetError("glTexImage2D()", result);
         return -1;
@@ -402,10 +375,10 @@
 
     GLES_ActivateRenderer(renderer);
 
-    renderdata->glGetError();
-    renderdata->glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-    renderdata->glEnable(data->type);
-    renderdata->glBindTexture(data->type, data->texture);
+    glGetError();
+    glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+    glEnable(data->type);
+    glBindTexture(data->type, data->texture);
 
     if( rect->w * bpp == pitch ) {
          temp_buffer = (void *)pixels; /* No need to reformat */
@@ -420,7 +393,7 @@
          }
     }
 
-    renderdata->glTexSubImage2D(data->type, 0, rect->x, rect->y, rect->w,
+    glTexSubImage2D(data->type, 0, rect->x, rect->y, rect->w,
                                 rect->h, data->format, data->formattype,
                                 temp_buffer);
 
@@ -428,8 +401,8 @@
         SDL_free(temp_buffer);
     }
 
-    renderdata->glDisable(data->type);
-    result = renderdata->glGetError();
+    glDisable(data->type);
+    result = glGetError();
     if (result != GL_NO_ERROR) {
         GLES_SetError("glTexSubImage2D()", result);
         return -1;
@@ -458,13 +431,13 @@
 
     GLES_ActivateRenderer(renderer);
 
-    renderdata->glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-    renderdata->glEnable(data->type);
-    renderdata->glBindTexture(data->type, data->texture);
-    renderdata->glTexSubImage2D(data->type, 0, 0, 0, texture->w,
+    glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+    glEnable(data->type);
+    glBindTexture(data->type, data->texture);
+    glTexSubImage2D(data->type, 0, 0, 0, texture->w,
                                 texture->h, data->format, data->formattype,
                                 data->pixels);
-    renderdata->glDisable(data->type);
+    glDisable(data->type);
 }
 
 static void
@@ -473,23 +446,23 @@
     if (blendMode != data->blendMode) {
         switch (blendMode) {
         case SDL_BLENDMODE_NONE:
-            data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
-            data->glDisable(GL_BLEND);
+            glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
+            glDisable(GL_BLEND);
             break;
         case SDL_BLENDMODE_BLEND:
-            data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-            data->glEnable(GL_BLEND);
-            data->glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+            glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+            glEnable(GL_BLEND);
+            glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
             break;
         case SDL_BLENDMODE_ADD:
-            data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-            data->glEnable(GL_BLEND);
-            data->glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+            glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+            glEnable(GL_BLEND);
+            glBlendFunc(GL_SRC_ALPHA, GL_ONE);
             break;
         case SDL_BLENDMODE_MOD:
-            data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-            data->glEnable(GL_BLEND);
-            data->glBlendFunc(GL_ZERO, GL_SRC_COLOR);
+            glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+            glEnable(GL_BLEND);
+            glBlendFunc(GL_ZERO, GL_SRC_COLOR);
             break;
         }
         data->blendMode = blendMode;
@@ -508,7 +481,7 @@
 
     GLES_SetBlendMode(data, renderer->blendMode);
 
-    data->glColor4f((GLfloat) renderer->r * inv255f,
+    glColor4f((GLfloat) renderer->r * inv255f,
                     (GLfloat) renderer->g * inv255f,
                     (GLfloat) renderer->b * inv255f,
                     (GLfloat) renderer->a * inv255f);
@@ -518,8 +491,8 @@
         vertices[2*i+0] = (GLshort)points[i].x;
         vertices[2*i+1] = (GLshort)points[i].y;
     }
-    data->glVertexPointer(2, GL_SHORT, 0, vertices);
-    data->glDrawArrays(GL_POINTS, 0, count);
+    glVertexPointer(2, GL_SHORT, 0, vertices);
+    glDrawArrays(GL_POINTS, 0, count);
     SDL_stack_free(vertices);
 
     return 0;
@@ -537,7 +510,7 @@
 
     GLES_SetBlendMode(data, renderer->blendMode);
 
-    data->glColor4f((GLfloat) renderer->r * inv255f,
+    glColor4f((GLfloat) renderer->r * inv255f,
                     (GLfloat) renderer->g * inv255f,
                     (GLfloat) renderer->b * inv255f,
                     (GLfloat) renderer->a * inv255f);
@@ -547,14 +520,14 @@
         vertices[2*i+0] = (GLshort)points[i].x;
         vertices[2*i+1] = (GLshort)points[i].y;
     }
-    data->glVertexPointer(2, GL_SHORT, 0, vertices);
+    glVertexPointer(2, GL_SHORT, 0, vertices);
     if (count > 2 && 
         points[0].x == points[count-1].x && points[0].y == points[count-1].y) {
         /* GL_LINE_LOOP takes care of the final segment */
         --count;
-        data->glDrawArrays(GL_LINE_LOOP, 0, count);
+        glDrawArrays(GL_LINE_LOOP, 0, count);
     } else {
-        data->glDrawArrays(GL_LINE_STRIP, 0, count);
+        glDrawArrays(GL_LINE_STRIP, 0, count);
     }
     SDL_stack_free(vertices);
 
@@ -572,7 +545,7 @@
 
     GLES_SetBlendMode(data, renderer->blendMode);
 
-    data->glColor4f((GLfloat) renderer->r * inv255f,
+    glColor4f((GLfloat) renderer->r * inv255f,
                     (GLfloat) renderer->g * inv255f,
                     (GLfloat) renderer->b * inv255f,
                     (GLfloat) renderer->a * inv255f);
@@ -593,8 +566,8 @@
         vertices[6] = maxx;
         vertices[7] = maxy;
 
-        data->glVertexPointer(2, GL_SHORT, 0, vertices);
-        data->glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+        glVertexPointer(2, GL_SHORT, 0, vertices);
+        glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
     }
 
     return 0;
@@ -615,17 +588,17 @@
 
     GLES_ActivateRenderer(renderer);
 
-    data->glEnable(GL_TEXTURE_2D);
+    glEnable(GL_TEXTURE_2D);
 
-    data->glBindTexture(texturedata->type, texturedata->texture);
+    glBindTexture(texturedata->type, texturedata->texture);
 
     if (texture->modMode) {
-        data->glColor4f((GLfloat) texture->r * inv255f,
+        glColor4f((GLfloat) texture->r * inv255f,
                         (GLfloat) texture->g * inv255f,
                         (GLfloat) texture->b * inv255f,
                         (GLfloat) texture->a * inv255f);
     } else {
-        data->glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
+        glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
     }
 
     GLES_SetBlendMode(data, texture->blendMode);
@@ -641,9 +614,9 @@
         cropRect[1] = srcrect->y + srcrect->h;
         cropRect[2] = srcrect->w;
         cropRect[3] = -srcrect->h;
-        data->glTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_CROP_RECT_OES,
+        glTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_CROP_RECT_OES,
                                cropRect);
-        data->glDrawTexiOES(dstrect->x, h - dstrect->y - dstrect->h, 0,
+        glDrawTexiOES(dstrect->x, h - dstrect->y - dstrect->h, 0,
                             dstrect->w, dstrect->h);
     } else {
 
@@ -682,12 +655,12 @@
         texCoords[6] = maxu;
         texCoords[7] = maxv;
 
-        data->glVertexPointer(2, GL_SHORT, 0, vertices);
-        data->glTexCoordPointer(2, GL_FLOAT, 0, texCoords);
-        data->glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+        glVertexPointer(2, GL_SHORT, 0, vertices);
+        glTexCoordPointer(2, GL_FLOAT, 0, texCoords);
+        glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
     }
 
-    data->glDisable(GL_TEXTURE_2D);
+    glDisable(GL_TEXTURE_2D);
 
     return 0;
 }
--- a/src/render/opengles2/SDL_render_gles2.c	Sun Feb 06 00:48:41 2011 -0800
+++ b/src/render/opengles2/SDL_render_gles2.c	Sun Feb 06 02:35:14 2011 -0800
@@ -25,13 +25,7 @@
 
 #if SDL_VIDEO_RENDER_OGL_ES2
 
-#ifdef __IPHONEOS__
-#include <OpenGLES/ES2/gl.h>
-#include <OpenGLES/ES2/glext.h>
-#else
-#include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
-#endif
+#include "SDL_opengles2.h"
 #include "../SDL_sysrender.h"
 #include "SDL_shaders_gles2.h"
 
@@ -1098,6 +1092,8 @@
     renderer->window = window;
     renderer->driverdata = rdata;
 
+    renderer->info.flags = SDL_RENDERER_ACCELERATED;
+
     /* Create the GL context */
     rdata->context = SDL_GL_CreateContext(window);
     if (!rdata->context)
--- a/src/render/opengles2/SDL_shaders_gles2.c	Sun Feb 06 00:48:41 2011 -0800
+++ b/src/render/opengles2/SDL_shaders_gles2.c	Sun Feb 06 02:35:14 2011 -0800
@@ -25,14 +25,8 @@
 
 #if SDL_VIDEO_RENDER_OGL_ES2
 
-#ifdef __IPHONEOS__
-#include <OpenGLES/ES2/gl.h>
-#include <OpenGLES/ES2/glext.h>
-#else
-#include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
-#endif
 #include "SDL_video.h"
+#include "SDL_opengles2.h"
 #include "SDL_shaders_gles2.h"
 #include "SDL_stdinc.h"
 
--- a/src/render/opengles2/SDL_shaders_gles2.h	Sun Feb 06 00:48:41 2011 -0800
+++ b/src/render/opengles2/SDL_shaders_gles2.h	Sun Feb 06 02:35:14 2011 -0800
@@ -28,12 +28,6 @@
 #ifndef SDL_shaderdata_h_
 #define SDL_shaderdata_h_
 
-#ifdef __IPHONEOS__
-#include <OpenGLES/ES2/gl.h>
-#else
-#include <GLES2/gl2.h>
-#endif
-
 typedef struct GLES2_ShaderInstance
 {
     GLenum type;
--- a/src/video/SDL_glesfuncs.h	Sun Feb 06 00:48:41 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,229 +0,0 @@
-/* list of OpenGL ES functions sorted alphabetically
-   If you need to use a GLES function from the SDL video subsystem,
-   change it's entry from SDL_PROC_UNUSED to SDL_PROC and rebuild.
-*/
-#define SDL_PROC_UNUSED(ret,func,params)
-
-SDL_PROC_UNUSED(void, glAlphaFunc, (GLenum func, GLclampf ref))
-SDL_PROC(void, glClearColor,
-         (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha))
-SDL_PROC_UNUSED(void, glClearDepthf, (GLclampf depth))
-SDL_PROC_UNUSED(void, glClipPlanef, (GLenum plane, const GLfloat * equation))
-SDL_PROC(void, glColor4f,
-         (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha))
-SDL_PROC_UNUSED(void, glDepthRangef, (GLclampf zNear, GLclampf zFar))
-SDL_PROC_UNUSED(void, glFogf, (GLenum pname, GLfloat param))
-SDL_PROC_UNUSED(void, glFogfv, (GLenum pname, const GLfloat * params))
-SDL_PROC_UNUSED(void, glFrustumf,
-                (GLfloat left, GLfloat right, GLfloat bottom, GLfloat top,
-                 GLfloat zNear, GLfloat zFar))
-SDL_PROC_UNUSED(void, glGetClipPlanef, (GLenum pname, GLfloat eqn[4]))
-SDL_PROC(void, glGetFloatv, (GLenum pname, GLfloat * params))
-SDL_PROC_UNUSED(void, glGetLightfv,
-                (GLenum light, GLenum pname, GLfloat * params))
-SDL_PROC_UNUSED(void, glGetMaterialfv,
-                (GLenum face, GLenum pname, GLfloat * params))
-SDL_PROC_UNUSED(void, glGetTexEnvfv,
-                (GLenum env, GLenum pname, GLfloat * params))
-SDL_PROC_UNUSED(void, glGetTexParameterfv,
-                (GLenum target, GLenum pname, GLfloat * params))
-SDL_PROC_UNUSED(void, glLightModelf, (GLenum pname, GLfloat param))
-SDL_PROC_UNUSED(void, glLightModelfv, (GLenum pname, const GLfloat * params))
-SDL_PROC_UNUSED(void, glLightf, (GLenum light, GLenum pname, GLfloat param))
-SDL_PROC_UNUSED(void, glLightfv,
-                (GLenum light, GLenum pname, const GLfloat * params))
-SDL_PROC_UNUSED(void, glLineWidth, (GLfloat width))
-SDL_PROC_UNUSED(void, glLoadMatrixf, (const GLfloat * m))
-SDL_PROC_UNUSED(void, glMaterialf, (GLenum face, GLenum pname, GLfloat param))
-SDL_PROC_UNUSED(void, glMaterialfv,
-                (GLenum face, GLenum pname, const GLfloat * params))
-SDL_PROC_UNUSED(void, glMultMatrixf, (const GLfloat * m))
-SDL_PROC_UNUSED(void, glMultiTexCoord4f,
-                (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q))
-SDL_PROC_UNUSED(void, glNormal3f, (GLfloat nx, GLfloat ny, GLfloat nz))
-SDL_PROC(void, glOrthof,
-         (GLfloat left, GLfloat right, GLfloat bottom, GLfloat top,
-          GLfloat zNear, GLfloat zFar))
-SDL_PROC_UNUSED(void, glPointParameterf, (GLenum pname, GLfloat param))
-SDL_PROC_UNUSED(void, glPointParameterfv,
-                (GLenum pname, const GLfloat * params))
-SDL_PROC_UNUSED(void, glPointSize, (GLfloat size))
-SDL_PROC_UNUSED(void, glPolygonOffset, (GLfloat factor, GLfloat units))
-SDL_PROC_UNUSED(void, glRotatef,
-                (GLfloat angle, GLfloat x, GLfloat y, GLfloat z))
-SDL_PROC_UNUSED(void, glScalef, (GLfloat x, GLfloat y, GLfloat z))
-SDL_PROC(void, glTexEnvf, (GLenum target, GLenum pname, GLfloat param))
-SDL_PROC_UNUSED(void, glTexEnvfv,
-                (GLenum target, GLenum pname, const GLfloat * params))
-SDL_PROC(void, glTexParameterf, (GLenum target, GLenum pname, GLfloat param))
-SDL_PROC_UNUSED(void, glTexParameterfv,
-                (GLenum target, GLenum pname, const GLfloat * params))
-SDL_PROC_UNUSED(void, glTranslatef, (GLfloat x, GLfloat y, GLfloat z))
-
-/* Available in both Common and Common-Lite profiles */
-SDL_PROC_UNUSED(void, glActiveTexture, (GLenum texture))
-SDL_PROC_UNUSED(void, glAlphaFuncx, (GLenum func, GLclampx ref))
-SDL_PROC_UNUSED(void, glBindBuffer, (GLenum target, GLuint buffer))
-SDL_PROC(void, glBindTexture, (GLenum target, GLuint texture))
-SDL_PROC(void, glBlendFunc, (GLenum sfactor, GLenum dfactor))
-SDL_PROC_UNUSED(void, glBufferData,
-                (GLenum target, GLsizeiptr size, const GLvoid * data,
-                 GLenum usage))
-SDL_PROC_UNUSED(void, glBufferSubData,
-                (GLenum target, GLintptr offset, GLsizeiptr size,
-                 const GLvoid * data))
-SDL_PROC(void, glClear, (GLbitfield mask))
-SDL_PROC_UNUSED(void, glClearColorx,
-                (GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha))
-SDL_PROC_UNUSED(void, glClearDepthx, (GLclampx depth))
-SDL_PROC_UNUSED(void, glClearStencil, (GLint s))
-SDL_PROC_UNUSED(void, glClientActiveTexture, (GLenum texture))
-SDL_PROC_UNUSED(void, glClipPlanex, (GLenum plane, const GLfixed * equation))
-SDL_PROC_UNUSED(void, glColor4ub,
-                (GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha))
-SDL_PROC_UNUSED(void, glColor4x,
-                (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha))
-SDL_PROC_UNUSED(void, glColorMask,
-                (GLboolean red, GLboolean green, GLboolean blue,
-                 GLboolean alpha))
-SDL_PROC(void, glColorPointer,
-         (GLint size, GLenum type, GLsizei stride, const GLvoid * pointer))
-SDL_PROC_UNUSED(void, glCompressedTexImage2D,
-                (GLenum target, GLint level, GLenum internalformat,
-                 GLsizei width, GLsizei height, GLint border,
-                 GLsizei imageSize, const GLvoid * data))
-SDL_PROC_UNUSED(void, glCompressedTexSubImage2D,
-                (GLenum target, GLint level, GLint xoffset, GLint yoffset,
-                 GLsizei width, GLsizei height, GLenum format,
-                 GLsizei imageSize, const GLvoid * data))
-SDL_PROC_UNUSED(void, glCopyTexImage2D,
-                (GLenum target, GLint level, GLenum internalformat, GLint x,
-                 GLint y, GLsizei width, GLsizei height, GLint border))
-SDL_PROC_UNUSED(void, glCopyTexSubImage2D,
-                (GLenum target, GLint level, GLint xoffset, GLint yoffset,
-                 GLint x, GLint y, GLsizei width, GLsizei height))
-SDL_PROC_UNUSED(void, glCullFace, (GLenum mode))
-SDL_PROC_UNUSED(void, glDeleteBuffers, (GLsizei n, const GLuint * buffers))
-SDL_PROC_UNUSED(void, glDeleteTextures, (GLsizei n, const GLuint * textures))
-SDL_PROC_UNUSED(void, glDepthFunc, (GLenum func))
-SDL_PROC_UNUSED(void, glDepthMask, (GLboolean flag))
-SDL_PROC_UNUSED(void, glDepthRangex, (GLclampx zNear, GLclampx zFar))
-SDL_PROC(void, glDisable, (GLenum cap))
-SDL_PROC(void, glDisableClientState, (GLenum array))
-SDL_PROC(void, glDrawArrays, (GLenum mode, GLint first, GLsizei count))
-SDL_PROC_UNUSED(void, glDrawElements,
-                (GLenum mode, GLsizei count, GLenum type,
-                 const GLvoid * indices))
-SDL_PROC(void, glEnable, (GLenum cap))
-SDL_PROC(void, glEnableClientState, (GLenum array))
-SDL_PROC_UNUSED(void, glFinish, (void))
-SDL_PROC_UNUSED(void, glFlush, (void))
-SDL_PROC_UNUSED(void, glFogx, (GLenum pname, GLfixed param))
-SDL_PROC_UNUSED(void, glFogxv, (GLenum pname, const GLfixed * params))
-SDL_PROC_UNUSED(void, glFrontFace, (GLenum mode))
-SDL_PROC_UNUSED(void, glFrustumx,
-                (GLfixed left, GLfixed right, GLfixed bottom, GLfixed top,
-                 GLfixed zNear, GLfixed zFar))
-SDL_PROC_UNUSED(void, glGetBooleanv, (GLenum pname, GLboolean * params))
-SDL_PROC_UNUSED(void, glGetBufferParameteriv,
-                (GLenum target, GLenum pname, GLint * params))
-SDL_PROC_UNUSED(void, glGetClipPlanex, (GLenum pname, GLfixed eqn[4]))
-SDL_PROC_UNUSED(void, glGenBuffers, (GLsizei n, GLuint * buffers))
-SDL_PROC(void, glGenTextures, (GLsizei n, GLuint * textures))
-SDL_PROC(GLenum, glGetError, (void))
-SDL_PROC_UNUSED(void, glGetFixedv, (GLenum pname, GLfixed * params))
-SDL_PROC(void, glGetIntegerv, (GLenum pname, GLint * params))
-SDL_PROC_UNUSED(void, glGetLightxv,
-                (GLenum light, GLenum pname, GLfixed * params))
-SDL_PROC_UNUSED(void, glGetMaterialxv,
-                (GLenum face, GLenum pname, GLfixed * params))
-SDL_PROC_UNUSED(void, glGetPointerv, (GLenum pname, void **params))
-SDL_PROC_UNUSED(const GLubyte *, glGetString, (GLenum name))
-SDL_PROC_UNUSED(void, glGetTexEnviv,
-                (GLenum env, GLenum pname, GLint * params))
-SDL_PROC_UNUSED(void, glGetTexEnvxv,
-                (GLenum env, GLenum pname, GLfixed * params))
-SDL_PROC_UNUSED(void, glGetTexParameteriv,
-                (GLenum target, GLenum pname, GLint * params))
-SDL_PROC_UNUSED(void, glGetTexParameterxv,
-                (GLenum target, GLenum pname, GLfixed * params))
-SDL_PROC_UNUSED(void, glHint, (GLenum target, GLenum mode))
-SDL_PROC_UNUSED(GLboolean, glIsBuffer, (GLuint buffer))
-SDL_PROC_UNUSED(GLboolean, glIsEnabled, (GLenum cap))
-SDL_PROC_UNUSED(GLboolean, glIsTexture, (GLuint texture))
-SDL_PROC_UNUSED(void, glLightModelx, (GLenum pname, GLfixed param))
-SDL_PROC_UNUSED(void, glLightModelxv, (GLenum pname, const GLfixed * params))
-SDL_PROC_UNUSED(void, glLightx, (GLenum light, GLenum pname, GLfixed param))
-SDL_PROC_UNUSED(void, glLightxv,
-                (GLenum light, GLenum pname, const GLfixed * params))
-SDL_PROC_UNUSED(void, glLineWidthx, (GLfixed width))
-SDL_PROC(void, glLoadIdentity, (void))
-SDL_PROC_UNUSED(void, glLoadMatrixx, (const GLfixed * m))
-SDL_PROC_UNUSED(void, glLogicOp, (GLenum opcode))
-SDL_PROC_UNUSED(void, glMaterialx, (GLenum face, GLenum pname, GLfixed param))
-SDL_PROC_UNUSED(void, glMaterialxv,
-                (GLenum face, GLenum pname, const GLfixed * params))
-SDL_PROC(void, glMatrixMode, (GLenum mode))
-SDL_PROC_UNUSED(void, glMultMatrixx, (const GLfixed * m))
-SDL_PROC_UNUSED(void, glMultiTexCoord4x,
-                (GLenum target, GLfixed s, GLfixed t, GLfixed r, GLfixed q))
-SDL_PROC_UNUSED(void, glNormal3x, (GLfixed nx, GLfixed ny, GLfixed nz))
-SDL_PROC_UNUSED(void, glNormalPointer,
-                (GLenum type, GLsizei stride, const GLvoid * pointer))
-SDL_PROC_UNUSED(void, glOrthox,
-                (GLfixed left, GLfixed right, GLfixed bottom, GLfixed top,
-                 GLfixed zNear, GLfixed zFar))
-SDL_PROC(void, glPixelStorei, (GLenum pname, GLint param))
-SDL_PROC_UNUSED(void, glPointParameterx, (GLenum pname, GLfixed param))
-SDL_PROC_UNUSED(void, glPointParameterxv,
-                (GLenum pname, const GLfixed * params))
-SDL_PROC_UNUSED(void, glPointSizex, (GLfixed size))
-SDL_PROC_UNUSED(void, glPolygonOffsetx, (GLfixed factor, GLfixed units))
-SDL_PROC_UNUSED(void, glPopMatrix, (void))
-SDL_PROC_UNUSED(void, glPushMatrix, (void))
-SDL_PROC_UNUSED(void, glReadPixels,
-                (GLint x, GLint y, GLsizei width, GLsizei height,
-                 GLenum format, GLenum type, GLvoid * pixels))
-SDL_PROC_UNUSED(void, glRotatex,
-                (GLfixed angle, GLfixed x, GLfixed y, GLfixed z))
-SDL_PROC_UNUSED(void, glSampleCoverage, (GLclampf value, GLboolean invert))
-SDL_PROC_UNUSED(void, glSampleCoveragex, (GLclampx value, GLboolean invert))
-SDL_PROC_UNUSED(void, glScalex, (GLfixed x, GLfixed y, GLfixed z))
-SDL_PROC(void, glScissor, (GLint x, GLint y, GLsizei width, GLsizei height))
-SDL_PROC_UNUSED(void, glShadeModel, (GLenum mode))
-SDL_PROC_UNUSED(void, glStencilFunc, (GLenum func, GLint ref, GLuint mask))
-SDL_PROC_UNUSED(void, glStencilMask, (GLuint mask))
-SDL_PROC_UNUSED(void, glStencilOp, (GLenum fail, GLenum zfail, GLenum zpass))
-SDL_PROC(void, glTexCoordPointer,
-         (GLint size, GLenum type, GLsizei stride, const GLvoid * pointer))
-SDL_PROC_UNUSED(void, glTexEnvi, (GLenum target, GLenum pname, GLint param))
-SDL_PROC_UNUSED(void, glTexEnvx, (GLenum target, GLenum pname, GLfixed param))
-SDL_PROC_UNUSED(void, glTexEnviv,
-                (GLenum target, GLenum pname, const GLint * params))
-SDL_PROC_UNUSED(void, glTexEnvxv,
-                (GLenum target, GLenum pname, const GLfixed * params))
-SDL_PROC(void, glTexImage2D,
-         (GLenum target, GLint level, GLint internalformat, GLsizei width,
-          GLsizei height, GLint border, GLenum format, GLenum type,
-          const GLvoid * pixels))
-SDL_PROC(void, glTexParameteri, (GLenum target, GLenum pname, GLint param))
-SDL_PROC_UNUSED(void, glTexParameterx,
-                (GLenum target, GLenum pname, GLfixed param))
-SDL_PROC(void, glTexParameteriv,
-         (GLenum target, GLenum pname, const GLint * params))
-SDL_PROC_UNUSED(void, glTexParameterxv,
-                (GLenum target, GLenum pname, const GLfixed * params))
-SDL_PROC(void, glTexSubImage2D,
-         (GLenum target, GLint level, GLint xoffset, GLint yoffset,
-          GLsizei width, GLsizei height, GLenum format, GLenum type,
-          const GLvoid * pixels))
-SDL_PROC_UNUSED(void, glTranslatex, (GLfixed x, GLfixed y, GLfixed z))
-SDL_PROC(void, glVertexPointer,
-         (GLint size, GLenum type, GLsizei stride, const GLvoid * pointer))
-SDL_PROC(void, glViewport, (GLint x, GLint y, GLsizei width, GLsizei height))
-
-/* extension functions used */
-SDL_PROC(void, glDrawTexiOES,
-         (GLint x, GLint y, GLint z, GLint width, GLint height))
-
-/* vi: set ts=4 sw=4 expandtab: */
--- a/src/video/SDL_glfuncs.h	Sun Feb 06 00:48:41 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,455 +0,0 @@
-/* list of OpenGL functions sorted alphabetically
-   If you need to use a GL function from the SDL video subsystem,
-   change it's entry from SDL_PROC_UNUSED to SDL_PROC and rebuild.
-*/
-#define SDL_PROC_UNUSED(ret,func,params)
-SDL_PROC_UNUSED(void, glAccum, (GLenum, GLfloat))
-SDL_PROC_UNUSED(void, glAlphaFunc, (GLenum, GLclampf))
-SDL_PROC_UNUSED(GLboolean, glAreTexturesResident,
-                (GLsizei, const GLuint *, GLboolean *))
-SDL_PROC_UNUSED(void, glArrayElement, (GLint))
-SDL_PROC(void, glBegin, (GLenum))
-SDL_PROC(void, glBindTexture, (GLenum, GLuint))
-SDL_PROC_UNUSED(void, glBitmap,
-                (GLsizei, GLsizei, GLfloat, GLfloat, GLfloat, GLfloat,
-                 const GLubyte *))
-SDL_PROC(void, glBlendFunc, (GLenum, GLenum))
-SDL_PROC_UNUSED(void, glCallList, (GLuint))
-SDL_PROC_UNUSED(void, glCallLists, (GLsizei, GLenum, const GLvoid *))
-SDL_PROC(void, glClear, (GLbitfield))
-SDL_PROC_UNUSED(void, glClearAccum, (GLfloat, GLfloat, GLfloat, GLfloat))
-SDL_PROC(void, glClearColor, (GLclampf, GLclampf, GLclampf, GLclampf))
-SDL_PROC_UNUSED(void, glClearDepth, (GLclampd))
-SDL_PROC_UNUSED(void, glClearIndex, (GLfloat))
-SDL_PROC_UNUSED(void, glClearStencil, (GLint))
-SDL_PROC_UNUSED(void, glClipPlane, (GLenum, const GLdouble *))
-SDL_PROC_UNUSED(void, glColor3b, (GLbyte, GLbyte, GLbyte))
-SDL_PROC_UNUSED(void, glColor3bv, (const GLbyte *))
-SDL_PROC_UNUSED(void, glColor3d, (GLdouble, GLdouble, GLdouble))
-SDL_PROC_UNUSED(void, glColor3dv, (const GLdouble *))
-SDL_PROC_UNUSED(void, glColor3f, (GLfloat, GLfloat, GLfloat))
-SDL_PROC_UNUSED(void, glColor3fv, (const GLfloat *))
-SDL_PROC_UNUSED(void, glColor3i, (GLint, GLint, GLint))
-SDL_PROC_UNUSED(void, glColor3iv, (const GLint *))
-SDL_PROC_UNUSED(void, glColor3s, (GLshort, GLshort, GLshort))
-SDL_PROC_UNUSED(void, glColor3sv, (const GLshort *))
-SDL_PROC_UNUSED(void, glColor3ub, (GLubyte, GLubyte, GLubyte))
-SDL_PROC_UNUSED(void, glColor3ubv, (const GLubyte *))
-SDL_PROC_UNUSED(void, glColor3ui, (GLuint, GLuint, GLuint))
-SDL_PROC_UNUSED(void, glColor3uiv, (const GLuint *))
-SDL_PROC_UNUSED(void, glColor3us, (GLushort, GLushort, GLushort))
-SDL_PROC_UNUSED(void, glColor3usv, (const GLushort *))
-SDL_PROC_UNUSED(void, glColor4b, (GLbyte, GLbyte, GLbyte, GLbyte))
-SDL_PROC_UNUSED(void, glColor4bv, (const GLbyte *))
-SDL_PROC_UNUSED(void, glColor4d, (GLdouble, GLdouble, GLdouble, GLdouble))
-SDL_PROC_UNUSED(void, glColor4dv, (const GLdouble *))
-SDL_PROC(void, glColor4f, (GLfloat, GLfloat, GLfloat, GLfloat))
-SDL_PROC_UNUSED(void, glColor4fv, (const GLfloat *))
-SDL_PROC_UNUSED(void, glColor4i, (GLint, GLint, GLint, GLint))
-SDL_PROC_UNUSED(void, glColor4iv, (const GLint *))
-SDL_PROC_UNUSED(void, glColor4s, (GLshort, GLshort, GLshort, GLshort))
-SDL_PROC_UNUSED(void, glColor4sv, (const GLshort *))
-SDL_PROC_UNUSED(void, glColor4ub,
-                (GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha))
-SDL_PROC_UNUSED(void, glColor4ubv, (const GLubyte * v))
-SDL_PROC_UNUSED(void, glColor4ui,
-                (GLuint red, GLuint green, GLuint blue, GLuint alpha))
-SDL_PROC_UNUSED(void, glColor4uiv, (const GLuint * v))
-SDL_PROC_UNUSED(void, glColor4us,
-                (GLushort red, GLushort green, GLushort blue, GLushort alpha))
-SDL_PROC_UNUSED(void, glColor4usv, (const GLushort * v))
-SDL_PROC_UNUSED(void, glColorMask,
-                (GLboolean red, GLboolean green, GLboolean blue,
-                 GLboolean alpha))
-SDL_PROC_UNUSED(void, glColorMaterial, (GLenum face, GLenum mode))
-SDL_PROC_UNUSED(void, glColorPointer,
-                (GLint size, GLenum type, GLsizei stride,
-                 const GLvoid * pointer))
-SDL_PROC_UNUSED(void, glCopyPixels,
-                (GLint x, GLint y, GLsizei width, GLsizei height,
-                 GLenum type))
-SDL_PROC_UNUSED(void, glCopyTexImage1D,
-                (GLenum target, GLint level, GLenum internalFormat, GLint x,
-                 GLint y, GLsizei width, GLint border))
-SDL_PROC_UNUSED(void, glCopyTexImage2D,
-                (GLenum target, GLint level, GLenum internalFormat, GLint x,
-                 GLint y, GLsizei width, GLsizei height, GLint border))
-SDL_PROC_UNUSED(void, glCopyTexSubImage1D,
-                (GLenum target, GLint level, GLint xoffset, GLint x, GLint y,
-                 GLsizei width))
-SDL_PROC_UNUSED(void, glCopyTexSubImage2D,
-                (GLenum target, GLint level, GLint xoffset, GLint yoffset,
-                 GLint x, GLint y, GLsizei width, GLsizei height))
-SDL_PROC_UNUSED(void, glCullFace, (GLenum mode))
-SDL_PROC_UNUSED(void, glDeleteLists, (GLuint list, GLsizei range))
-SDL_PROC(void, glDeleteTextures, (GLsizei n, const GLuint * textures))
-SDL_PROC_UNUSED(void, glDepthFunc, (GLenum func))
-SDL_PROC_UNUSED(void, glDepthMask, (GLboolean flag))
-SDL_PROC_UNUSED(void, glDepthRange, (GLclampd zNear, GLclampd zFar))
-SDL_PROC(void, glDisable, (GLenum cap))
-SDL_PROC_UNUSED(void, glDisableClientState, (GLenum array))
-SDL_PROC_UNUSED(void, glDrawArrays, (GLenum mode, GLint first, GLsizei count))
-SDL_PROC_UNUSED(void, glDrawBuffer, (GLenum mode))
-SDL_PROC_UNUSED(void, glDrawElements,
-                (GLenum mode, GLsizei count, GLenum type,
-                 const GLvoid * indices))
-SDL_PROC(void, glDrawPixels,
-         (GLsizei width, GLsizei height, GLenum format, GLenum type,
-          const GLvoid * pixels))
-SDL_PROC_UNUSED(void, glEdgeFlag, (GLboolean flag))
-SDL_PROC_UNUSED(void, glEdgeFlagPointer,
-                (GLsizei stride, const GLvoid * pointer))
-SDL_PROC_UNUSED(void, glEdgeFlagv, (const GLboolean * flag))
-SDL_PROC(void, glEnable, (GLenum cap))
-SDL_PROC_UNUSED(void, glEnableClientState, (GLenum array))
-SDL_PROC(void, glEnd, (void))
-SDL_PROC_UNUSED(void, glEndList, (void))
-SDL_PROC_UNUSED(void, glEvalCoord1d, (GLdouble u))
-SDL_PROC_UNUSED(void, glEvalCoord1dv, (const GLdouble * u))
-SDL_PROC_UNUSED(void, glEvalCoord1f, (GLfloat u))
-SDL_PROC_UNUSED(void, glEvalCoord1fv, (const GLfloat * u))
-SDL_PROC_UNUSED(void, glEvalCoord2d, (GLdouble u, GLdouble v))
-SDL_PROC_UNUSED(void, glEvalCoord2dv, (const GLdouble * u))
-SDL_PROC_UNUSED(void, glEvalCoord2f, (GLfloat u, GLfloat v))
-SDL_PROC_UNUSED(void, glEvalCoord2fv, (const GLfloat * u))
-SDL_PROC_UNUSED(void, glEvalMesh1, (GLenum mode, GLint i1, GLint i2))
-SDL_PROC_UNUSED(void, glEvalMesh2,
-                (GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2))
-SDL_PROC_UNUSED(void, glEvalPoint1, (GLint i))
-SDL_PROC_UNUSED(void, glEvalPoint2, (GLint i, GLint j))
-SDL_PROC_UNUSED(void, glFeedbackBuffer,
-                (GLsizei size, GLenum type, GLfloat * buffer))
-SDL_PROC_UNUSED(void, glFinish, (void))
-SDL_PROC_UNUSED(void, glFlush, (void))
-SDL_PROC_UNUSED(void, glFogf, (GLenum pname, GLfloat param))
-SDL_PROC_UNUSED(void, glFogfv, (GLenum pname, const GLfloat * params))
-SDL_PROC_UNUSED(void, glFogi, (GLenum pname, GLint param))
-SDL_PROC_UNUSED(void, glFogiv, (GLenum pname, const GLint * params))
-SDL_PROC_UNUSED(void, glFrontFace, (GLenum mode))
-SDL_PROC_UNUSED(void, glFrustum,
-                (GLdouble left, GLdouble right, GLdouble bottom,
-                 GLdouble top, GLdouble zNear, GLdouble zFar))
-SDL_PROC_UNUSED(GLuint, glGenLists, (GLsizei range))
-SDL_PROC(void, glGenTextures, (GLsizei n, GLuint * textures))
-SDL_PROC_UNUSED(void, glGetBooleanv, (GLenum pname, GLboolean * params))
-SDL_PROC_UNUSED(void, glGetClipPlane, (GLenum plane, GLdouble * equation))
-SDL_PROC_UNUSED(void, glGetDoublev, (GLenum pname, GLdouble * params))
-SDL_PROC(GLenum, glGetError, (void))
-SDL_PROC_UNUSED(void, glGetFloatv, (GLenum pname, GLfloat * params))
-SDL_PROC(void, glGetIntegerv, (GLenum pname, GLint * params))
-SDL_PROC_UNUSED(void, glGetLightfv,
-                (GLenum light, GLenum pname, GLfloat * params))
-SDL_PROC_UNUSED(void, glGetLightiv,
-                (GLenum light, GLenum pname, GLint * params))
-SDL_PROC_UNUSED(void, glGetMapdv, (GLenum target, GLenum query, GLdouble * v))
-SDL_PROC_UNUSED(void, glGetMapfv, (GLenum target, GLenum query, GLfloat * v))
-SDL_PROC_UNUSED(void, glGetMapiv, (GLenum target, GLenum query, GLint * v))
-SDL_PROC_UNUSED(void, glGetMaterialfv,
-                (GLenum face, GLenum pname, GLfloat * params))
-SDL_PROC_UNUSED(void, glGetMaterialiv,
-                (GLenum face, GLenum pname, GLint * params))
-SDL_PROC_UNUSED(void, glGetPixelMapfv, (GLenum map, GLfloat * values))
-SDL_PROC_UNUSED(void, glGetPixelMapuiv, (GLenum map, GLuint * values))
-SDL_PROC_UNUSED(void, glGetPixelMapusv, (GLenum map, GLushort * values))
-SDL_PROC_UNUSED(void, glGetPointerv, (GLenum pname, GLvoid * *params))
-SDL_PROC_UNUSED(void, glGetPolygonStipple, (GLubyte * mask))
-SDL_PROC(const GLubyte *, glGetString, (GLenum name))
-SDL_PROC_UNUSED(void, glGetTexEnvfv,
-                (GLenum target, GLenum pname, GLfloat * params))
-SDL_PROC_UNUSED(void, glGetTexEnviv,
-                (GLenum target, GLenum pname, GLint * params))
-SDL_PROC_UNUSED(void, glGetTexGendv,
-                (GLenum coord, GLenum pname, GLdouble * params))
-SDL_PROC_UNUSED(void, glGetTexGenfv,
-                (GLenum coord, GLenum pname, GLfloat * params))
-SDL_PROC_UNUSED(void, glGetTexGeniv,
-                (GLenum coord, GLenum pname, GLint * params))
-SDL_PROC_UNUSED(void, glGetTexImage,
-                (GLenum target, GLint level, GLenum format, GLenum type,
-                 GLvoid * pixels))
-SDL_PROC_UNUSED(void, glGetTexLevelParameterfv,
-                (GLenum target, GLint level, GLenum pname, GLfloat * params))
-SDL_PROC_UNUSED(void, glGetTexLevelParameteriv,
-                (GLenum target, GLint level, GLenum pname, GLint * params))
-SDL_PROC_UNUSED(void, glGetTexParameterfv,
-                (GLenum target, GLenum pname, GLfloat * params))
-SDL_PROC_UNUSED(void, glGetTexParameteriv,
-                (GLenum target, GLenum pname, GLint * params))
-SDL_PROC_UNUSED(void, glHint, (GLenum target, GLenum mode))
-SDL_PROC_UNUSED(void, glIndexMask, (GLuint mask))
-SDL_PROC_UNUSED(void, glIndexPointer,
-                (GLenum type, GLsizei stride, const GLvoid * pointer))
-SDL_PROC_UNUSED(void, glIndexd, (GLdouble c))
-SDL_PROC_UNUSED(void, glIndexdv, (const GLdouble * c))
-SDL_PROC_UNUSED(void, glIndexf, (GLfloat c))
-SDL_PROC_UNUSED(void, glIndexfv, (const GLfloat * c))
-SDL_PROC_UNUSED(void, glIndexi, (GLint c))
-SDL_PROC_UNUSED(void, glIndexiv, (const GLint * c))
-SDL_PROC_UNUSED(void, glIndexs, (GLshort c))
-SDL_PROC_UNUSED(void, glIndexsv, (const GLshort * c))
-SDL_PROC_UNUSED(void, glIndexub, (GLubyte c))
-SDL_PROC_UNUSED(void, glIndexubv, (const GLubyte * c))
-SDL_PROC_UNUSED(void, glInitNames, (void))
-SDL_PROC_UNUSED(void, glInterleavedArrays,
-                (GLenum format, GLsizei stride, const GLvoid * pointer))
-SDL_PROC_UNUSED(GLboolean, glIsEnabled, (GLenum cap))
-SDL_PROC_UNUSED(GLboolean, glIsList, (GLuint list))
-SDL_PROC_UNUSED(GLboolean, glIsTexture, (GLuint texture))
-SDL_PROC_UNUSED(void, glLightModelf, (GLenum pname, GLfloat param))
-SDL_PROC_UNUSED(void, glLightModelfv, (GLenum pname, const GLfloat * params))
-SDL_PROC_UNUSED(void, glLightModeli, (GLenum pname, GLint param))
-SDL_PROC_UNUSED(void, glLightModeliv, (GLenum pname, const GLint * params))
-SDL_PROC_UNUSED(void, glLightf, (GLenum light, GLenum pname, GLfloat param))
-SDL_PROC_UNUSED(void, glLightfv,
-                (GLenum light, GLenum pname, const GLfloat * params))
-SDL_PROC_UNUSED(void, glLighti, (GLenum light, GLenum pname, GLint param))
-SDL_PROC_UNUSED(void, glLightiv,
-                (GLenum light, GLenum pname, const GLint * params))
-SDL_PROC_UNUSED(void, glLineStipple, (GLint factor, GLushort pattern))
-SDL_PROC(void, glLineWidth, (GLfloat width))
-SDL_PROC_UNUSED(void, glListBase, (GLuint base))
-SDL_PROC(void, glLoadIdentity, (void))
-SDL_PROC_UNUSED(void, glLoadMatrixd, (const GLdouble * m))
-SDL_PROC_UNUSED(void, glLoadMatrixf, (const GLfloat * m))
-SDL_PROC_UNUSED(void, glLoadName, (GLuint name))
-SDL_PROC_UNUSED(void, glLogicOp, (GLenum opcode))
-SDL_PROC_UNUSED(void, glMap1d,
-                (GLenum target, GLdouble u1, GLdouble u2, GLint stride,
-                 GLint order, const GLdouble * points))
-SDL_PROC_UNUSED(void, glMap1f,
-                (GLenum target, GLfloat u1, GLfloat u2, GLint stride,
-                 GLint order, const GLfloat * points))
-SDL_PROC_UNUSED(void, glMap2d,
-                (GLenum target, GLdouble u1, GLdouble u2, GLint ustride,
-                 GLint uorder, GLdouble v1, GLdouble v2, GLint vstride,
-                 GLint vorder, const GLdouble * points))
-SDL_PROC_UNUSED(void, glMap2f,
-                (GLenum target, GLfloat u1, GLfloat u2, GLint ustride,
-                 GLint uorder, GLfloat v1, GLfloat v2, GLint vstride,
-                 GLint vorder, const GLfloat * points))
-SDL_PROC_UNUSED(void, glMapGrid1d, (GLint un, GLdouble u1, GLdouble u2))
-SDL_PROC_UNUSED(void, glMapGrid1f, (GLint un, GLfloat u1, GLfloat u2))
-SDL_PROC_UNUSED(void, glMapGrid2d,
-                (GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1,
-                 GLdouble v2))
-SDL_PROC_UNUSED(void, glMapGrid2f,
-                (GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1,
-                 GLfloat v2))
-SDL_PROC_UNUSED(void, glMaterialf, (GLenum face, GLenum pname, GLfloat param))
-SDL_PROC_UNUSED(void, glMaterialfv,
-                (GLenum face, GLenum pname, const GLfloat * params))
-SDL_PROC_UNUSED(void, glMateriali, (GLenum face, GLenum pname, GLint param))
-SDL_PROC_UNUSED(void, glMaterialiv,
-                (GLenum face, GLenum pname, const GLint * params))
-SDL_PROC(void, glMatrixMode, (GLenum mode))
-SDL_PROC_UNUSED(void, glMultMatrixd, (const GLdouble * m))
-SDL_PROC_UNUSED(void, glMultMatrixf, (const GLfloat * m))
-SDL_PROC_UNUSED(void, glNewList, (GLuint list, GLenum mode))
-SDL_PROC_UNUSED(void, glNormal3b, (GLbyte nx, GLbyte ny, GLbyte nz))
-SDL_PROC_UNUSED(void, glNormal3bv, (const GLbyte * v))
-SDL_PROC_UNUSED(void, glNormal3d, (GLdouble nx, GLdouble ny, GLdouble nz))
-SDL_PROC_UNUSED(void, glNormal3dv, (const GLdouble * v))
-SDL_PROC_UNUSED(void, glNormal3f, (GLfloat nx, GLfloat ny, GLfloat nz))
-SDL_PROC_UNUSED(void, glNormal3fv, (const GLfloat * v))
-SDL_PROC_UNUSED(void, glNormal3i, (GLint nx, GLint ny, GLint nz))
-SDL_PROC_UNUSED(void, glNormal3iv, (const GLint * v))
-SDL_PROC_UNUSED(void, glNormal3s, (GLshort nx, GLshort ny, GLshort nz))
-SDL_PROC_UNUSED(void, glNormal3sv, (const GLshort * v))
-SDL_PROC_UNUSED(void, glNormalPointer,
-                (GLenum type, GLsizei stride, const GLvoid * pointer))
-SDL_PROC(void, glOrtho,
-         (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top,
-          GLdouble zNear, GLdouble zFar))
-SDL_PROC_UNUSED(void, glPassThrough, (GLfloat token))
-SDL_PROC_UNUSED(void, glPixelMapfv,
-                (GLenum map, GLsizei mapsize, const GLfloat * values))
-SDL_PROC_UNUSED(void, glPixelMapuiv,
-                (GLenum map, GLsizei mapsize, const GLuint * values))
-SDL_PROC_UNUSED(void, glPixelMapusv,
-                (GLenum map, GLsizei mapsize, const GLushort * values))
-SDL_PROC_UNUSED(void, glPixelStoref, (GLenum pname, GLfloat param))
-SDL_PROC(void, glPixelStorei, (GLenum pname, GLint param))
-SDL_PROC_UNUSED(void, glPixelTransferf, (GLenum pname, GLfloat param))
-SDL_PROC_UNUSED(void, glPixelTransferi, (GLenum pname, GLint param))
-SDL_PROC_UNUSED(void, glPixelZoom, (GLfloat xfactor, GLfloat yfactor))
-SDL_PROC(void, glPointSize, (GLfloat size))
-SDL_PROC_UNUSED(void, glPolygonMode, (GLenum face, GLenum mode))
-SDL_PROC_UNUSED(void, glPolygonOffset, (GLfloat factor, GLfloat units))
-SDL_PROC_UNUSED(void, glPolygonStipple, (const GLubyte * mask))
-SDL_PROC_UNUSED(void, glPopAttrib, (void))
-SDL_PROC_UNUSED(void, glPopClientAttrib, (void))
-SDL_PROC_UNUSED(void, glPopMatrix, (void))
-SDL_PROC_UNUSED(void, glPopName, (void))
-SDL_PROC_UNUSED(void, glPrioritizeTextures,
-                (GLsizei n, const GLuint * textures,
-                 const GLclampf * priorities))
-SDL_PROC_UNUSED(void, glPushAttrib, (GLbitfield mask))
-SDL_PROC_UNUSED(void, glPushClientAttrib, (GLbitfield mask))
-SDL_PROC_UNUSED(void, glPushMatrix, (void))
-SDL_PROC_UNUSED(void, glPushName, (GLuint name))
-SDL_PROC_UNUSED(void, glRasterPos2d, (GLdouble x, GLdouble y))
-SDL_PROC_UNUSED(void, glRasterPos2dv, (const GLdouble * v))
-SDL_PROC_UNUSED(void, glRasterPos2f, (GLfloat x, GLfloat y))
-SDL_PROC_UNUSED(void, glRasterPos2fv, (const GLfloat * v))
-SDL_PROC(void, glRasterPos2i, (GLint x, GLint y))
-SDL_PROC_UNUSED(void, glRasterPos2iv, (const GLint * v))
-SDL_PROC_UNUSED(void, glRasterPos2s, (GLshort x, GLshort y))
-SDL_PROC_UNUSED(void, glRasterPos2sv, (const GLshort * v))
-SDL_PROC_UNUSED(void, glRasterPos3d, (GLdouble x, GLdouble y, GLdouble z))
-SDL_PROC_UNUSED(void, glRasterPos3dv, (const GLdouble * v))
-SDL_PROC_UNUSED(void, glRasterPos3f, (GLfloat x, GLfloat y, GLfloat z))
-SDL_PROC_UNUSED(void, glRasterPos3fv, (const GLfloat * v))
-SDL_PROC_UNUSED(void, glRasterPos3i, (GLint x, GLint y, GLint z))
-SDL_PROC_UNUSED(void, glRasterPos3iv, (const GLint * v))
-SDL_PROC_UNUSED(void, glRasterPos3s, (GLshort x, GLshort y, GLshort z))
-SDL_PROC_UNUSED(void, glRasterPos3sv, (const GLshort * v))
-SDL_PROC_UNUSED(void, glRasterPos4d,
-                (GLdouble x, GLdouble y, GLdouble z, GLdouble w))
-SDL_PROC_UNUSED(void, glRasterPos4dv, (const GLdouble * v))
-SDL_PROC_UNUSED(void, glRasterPos4f,
-                (GLfloat x, GLfloat y, GLfloat z, GLfloat w))
-SDL_PROC_UNUSED(void, glRasterPos4fv, (const GLfloat * v))
-SDL_PROC_UNUSED(void, glRasterPos4i, (GLint x, GLint y, GLint z, GLint w))
-SDL_PROC_UNUSED(void, glRasterPos4iv, (const GLint * v))
-SDL_PROC_UNUSED(void, glRasterPos4s,
-                (GLshort x, GLshort y, GLshort z, GLshort w))
-SDL_PROC_UNUSED(void, glRasterPos4sv, (const GLshort * v))
-SDL_PROC(void, glReadBuffer, (GLenum mode))
-SDL_PROC(void, glReadPixels,
-         (GLint x, GLint y, GLsizei width, GLsizei height,
-          GLenum format, GLenum type, GLvoid * pixels))
-SDL_PROC_UNUSED(void, glRectd,
-                (GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2))
-SDL_PROC_UNUSED(void, glRectdv, (const GLdouble * v1, const GLdouble * v2))
-SDL_PROC_UNUSED(void, glRectf,
-                (GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2))
-SDL_PROC_UNUSED(void, glRectfv, (const GLfloat * v1, const GLfloat * v2))
-SDL_PROC(void, glRecti, (GLint x1, GLint y1, GLint x2, GLint y2))
-SDL_PROC_UNUSED(void, glRectiv, (const GLint * v1, const GLint * v2))
-SDL_PROC_UNUSED(void, glRects,
-                (GLshort x1, GLshort y1, GLshort x2, GLshort y2))
-SDL_PROC_UNUSED(void, glRectsv, (const GLshort * v1, const GLshort * v2))
-SDL_PROC_UNUSED(GLint, glRenderMode, (GLenum mode))
-SDL_PROC_UNUSED(void, glRotated,
-                (GLdouble angle, GLdouble x, GLdouble y, GLdouble z))
-SDL_PROC_UNUSED(void, glRotatef,
-                (GLfloat angle, GLfloat x, GLfloat y, GLfloat z))
-SDL_PROC_UNUSED(void, glScaled, (GLdouble x, GLdouble y, GLdouble z))
-SDL_PROC_UNUSED(void, glScalef, (GLfloat x, GLfloat y, GLfloat z))
-SDL_PROC_UNUSED(void, glScissor,
-                (GLint x, GLint y, GLsizei width, GLsizei height))
-SDL_PROC_UNUSED(void, glSelectBuffer, (GLsizei size, GLuint * buffer))
-SDL_PROC_UNUSED(void, glShadeModel, (GLenum mode))
-SDL_PROC_UNUSED(void, glStencilFunc, (GLenum func, GLint ref, GLuint mask))
-SDL_PROC_UNUSED(void, glStencilMask, (GLuint mask))
-SDL_PROC_UNUSED(void, glStencilOp, (GLenum fail, GLenum zfail, GLenum zpass))
-SDL_PROC_UNUSED(void, glTexCoord1d, (GLdouble s))
-SDL_PROC_UNUSED(void, glTexCoord1dv, (const GLdouble * v))
-SDL_PROC_UNUSED(void, glTexCoord1f, (GLfloat s))
-SDL_PROC_UNUSED(void, glTexCoord1fv, (const GLfloat * v))
-SDL_PROC_UNUSED(void, glTexCoord1i, (GLint s))
-SDL_PROC_UNUSED(void, glTexCoord1iv, (const GLint * v))
-SDL_PROC_UNUSED(void, glTexCoord1s, (GLshort s))
-SDL_PROC_UNUSED(void, glTexCoord1sv, (const GLshort * v))
-SDL_PROC_UNUSED(void, glTexCoord2d, (GLdouble s, GLdouble t))
-SDL_PROC_UNUSED(void, glTexCoord2dv, (const GLdouble * v))
-SDL_PROC(void, glTexCoord2f, (GLfloat s, GLfloat t))
-SDL_PROC_UNUSED(void, glTexCoord2fv, (const GLfloat * v))
-SDL_PROC_UNUSED(void, glTexCoord2i, (GLint s, GLint t))
-SDL_PROC_UNUSED(void, glTexCoord2iv, (const GLint * v))
-SDL_PROC_UNUSED(void, glTexCoord2s, (GLshort s, GLshort t))
-SDL_PROC_UNUSED(void, glTexCoord2sv, (const GLshort * v))
-SDL_PROC_UNUSED(void, glTexCoord3d, (GLdouble s, GLdouble t, GLdouble r))
-SDL_PROC_UNUSED(void, glTexCoord3dv, (const GLdouble * v))
-SDL_PROC_UNUSED(void, glTexCoord3f, (GLfloat s, GLfloat t, GLfloat r))
-SDL_PROC_UNUSED(void, glTexCoord3fv, (const GLfloat * v))
-SDL_PROC_UNUSED(void, glTexCoord3i, (GLint s, GLint t, GLint r))
-SDL_PROC_UNUSED(void, glTexCoord3iv, (const GLint * v))
-SDL_PROC_UNUSED(void, glTexCoord3s, (GLshort s, GLshort t, GLshort r))
-SDL_PROC_UNUSED(void, glTexCoord3sv, (const GLshort * v))
-SDL_PROC_UNUSED(void, glTexCoord4d,
-                (GLdouble s, GLdouble t, GLdouble r, GLdouble q))
-SDL_PROC_UNUSED(void, glTexCoord4dv, (const GLdouble * v))
-SDL_PROC_UNUSED(void, glTexCoord4f,
-                (GLfloat s, GLfloat t, GLfloat r, GLfloat q))
-SDL_PROC_UNUSED(void, glTexCoord4fv, (const GLfloat * v))
-SDL_PROC_UNUSED(void, glTexCoord4i, (GLint s, GLint t, GLint r, GLint q))
-SDL_PROC_UNUSED(void, glTexCoord4iv, (const GLint * v))
-SDL_PROC_UNUSED(void, glTexCoord4s,
-                (GLshort s, GLshort t, GLshort r, GLshort q))
-SDL_PROC_UNUSED(void, glTexCoord4sv, (const GLshort * v))
-SDL_PROC_UNUSED(void, glTexCoordPointer,
-                (GLint size, GLenum type, GLsizei stride,
-                 const GLvoid * pointer))
-SDL_PROC(void, glTexEnvf, (GLenum target, GLenum pname, GLfloat param))
-SDL_PROC_UNUSED(void, glTexEnvfv,
-                (GLenum target, GLenum pname, const GLfloat * params))
-SDL_PROC_UNUSED(void, glTexEnvi, (GLenum target, GLenum pname, GLint param))
-SDL_PROC_UNUSED(void, glTexEnviv,
-                (GLenum target, GLenum pname, const GLint * params))
-SDL_PROC_UNUSED(void, glTexGend, (GLenum coord, GLenum pname, GLdouble param))
-SDL_PROC_UNUSED(void, glTexGendv,
-                (GLenum coord, GLenum pname, const GLdouble * params))
-SDL_PROC_UNUSED(void, glTexGenf, (GLenum coord, GLenum pname, GLfloat param))
-SDL_PROC_UNUSED(void, glTexGenfv,
-                (GLenum coord, GLenum pname, const GLfloat * params))
-SDL_PROC_UNUSED(void, glTexGeni, (GLenum coord, GLenum pname, GLint param))
-SDL_PROC_UNUSED(void, glTexGeniv,
-                (GLenum coord, GLenum pname, const GLint * params))
-SDL_PROC_UNUSED(void, glTexImage1D,
-                (GLenum target, GLint level, GLint internalformat,
-                 GLsizei width, GLint border, GLenum format, GLenum type,
-                 const GLvoid * pixels))
-SDL_PROC(void, glTexImage2D,
-         (GLenum target, GLint level, GLint internalformat, GLsizei width,
-          GLsizei height, GLint border, GLenum format, GLenum type,
-          const GLvoid * pixels))
-SDL_PROC_UNUSED(void, glTexParameterf,
-                (GLenum target, GLenum pname, GLfloat param))
-SDL_PROC_UNUSED(void, glTexParameterfv,
-                (GLenum target, GLenum pname, const GLfloat * params))
-SDL_PROC(void, glTexParameteri, (GLenum target, GLenum pname, GLint param))
-SDL_PROC_UNUSED(void, glTexParameteriv,
-                (GLenum target, GLenum pname, const GLint * params))
-SDL_PROC_UNUSED(void, glTexSubImage1D,
-                (GLenum target, GLint level, GLint xoffset, GLsizei width,
-                 GLenum format, GLenum type, const GLvoid * pixels))
-SDL_PROC(void, glTexSubImage2D,
-         (GLenum target, GLint level, GLint xoffset, GLint yoffset,
-          GLsizei width, GLsizei height, GLenum format, GLenum type,
-          const GLvoid * pixels))
-SDL_PROC_UNUSED(void, glTranslated, (GLdouble x, GLdouble y, GLdouble z))
-SDL_PROC_UNUSED(void, glTranslatef, (GLfloat x, GLfloat y, GLfloat z))
-SDL_PROC_UNUSED(void, glVertex2d, (GLdouble x, GLdouble y))
-SDL_PROC_UNUSED(void, glVertex2dv, (const GLdouble * v))
-SDL_PROC(void, glVertex2f, (GLfloat x, GLfloat y))
-SDL_PROC_UNUSED(void, glVertex2fv, (const GLfloat * v))
-SDL_PROC_UNUSED(void, glVertex2i, (GLint x, GLint y))
-SDL_PROC_UNUSED(void, glVertex2iv, (const GLint * v))
-SDL_PROC_UNUSED(void, glVertex2s, (GLshort x, GLshort y))
-SDL_PROC_UNUSED(void, glVertex2sv, (const GLshort * v))
-SDL_PROC_UNUSED(void, glVertex3d, (GLdouble x, GLdouble y, GLdouble z))
-SDL_PROC_UNUSED(void, glVertex3dv, (const GLdouble * v))
-SDL_PROC_UNUSED(void, glVertex3f, (GLfloat x, GLfloat y, GLfloat z))
-SDL_PROC_UNUSED(void, glVertex3fv, (const GLfloat * v))
-SDL_PROC_UNUSED(void, glVertex3i, (GLint x, GLint y, GLint z))
-SDL_PROC_UNUSED(void, glVertex3iv, (const GLint * v))
-SDL_PROC_UNUSED(void, glVertex3s, (GLshort x, GLshort y, GLshort z))
-SDL_PROC_UNUSED(void, glVertex3sv, (const GLshort * v))
-SDL_PROC_UNUSED(void, glVertex4d,
-                (GLdouble x, GLdouble y, GLdouble z, GLdouble w))
-SDL_PROC_UNUSED(void, glVertex4dv, (const GLdouble * v))
-SDL_PROC_UNUSED(void, glVertex4f,
-                (GLfloat x, GLfloat y, GLfloat z, GLfloat w))
-SDL_PROC_UNUSED(void, glVertex4fv, (const GLfloat * v))
-SDL_PROC_UNUSED(void, glVertex4i, (GLint x, GLint y, GLint z, GLint w))
-SDL_PROC_UNUSED(void, glVertex4iv, (const GLint * v))
-SDL_PROC_UNUSED(void, glVertex4s,
-                (GLshort x, GLshort y, GLshort z, GLshort w))
-SDL_PROC_UNUSED(void, glVertex4sv, (const GLshort * v))
-SDL_PROC_UNUSED(void, glVertexPointer,
-                (GLint size, GLenum type, GLsizei stride,
-                 const GLvoid * pointer))
-SDL_PROC(void, glViewport, (GLint x, GLint y, GLsizei width, GLsizei height))
-
-/* vi: set ts=4 sw=4 expandtab: */
--- a/src/video/android/SDL_androidgl.c	Sun Feb 06 00:48:41 2011 -0800
+++ b/src/video/android/SDL_androidgl.c	Sun Feb 06 02:35:14 2011 -0800
@@ -56,7 +56,7 @@
 Android_GL_CreateContext(_THIS, SDL_Window * window)
 {
     Android_JNI_CreateContext();
-    return 1;
+    return (SDL_GLContext)1;
 }
 
 int