remove temporary stuff

diff --git a/include/GL/gl.h b/include/GL/gl.h
index ab6efc537d4ac322c8ccebe496a9ff9ece5947d6..f7456ef99a0e02fbf4983d550fa551149c2fe126 100644 (file)
--- a/include/GL/gl.h
+++ b/include/GL/gl.h
@@ -2625,97 +2625,6 @@ GLAPI void GLAPIENTRY glTracePointerRangeMESA( const GLvoid* first, const GLvoid
 
 
 
-#ifndef GL_APPLE_client_storage
-#define GL_APPLE_client_storage 1
-
-#define GL_UNPACK_CLIENT_STORAGE_APPLE          0x85B2
-
-#endif /* GL_APPLE_client_storage */
-
-
-
-#ifndef GL_APPLE_ycbcr_422
-#define GL_APPLE_ycbcr_422 1
-
-#define GL_YCBCR_422_APPLE                     0x85B9
-#define GL_UNSIGNED_SHORT_8_8_APPLE            0x85BA
-#define GL_UNSIGNED_SHORT_8_8_REV_APPLE                0x85BB
-
-#endif /* GL_APPLE_ycbcr_422 */
-
-
-
-/* XXX temporary until glext.h is updated! */
-#ifndef GL_NV_fragment_program
-#define GL_NV_fragment_program 1
-
-#define GL_FRAGMENT_PROGRAM_NV                      0x8870
-#define GL_MAX_TEXTURE_COORDS_NV                    0x8871
-#define GL_MAX_TEXTURE_IMAGE_UNITS_NV               0x8872
-#define GL_FRAGMENT_PROGRAM_BINDING_NV              0x8873
-#define GL_PROGRAM_ERROR_STRING_NV                  0x8874
-#define GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV 0x8868
-
-
-GLAPI void GLAPIENTRY glProgramNamedParameter4fNV(GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-
-GLAPI void GLAPIENTRY glProgramNamedParameter4dNV(GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-
-GLAPI void GLAPIENTRY glProgramNamedParameter4fvNV(GLuint id, GLsizei len, const GLubyte *name, const float v[]);
-
-GLAPI void GLAPIENTRY glProgramNamedParameter4dvNV(GLuint id, GLsizei len, const GLubyte *name, const double v[]);
-
-GLAPI void GLAPIENTRY glGetProgramNamedParameterfvNV(GLuint id, GLsizei len, const GLubyte *name, GLfloat *params);
-
-GLAPI void GLAPIENTRY glGetProgramNamedParameterdvNV(GLuint id, GLsizei len, const GLubyte *name, GLdouble *params);
-
-GLAPI void GLAPIENTRY glProgramLocalParameter4dARB(GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-
-GLAPI void GLAPIENTRY glProgramLocalParameter4dvARB(GLenum target, GLuint index, const GLdouble *params);
-
-GLAPI void GLAPIENTRY glProgramLocalParameter4fARB(GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-
-GLAPI void GLAPIENTRY glProgramLocalParameter4fvARB(GLenum target, GLuint index, const GLfloat *params);
-
-GLAPI void GLAPIENTRY glGetProgramLocalParameterdvARB(GLenum target, GLuint index, GLdouble *params);
-
-GLAPI void GLAPIENTRY glGetProgramLocalParameterfvARB(GLenum target, GLuint index, GLfloat *params);
-
-typedef void (APIENTRY * PFNGLPROGRAMNAMEDPARAMETER4FNVPROC) (GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRY * PFNGLPROGRAMNAMEDPARAMETER4DNVPROC) (GLuint id, GLsizei len, const GLubyte * name, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRY * PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC) (GLuint id, GLsizei len, const GLubyte * name, const GLfloat *v);
-typedef void (APIENTRY * PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC) (GLuint id, GLsizei len, const GLubyte * name, const GLdouble *v);   
-typedef void (APIENTRY * PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC) (GLuint id, GLsizei len, const GLubyte * name, GLfloat *params);
-typedef void (APIENTRY * PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC) (GLuint id, GLsizei len, const GLubyte * name, GLdouble *params);
-
-#endif /* GL_NV_fragment_program */
-
-
-
-/* XXX temporary until glext.h is updated! */
-#ifndef GL_ARB_fragment_program
-#define GL_ARB_fragment_program 1
-
-#define GL_FRAGMENT_PROGRAM_ARB                            0x8804
-#define GL_PROGRAM_ALU_INSTRUCTIONS_ARB                    0x8805
-#define GL_PROGRAM_TEX_INSTRUCTIONS_ARB                    0x8806
-#define GL_PROGRAM_TEX_INDIRECTIONS_ARB                    0x8807
-#define GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB             0x8808
-#define GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB             0x8809
-#define GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB             0x880A
-#define GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB                0x880B
-#define GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB                0x880C
-#define GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB                0x880D
-#define GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB         0x880E
-#define GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB         0x880F
-#define GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB         0x8810
-#define GL_MAX_TEXTURE_COORDS_ARB                          0x8871
-#define GL_MAX_TEXTURE_IMAGE_UNITS_ARB                     0x8872
-
-#endif /* GL_ARB_fragment_program */
-
-
-
 /* XXX temporary until glext.h is updated! */
 #ifndef GL_EXT_depth_bounds_test
 #define GL_EXT_depth_bounds_test 1