X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=include%2FGL%2Fgl.h;h=4a2923b362c0b23d0aad6b6b963b9b885c9870e8;hb=c7af1b0b94a190b284dde807b3d806dec8cc8ee7;hp=202a7e911271fed2f4cd97d807ddadf9696f29c8;hpb=3849b44d666482a14aac41f4e19a596c420cfa80;p=mesa.git diff --git a/include/GL/gl.h b/include/GL/gl.h index 202a7e91127..4a2923b362c 100644 --- a/include/GL/gl.h +++ b/include/GL/gl.h @@ -1,4 +1,4 @@ -/* $Id: gl.h,v 1.4 1999/09/17 02:44:19 tjump Exp $ */ +/* $Id: gl.h,v 1.15 1999/10/21 06:04:20 tjump Exp $ */ /* * Mesa 3-D graphics library @@ -50,17 +50,22 @@ #endif #if !defined(OPENSTEP) && (defined(__WIN32__) || defined(__CYGWIN32__)) +# pragma warning( disable : 4068 ) /* unknown pragma */ # pragma warning( disable : 4244 ) /* '=' : conversion from 'const double ' to 'float ', possible loss of data */ # pragma warning( disable : 4018 ) /* '<' : signed/unsigned mismatch */ # pragma warning( disable : 4305 ) /* '=' : truncation from 'const double ' to 'float ' */ # pragma warning( disable : 4550 ) /* 'function' undefined; assuming extern returning int */ # pragma warning( disable : 4761 ) /* integral size mismatch in argument; conversion supplied */ +# pragma warning( disable : 4711 ) /* function 'foo' selected for automatic inline expansion */ # if defined(_MSC_VER) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */ # define GLAPI __declspec(dllexport) +# define WGLAPI __declspec(dllexport) # elif defined(_MSC_VER) && defined(_DLL) /* tag specifying we're building for DLL runtime support */ # define GLAPI __declspec(dllimport) +# define WGLAPI __declspec(dllimport) # else /* for use with static link lib build of Win32 edition only */ # define GLAPI extern +# define WGLAPI __declspec(dllimport) # endif /* _STATIC_MESA support */ # define GLAPIENTRY __stdcall # define GLCALLBACK __stdcall @@ -107,28 +112,10 @@ typedef unsigned long COLORREF; # endif /* !UNICODE */ typedef struct tagLAYERPLANEDESCRIPTOR LAYERPLANEDESCRIPTOR, *PLAYERPLANEDESCRIPTOR, *LPLAYERPLANEDESCRIPTOR; typedef struct _GLYPHMETRICSFLOAT GLYPHMETRICSFLOAT, *PGLYPHMETRICSFLOAT, *LPGLYPHMETRICSFLOAT; -GLAPI int GLAPIENTRY wglCopyContext(HGLRC, HGLRC, unsigned int); -GLAPI HGLRC GLAPIENTRY wglCreateContext(HDC); -GLAPI HGLRC GLAPIENTRY wglCreateLayerContext(HDC, int); -GLAPI int GLAPIENTRY wglDeleteContext(HGLRC); -GLAPI HGLRC GLAPIENTRY wglGetCurrentContext(void); -GLAPI HDC GLAPIENTRY wglGetCurrentDC(void); -GLAPI PROC GLAPIENTRY wglGetProcAddress(char*); -GLAPI int GLAPIENTRY wglMakeCurrent(HDC, HGLRC); -GLAPI int GLAPIENTRY wglShareLists(HGLRC, HGLRC); -GLAPI int GLAPIENTRY wglUseFontBitmapsA(HDC, unsigned long, unsigned long, unsigned long); -GLAPI int GLAPIENTRY wglUseFontBitmapsW(HDC, unsigned long, unsigned long, unsigned long); -GLAPI int GLAPIENTRY wglUseFontOutlinesA(HDC, unsigned long, unsigned long, unsigned long, float,float, int, LPGLYPHMETRICSFLOAT); -GLAPI int GLAPIENTRY wglUseFontOutlinesW(HDC, unsigned long, unsigned long, unsigned long, float,float, int, LPGLYPHMETRICSFLOAT); -GLAPI int GLAPIENTRY wglDescribeLayerPlane(HDC, int, int, unsigned int,LPLAYERPLANEDESCRIPTOR); -GLAPI int GLAPIENTRY wglSetLayerPaletteEntries(HDC, int, int, int,const COLORREF *); -GLAPI int GLAPIENTRY wglGetLayerPaletteEntries(HDC, int, int, int,COLORREF *); -GLAPI int GLAPIENTRY wglRealizeLayerPalette(HDC, int, int); -GLAPI int GLAPIENTRY wglSwapLayerBuffers(HDC, unsigned int); -GLAPI int GLAPIENTRY SwapBuffers(HDC); +typedef struct tagPIXELFORMATDESCRIPTOR PIXELFORMATDESCRIPTOR, *PPIXELFORMATDESCRIPTOR, *LPPIXELFORMATDESCRIPTOR; +#include #endif - #ifdef __cplusplus extern "C" { #endif @@ -874,8 +861,8 @@ typedef enum { /* OpenGL 1.2 */ GL_RESCALE_NORMAL = 0x803A, GL_CLAMP_TO_EDGE = 0x812F, - GL_MAX_ELEMENTS_VERTICES = 0xF0E8, - GL_MAX_ELEMENTS_INDICES = 0xF0E9, + GL_MAX_ELEMENTS_VERTICES = 0x80E8, + GL_MAX_ELEMENTS_INDICES = 0x80E9, GL_BGR = 0x80E0, GL_BGRA = 0x80E1, GL_UNSIGNED_BYTE_3_3_2 = 0x8032, @@ -955,7 +942,6 @@ typedef enum { GL_COLOR_TABLE_ALPHA_SIZE = 0x80DD, GL_COLOR_TABLE_LUMINANCE_SIZE = 0x80DE, GL_COLOR_TABLE_INTENSITY_SIZE = 0x80DF, - /* GL_EXT_convolution and GL_HP_convolution_border_modes */ GL_CONVOLUTION_1D = 0x8010, GL_CONVOLUTION_2D = 0x8011, @@ -980,7 +966,6 @@ typedef enum { GL_CONSTANT_BORDER = 0x8151, GL_REPLICATE_BORDER = 0x8153, GL_CONVOLUTION_BORDER_COLOR = 0x8154, - /* GL_SGI_color_matrix */ GL_COLOR_MATRIX = 0x80B1, GL_COLOR_MATRIX_STACK_DEPTH = 0x80B2, @@ -993,7 +978,6 @@ typedef enum { GL_POST_COLOR_MATRIX_GREEN_BIAS = 0x80B9, GL_POST_COLOR_MATRIX_BLUE_BIAS = 0x80BA, GL_POST_COLOR_MATRIX_ALPHA_BIAS = 0x80BB, - /* GL_EXT_histogram */ GL_HISTOGRAM = 0x8024, GL_PROXY_HISTOGRAM = 0x8025, @@ -1009,6 +993,14 @@ typedef enum { GL_MINMAX_FORMAT = 0x802F, GL_MINMAX_SINK = 0x8030, GL_TABLE_TOO_LARGE = 0x8031, + /* GL_EXT_blend_color, GL_EXT_blend_minmax */ + GL_BLEND_EQUATION = 0x8009, + GL_MIN = 0x8007, + GL_MAX = 0x8008, + GL_FUNC_ADD = 0x8006, + GL_FUNC_SUBTRACT = 0x800A, + GL_FUNC_REVERSE_SUBTRACT = 0x800B, + GL_BLEND_COLOR = 0x8005, /* GL_NV_texgen_reflection (nVidia) */ GL_NORMAL_MAP_NV = 0x8511, @@ -2096,6 +2088,36 @@ GLAPI void GLAPIENTRY glCopyTexSubImage3D( GLenum target, GLint level, /* 1.2 imaging extension functions */ +GLAPI void GLAPIENTRY glColorTable( GLenum target, GLenum internalformat, + GLsizei width, GLenum format, + GLenum type, const GLvoid *table ); + +GLAPI void GLAPIENTRY glColorSubTable( GLenum target, + GLsizei start, GLsizei count, + GLenum format, GLenum type, + const GLvoid *data ); + +GLAPI void GLAPIENTRY glColorTableParameteriv(GLenum target, GLenum pname, + const GLint *params); + +GLAPI void GLAPIENTRY glColorTableParameterfv(GLenum target, GLenum pname, + const GLfloat *params); + +GLAPI void GLAPIENTRY glCopyColorSubTable( GLenum target, GLsizei start, + GLint x, GLint y, GLsizei width ); + +GLAPI void GLAPIENTRY glCopyColorTable( GLenum target, GLenum internalformat, + GLint x, GLint y, GLsizei width ); + +GLAPI void GLAPIENTRY glGetColorTable( GLenum target, GLenum format, + GLenum type, GLvoid *table ); + +GLAPI void GLAPIENTRY glGetColorTableParameterfv( GLenum target, GLenum pname, + GLfloat *params ); + +GLAPI void GLAPIENTRY glGetColorTableParameteriv( GLenum target, GLenum pname, + GLint *params ); + GLAPI void GLAPIENTRY glBlendEquation( GLenum mode ); GLAPI void GLAPIENTRY glBlendColor( GLclampf red, GLclampf green, @@ -2121,7 +2143,7 @@ GLAPI void GLAPIENTRY glMinmax( GLenum target, GLenum internalformat, GLAPI void GLAPIENTRY glResetMinmax( GLenum target ); -GLAPI void GLAPIENTRY glGetMinMax( GLenum target, GLboolean reset, +GLAPI void GLAPIENTRY glGetMinmax( GLenum target, GLboolean reset, GLenum format, GLenum types, GLvoid *values ); @@ -2174,12 +2196,6 @@ GLAPI void GLAPIENTRY glSeparableFilter2D( GLenum target, GLAPI void GLAPIENTRY glGetSeparableFilter( GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span ); -GLAPI void GLAPIENTRY glCopyColorSubTable( GLenum target, GLsizei start, - GLint x, GLint y, GLsizei width ); - -GLAPI void GLAPIENTRY glCopyColorTable( GLenum target, GLenum internalformat, - GLint x, GLint y, GLsizei width ); - /* GL_EXT_compiled_vertex_array */ @@ -2187,19 +2203,6 @@ GLAPI void GLAPIENTRY glLockArraysEXT( GLint first, GLsizei count ); GLAPI void GLAPIENTRY glUnlockArraysEXT( void ); -/* - * GL_EXT_get_proc_address - * - * XXX this is a preliminary extension. It may change! Use at your - * own risk! Do not release code which uses this extension yet! - * If you want to try it out, #define GL_EXT_get_proc_address before - * #include - */ -#ifdef GL_EXT_get_proc_address -typedef (void (GLAPIENTRY *glProcAddress))(); -glProcAddress GLAPIENTRY glGetProcAddressEXT(const GLubyte *procName); -#endif - #if defined(__BEOS__) || defined(__QUICKDRAW__) #pragma export off