diff --git a/neo/SConstruct b/neo/SConstruct index 2386650a..a06a8dd1 100644 --- a/neo/SConstruct +++ b/neo/SConstruct @@ -12,7 +12,7 @@ import scons_utils conf_filename='site.conf' # choose configuration variables which should be saved between runs # ( we handle all those as strings ) -serialized=['CC', 'CXX', 'X86', 'BUILD', 'IDNET_HOST', 'GL_HARDLINK', 'DEDICATED', +serialized=['CC', 'CXX', 'X86', 'BUILD', 'IDNET_HOST', 'DEDICATED', 'DEBUG_MEMORY', 'LIBC_MALLOC', 'ID_NOLANADDRESS', 'ID_MCHECK', 'ALSA', 'TARGET_CORE', 'TARGET_GAME', 'TARGET_D3XP', 'TARGET_MONO', 'TARGET_DEMO', 'NOCURL', 'BUILD_ROOT', 'BUILD_GAMEPAK', 'BASEFLAGS' ] @@ -91,10 +91,6 @@ TARGET_DEMO (default 0) IDNET_HOST (default to source hardcoded) Override builtin IDNET_HOST with your own settings -GL_HARDLINK (default 0) - Instead of dynamically loading the OpenGL libraries, use implicit dependencies - NOTE: no GL logging capability and no r_glDriver with GL_HARDLINK 1 - DEBUG_MEMORY (default 0) Enables memory logging to file @@ -175,7 +171,6 @@ TARGET_D3XP = '1' TARGET_MONO = '0' TARGET_DEMO = '0' IDNET_HOST = '' -GL_HARDLINK = '0' DEBUG_MEMORY = '0' LIBC_MALLOC = '1' ID_NOLANADDRESS = '0' @@ -275,9 +270,6 @@ g_build = '%s/%s-%s' % (BUILD_ROOT, g_cpu, BUILD) SConsignFile( g_build + '/scons.signatures' ) -if ( GL_HARDLINK != '0' ): - g_build += '-hardlink' - if ( DEBUG_MEMORY != '0' ): g_build += '-debugmem' @@ -328,9 +320,6 @@ else: print 'Unknown build configuration ' + BUILD sys.exit(0) -if ( GL_HARDLINK != '0' ): - CORECPPFLAGS.append( '-DID_GL_HARDLINK' ) - if ( DEBUG_MEMORY != '0' ): BASECPPFLAGS += [ '-DID_DEBUG_MEMORY', '-DID_REDIRECT_NEWDELETE' ] @@ -417,8 +406,6 @@ if ( TARGET_CORE == '1' ): local_dedicated = 0 Export( 'GLOBALS ' + GLOBALS ) - VariantDir( g_build + '/obj-core/glimp', '.', duplicate = 1 ) - SConscript( g_build + '/obj-core/glimp/sys/scons/SConscript.gl' ) VariantDir( g_build + '/obj-core', '.', duplicate = 0 ) idlib_objects = SConscript( g_build + '/obj-core/sys/scons/SConscript.idlib' ) Export( 'GLOBALS ' + GLOBALS ) # update idlib_objects @@ -429,8 +416,6 @@ if ( TARGET_CORE == '1' ): local_dedicated = 1 Export( 'GLOBALS ' + GLOBALS ) - VariantDir( g_build + '/dedicated/glimp', '.', duplicate = 1 ) - SConscript( g_build + '/dedicated/glimp/sys/scons/SConscript.gl' ) VariantDir( g_build + '/dedicated', '.', duplicate = 0 ) idlib_objects = SConscript( g_build + '/dedicated/sys/scons/SConscript.idlib' ) Export( 'GLOBALS ' + GLOBALS ) @@ -476,8 +461,6 @@ if ( TARGET_MONO == '1' ): local_idlibpic = 0 local_d3xp = 0 Export( 'GLOBALS ' + GLOBALS ) - VariantDir( g_build + '/mono/glimp', '.', duplicate = 1 ) - SConscript( g_build + '/mono/glimp/sys/scons/SConscript.gl' ) VariantDir( g_build + '/mono', '.', duplicate = 0 ) idlib_objects = SConscript( g_build + '/mono/sys/scons/SConscript.idlib' ) game_objects = SConscript( g_build + '/mono/sys/scons/SConscript.game' ) @@ -494,8 +477,6 @@ if ( TARGET_DEMO == '1' ): local_curl = 0 local_d3xp = 0 Export( 'GLOBALS ' + GLOBALS ) - VariantDir( g_build + '/demo/glimp', '.', duplicate = 1 ) - SConscript( g_build + '/demo/glimp/sys/scons/SConscript.gl' ) VariantDir( g_build + '/demo', '.', duplicate = 0 ) idlib_objects = SConscript( g_build + '/demo/sys/scons/SConscript.idlib' ) Export( 'GLOBALS ' + GLOBALS ) diff --git a/neo/renderer/Image_load.cpp b/neo/renderer/Image_load.cpp index 57141ea8..3d0a3838 100644 --- a/neo/renderer/Image_load.cpp +++ b/neo/renderer/Image_load.cpp @@ -1672,10 +1672,11 @@ PurgeImage */ void idImage::PurgeImage() { if ( texnum != TEXTURE_NOT_LOADED ) { +#ifdef _WIN32 // sometimes is NULL when exiting with an error - if ( qglDeleteTextures ) { + if ( qglDeleteTextures ) +#endif qglDeleteTextures( 1, &texnum ); // this should be the ONLY place it is ever called! - } texnum = TEXTURE_NOT_LOADED; } diff --git a/neo/renderer/qgl.h b/neo/renderer/qgl.h index 75f039ee..ef0e6ece 100644 --- a/neo/renderer/qgl.h +++ b/neo/renderer/qgl.h @@ -166,7 +166,7 @@ extern PFNGLDEPTHBOUNDSEXTPROC qglDepthBoundsEXT; //=========================================================================== // non-windows systems will just redefine qgl* to gl* -#if defined( __APPLE__ ) || defined( ID_GL_HARDLINK ) +#ifndef _WIN32 #include "qgl_linked.h" @@ -511,8 +511,6 @@ extern void ( APIENTRY * qglVertex4sv )(const GLshort *v); extern void ( APIENTRY * qglVertexPointer )(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); extern void ( APIENTRY * qglViewport )(GLint x, GLint y, GLsizei width, GLsizei height); -#if defined( _WIN32 ) - extern int ( WINAPI * qwglChoosePixelFormat )(HDC, CONST PIXELFORMATDESCRIPTOR *); extern int ( WINAPI * qwglDescribePixelFormat) (HDC, int, UINT, LPPIXELFORMATDESCRIPTOR); extern int ( WINAPI * qwglGetPixelFormat)(HDC); @@ -544,24 +542,4 @@ extern BOOL ( WINAPI * qwglSwapLayerBuffers)(HDC, UINT); #endif // _WIN32 -#if defined( __unix__ ) - -//GLX Functions -extern XVisualInfo * (*qglXChooseVisual)( Display *dpy, int screen, int *attribList ); -extern GLXContext (*qglXCreateContext)( Display *dpy, XVisualInfo *vis, GLXContext shareList, Bool direct ); -extern void (*qglXDestroyContext)( Display *dpy, GLXContext ctx ); -extern Bool (*qglXMakeCurrent)( Display *dpy, GLXDrawable drawable, GLXContext ctx); -extern void (*qglXSwapBuffers)( Display *dpy, GLXDrawable drawable ); -extern GLExtension_t (*qglXGetProcAddressARB)( const GLubyte *procname ); - -// make sure the code is correctly using qgl everywhere -// don't enable that when building glimp itself obviously.. -#if !defined( GLIMP ) - #include "../sys/linux/qgl_enforce.h" -#endif - -#endif // __linux__ - -#endif // hardlinlk vs dlopen - #endif diff --git a/neo/sys/gllog/gl.api b/neo/sys/gllog/gl.api deleted file mode 100644 index 0c0a3e7d..00000000 --- a/neo/sys/gllog/gl.api +++ /dev/null @@ -1,336 +0,0 @@ -void;qgl;Accum;GLenum op, GLfloat value -void;qgl;AlphaFunc;GLenum func, GLclampf ref -GLboolean;qgl;AreTexturesResident;GLsizei n, const GLuint *textures, GLboolean *residences -void;qgl;ArrayElement;GLint i -void;qgl;Begin;GLenum mode -void;qgl;BindTexture;GLenum target, GLuint texture -void;qgl;Bitmap;GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte *bitmap -void;qgl;BlendFunc;GLenum sfactor, GLenum dfactor -void;qgl;CallList;GLuint list -void;qgl;CallLists;GLsizei n, GLenum type, const GLvoid *lists -void;qgl;Clear;GLbitfield mask -void;qgl;ClearAccum;GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha -void;qgl;ClearColor;GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha -void;qgl;ClearDepth;GLclampd depth -void;qgl;ClearIndex;GLfloat c -void;qgl;ClearStencil;GLint s -void;qgl;ClipPlane;GLenum plane, const GLdouble *equation -void;qgl;Color3b;GLbyte red, GLbyte green, GLbyte blue -void;qgl;Color3bv;const GLbyte *v -void;qgl;Color3d;GLdouble red, GLdouble green, GLdouble blue -void;qgl;Color3dv;const GLdouble *v -void;qgl;Color3f;GLfloat red, GLfloat green, GLfloat blue -void;qgl;Color3fv;const GLfloat *v -void;qgl;Color3i;GLint red, GLint green, GLint blue -void;qgl;Color3iv;const GLint *v -void;qgl;Color3s;GLshort red, GLshort green, GLshort blue -void;qgl;Color3sv;const GLshort *v -void;qgl;Color3ub;GLubyte red, GLubyte green, GLubyte blue -void;qgl;Color3ubv;const GLubyte *v -void;qgl;Color3ui;GLuint red, GLuint green, GLuint blue -void;qgl;Color3uiv;const GLuint *v -void;qgl;Color3us;GLushort red, GLushort green, GLushort blue -void;qgl;Color3usv;const GLushort *v -void;qgl;Color4b;GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha -void;qgl;Color4bv;const GLbyte *v -void;qgl;Color4d;GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha -void;qgl;Color4dv;const GLdouble *v -void;qgl;Color4f;GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha -void;qgl;Color4fv;const GLfloat *v -void;qgl;Color4i;GLint red, GLint green, GLint blue, GLint alpha -void;qgl;Color4iv;const GLint *v -void;qgl;Color4s;GLshort red, GLshort green, GLshort blue, GLshort alpha -void;qgl;Color4sv;const GLshort *v -void;qgl;Color4ub;GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha -void;qgl;Color4ubv;const GLubyte *v -void;qgl;Color4ui;GLuint red, GLuint green, GLuint blue, GLuint alpha -void;qgl;Color4uiv;const GLuint *v -void;qgl;Color4us;GLushort red, GLushort green, GLushort blue, GLushort alpha -void;qgl;Color4usv;const GLushort *v -void;qgl;ColorMask;GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha -void;qgl;ColorMaterial;GLenum face, GLenum mode -void;qgl;ColorPointer;GLint size, GLenum type, GLsizei stride, const GLvoid *pointer -void;qgl;CopyPixels;GLint x, GLint y, GLsizei width, GLsizei height, GLenum type -void;qgl;CopyTexImage1D;GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLint border -void;qgl;CopyTexImage2D;GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border -void;qgl;CopyTexSubImage1D;GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width -void;qgl;CopyTexSubImage2D;GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height -void;qgl;CullFace;GLenum mode -void;qgl;DeleteLists;GLuint list, GLsizei range -void;qgl;DeleteTextures;GLsizei n, const GLuint *textures -void;qgl;DepthFunc;GLenum func -void;qgl;DepthMask;GLboolean flag -void;qgl;DepthRange;GLclampd zNear, GLclampd zFar -void;qgl;Disable;GLenum cap -void;qgl;DisableClientState;GLenum array -void;qgl;DrawArrays;GLenum mode, GLint first, GLsizei count -void;qgl;DrawBuffer;GLenum mode -void;qgl;DrawElements;GLenum mode, GLsizei count, GLenum type, const GLvoid *indices -void;qgl;DrawPixels;GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels -void;qgl;EdgeFlag;GLboolean flag -void;qgl;EdgeFlagPointer;GLsizei stride, const GLvoid *pointer -void;qgl;EdgeFlagv;const GLboolean *flag -void;qgl;Enable;GLenum cap -void;qgl;EnableClientState;GLenum array -void;qgl;End;void -void;qgl;EndList;void -void;qgl;EvalCoord1d;GLdouble u -void;qgl;EvalCoord1dv;const GLdouble *u -void;qgl;EvalCoord1f;GLfloat u -void;qgl;EvalCoord1fv;const GLfloat *u -void;qgl;EvalCoord2d;GLdouble u, GLdouble v -void;qgl;EvalCoord2dv;const GLdouble *u -void;qgl;EvalCoord2f;GLfloat u, GLfloat v -void;qgl;EvalCoord2fv;const GLfloat *u -void;qgl;EvalMesh1;GLenum mode, GLint i1, GLint i2 -void;qgl;EvalMesh2;GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2 -void;qgl;EvalPoint1;GLint i -void;qgl;EvalPoint2;GLint i, GLint j -void;qgl;FeedbackBuffer;GLsizei size, GLenum type, GLfloat *buffer -void;qgl;Finish;void -void;qgl;Flush;void -void;qgl;Fogf;GLenum pname, GLfloat param -void;qgl;Fogfv;GLenum pname, const GLfloat *params -void;qgl;Fogi;GLenum pname, GLint param -void;qgl;Fogiv;GLenum pname, const GLint *params -void;qgl;FrontFace;GLenum mode -void;qgl;Frustum;GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar -GLuint;qgl;GenLists;GLsizei range -void;qgl;GenTextures;GLsizei n, GLuint *textures -void;qgl;GetBooleanv;GLenum pname, GLboolean *params -void;qgl;GetClipPlane;GLenum plane, GLdouble *equation -void;qgl;GetDoublev;GLenum pname, GLdouble *params -GLenum;qgl;GetError;void -void;qgl;GetFloatv;GLenum pname, GLfloat *params -void;qgl;GetIntegerv;GLenum pname, GLint *params -void;qgl;GetLightfv;GLenum light, GLenum pname, GLfloat *params -void;qgl;GetLightiv;GLenum light, GLenum pname, GLint *params -void;qgl;GetMapdv;GLenum target, GLenum query, GLdouble *v -void;qgl;GetMapfv;GLenum target, GLenum query, GLfloat *v -void;qgl;GetMapiv;GLenum target, GLenum query, GLint *v -void;qgl;GetMaterialfv;GLenum face, GLenum pname, GLfloat *params -void;qgl;GetMaterialiv;GLenum face, GLenum pname, GLint *params -void;qgl;GetPixelMapfv;GLenum map, GLfloat *values -void;qgl;GetPixelMapuiv;GLenum map, GLuint *values -void;qgl;GetPixelMapusv;GLenum map, GLushort *values -void;qgl;GetPointerv;GLenum pname, GLvoid* *params -void;qgl;GetPolygonStipple;GLubyte *mask -const GLubyte *;qgl;GetString;GLenum name -void;qgl;GetTexEnvfv;GLenum target, GLenum pname, GLfloat *params -void;qgl;GetTexEnviv;GLenum target, GLenum pname, GLint *params -void;qgl;GetTexGendv;GLenum coord, GLenum pname, GLdouble *params -void;qgl;GetTexGenfv;GLenum coord, GLenum pname, GLfloat *params -void;qgl;GetTexGeniv;GLenum coord, GLenum pname, GLint *params -void;qgl;GetTexImage;GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels -void;qgl;GetTexLevelParameterfv;GLenum target, GLint level, GLenum pname, GLfloat *params -void;qgl;GetTexLevelParameteriv;GLenum target, GLint level, GLenum pname, GLint *params -void;qgl;GetTexParameterfv;GLenum target, GLenum pname, GLfloat *params -void;qgl;GetTexParameteriv;GLenum target, GLenum pname, GLint *params -void;qgl;Hint;GLenum target, GLenum mode -void;qgl;IndexMask;GLuint mask -void;qgl;IndexPointer;GLenum type, GLsizei stride, const GLvoid *pointer -void;qgl;Indexd;GLdouble c -void;qgl;Indexdv;const GLdouble *c -void;qgl;Indexf;GLfloat c -void;qgl;Indexfv;const GLfloat *c -void;qgl;Indexi;GLint c -void;qgl;Indexiv;const GLint *c -void;qgl;Indexs;GLshort c -void;qgl;Indexsv;const GLshort *c -void;qgl;Indexub;GLubyte c -void;qgl;Indexubv;const GLubyte *c -void;qgl;InitNames;void -void;qgl;InterleavedArrays;GLenum format, GLsizei stride, const GLvoid *pointer -GLboolean;qgl;IsEnabled;GLenum cap -GLboolean;qgl;IsList;GLuint list -GLboolean;qgl;IsTexture;GLuint texture -void;qgl;LightModelf;GLenum pname, GLfloat param -void;qgl;LightModelfv;GLenum pname, const GLfloat *params -void;qgl;LightModeli;GLenum pname, GLint param -void;qgl;LightModeliv;GLenum pname, const GLint *params -void;qgl;Lightf;GLenum light, GLenum pname, GLfloat param -void;qgl;Lightfv;GLenum light, GLenum pname, const GLfloat *params -void;qgl;Lighti;GLenum light, GLenum pname, GLint param -void;qgl;Lightiv;GLenum light, GLenum pname, const GLint *params -void;qgl;LineStipple;GLint factor, GLushort pattern -void;qgl;LineWidth;GLfloat width -void;qgl;ListBase;GLuint base -void;qgl;LoadIdentity;void -void;qgl;LoadMatrixd;const GLdouble *m -void;qgl;LoadMatrixf;const GLfloat *m -void;qgl;LoadName;GLuint name -void;qgl;LogicOp;GLenum opcode -void;qgl;Map1d;GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points -void;qgl;Map1f;GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points -void;qgl;Map2d;GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points -void;qgl;Map2f;GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points -void;qgl;MapGrid1d;GLint un, GLdouble u1, GLdouble u2 -void;qgl;MapGrid1f;GLint un, GLfloat u1, GLfloat u2 -void;qgl;MapGrid2d;GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2 -void;qgl;MapGrid2f;GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2 -void;qgl;Materialf;GLenum face, GLenum pname, GLfloat param -void;qgl;Materialfv;GLenum face, GLenum pname, const GLfloat *params -void;qgl;Materiali;GLenum face, GLenum pname, GLint param -void;qgl;Materialiv;GLenum face, GLenum pname, const GLint *params -void;qgl;MatrixMode;GLenum mode -void;qgl;MultMatrixd;const GLdouble *m -void;qgl;MultMatrixf;const GLfloat *m -void;qgl;NewList;GLuint list, GLenum mode -void;qgl;Normal3b;GLbyte nx, GLbyte ny, GLbyte nz -void;qgl;Normal3bv;const GLbyte *v -void;qgl;Normal3d;GLdouble nx, GLdouble ny, GLdouble nz -void;qgl;Normal3dv;const GLdouble *v -void;qgl;Normal3f;GLfloat nx, GLfloat ny, GLfloat nz -void;qgl;Normal3fv;const GLfloat *v -void;qgl;Normal3i;GLint nx, GLint ny, GLint nz -void;qgl;Normal3iv;const GLint *v -void;qgl;Normal3s;GLshort nx, GLshort ny, GLshort nz -void;qgl;Normal3sv;const GLshort *v -void;qgl;NormalPointer;GLenum type, GLsizei stride, const GLvoid *pointer -void;qgl;Ortho;GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar -void;qgl;PassThrough;GLfloat token -void;qgl;PixelMapfv;GLenum map, GLsizei mapsize, const GLfloat *values -void;qgl;PixelMapuiv;GLenum map, GLsizei mapsize, const GLuint *values -void;qgl;PixelMapusv;GLenum map, GLsizei mapsize, const GLushort *values -void;qgl;PixelStoref;GLenum pname, GLfloat param -void;qgl;PixelStorei;GLenum pname, GLint param -void;qgl;PixelTransferf;GLenum pname, GLfloat param -void;qgl;PixelTransferi;GLenum pname, GLint param -void;qgl;PixelZoom;GLfloat xfactor, GLfloat yfactor -void;qgl;PointSize;GLfloat size -void;qgl;PolygonMode;GLenum face, GLenum mode -void;qgl;PolygonOffset;GLfloat factor, GLfloat units -void;qgl;PolygonStipple;const GLubyte *mask -void;qgl;PopAttrib;void -void;qgl;PopClientAttrib;void -void;qgl;PopMatrix;void -void;qgl;PopName;void -void;qgl;PrioritizeTextures;GLsizei n, const GLuint *textures, const GLclampf *priorities -void;qgl;PushAttrib;GLbitfield mask -void;qgl;PushClientAttrib;GLbitfield mask -void;qgl;PushMatrix;void -void;qgl;PushName;GLuint name -void;qgl;RasterPos2d;GLdouble x, GLdouble y -void;qgl;RasterPos2dv;const GLdouble *v -void;qgl;RasterPos2f;GLfloat x, GLfloat y -void;qgl;RasterPos2fv;const GLfloat *v -void;qgl;RasterPos2i;GLint x, GLint y -void;qgl;RasterPos2iv;const GLint *v -void;qgl;RasterPos2s;GLshort x, GLshort y -void;qgl;RasterPos2sv;const GLshort *v -void;qgl;RasterPos3d;GLdouble x, GLdouble y, GLdouble z -void;qgl;RasterPos3dv;const GLdouble *v -void;qgl;RasterPos3f;GLfloat x, GLfloat y, GLfloat z -void;qgl;RasterPos3fv;const GLfloat *v -void;qgl;RasterPos3i;GLint x, GLint y, GLint z -void;qgl;RasterPos3iv;const GLint *v -void;qgl;RasterPos3s;GLshort x, GLshort y, GLshort z -void;qgl;RasterPos3sv;const GLshort *v -void;qgl;RasterPos4d;GLdouble x, GLdouble y, GLdouble z, GLdouble w -void;qgl;RasterPos4dv;const GLdouble *v -void;qgl;RasterPos4f;GLfloat x, GLfloat y, GLfloat z, GLfloat w -void;qgl;RasterPos4fv;const GLfloat *v -void;qgl;RasterPos4i;GLint x, GLint y, GLint z, GLint w -void;qgl;RasterPos4iv;const GLint *v -void;qgl;RasterPos4s;GLshort x, GLshort y, GLshort z, GLshort w -void;qgl;RasterPos4sv;const GLshort *v -void;qgl;ReadBuffer;GLenum mode -void;qgl;ReadPixels;GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels -void;qgl;Rectd;GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2 -void;qgl;Rectdv;const GLdouble *v1, const GLdouble *v2 -void;qgl;Rectf;GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2 -void;qgl;Rectfv;const GLfloat *v1, const GLfloat *v2 -void;qgl;Recti;GLint x1, GLint y1, GLint x2, GLint y2 -void;qgl;Rectiv;const GLint *v1, const GLint *v2 -void;qgl;Rects;GLshort x1, GLshort y1, GLshort x2, GLshort y2 -void;qgl;Rectsv;const GLshort *v1, const GLshort *v2 -GLint;qgl;RenderMode;GLenum mode -void;qgl;Rotated;GLdouble angle, GLdouble x, GLdouble y, GLdouble z -void;qgl;Rotatef;GLfloat angle, GLfloat x, GLfloat y, GLfloat z -void;qgl;Scaled;GLdouble x, GLdouble y, GLdouble z -void;qgl;Scalef;GLfloat x, GLfloat y, GLfloat z -void;qgl;Scissor;GLint x, GLint y, GLsizei width, GLsizei height -void;qgl;SelectBuffer;GLsizei size, GLuint *buffer -void;qgl;ShadeModel;GLenum mode -void;qgl;StencilFunc;GLenum func, GLint ref, GLuint mask -void;qgl;StencilMask;GLuint mask -void;qgl;StencilOp;GLenum fail, GLenum zfail, GLenum zpass -void;qgl;TexCoord1d;GLdouble s -void;qgl;TexCoord1dv;const GLdouble *v -void;qgl;TexCoord1f;GLfloat s -void;qgl;TexCoord1fv;const GLfloat *v -void;qgl;TexCoord1i;GLint s -void;qgl;TexCoord1iv;const GLint *v -void;qgl;TexCoord1s;GLshort s -void;qgl;TexCoord1sv;const GLshort *v -void;qgl;TexCoord2d;GLdouble s, GLdouble t -void;qgl;TexCoord2dv;const GLdouble *v -void;qgl;TexCoord2f;GLfloat s, GLfloat t -void;qgl;TexCoord2fv;const GLfloat *v -void;qgl;TexCoord2i;GLint s, GLint t -void;qgl;TexCoord2iv;const GLint *v -void;qgl;TexCoord2s;GLshort s, GLshort t -void;qgl;TexCoord2sv;const GLshort *v -void;qgl;TexCoord3d;GLdouble s, GLdouble t, GLdouble r -void;qgl;TexCoord3dv;const GLdouble *v -void;qgl;TexCoord3f;GLfloat s, GLfloat t, GLfloat r -void;qgl;TexCoord3fv;const GLfloat *v -void;qgl;TexCoord3i;GLint s, GLint t, GLint r -void;qgl;TexCoord3iv;const GLint *v -void;qgl;TexCoord3s;GLshort s, GLshort t, GLshort r -void;qgl;TexCoord3sv;const GLshort *v -void;qgl;TexCoord4d;GLdouble s, GLdouble t, GLdouble r, GLdouble q -void;qgl;TexCoord4dv;const GLdouble *v -void;qgl;TexCoord4f;GLfloat s, GLfloat t, GLfloat r, GLfloat q -void;qgl;TexCoord4fv;const GLfloat *v -void;qgl;TexCoord4i;GLint s, GLint t, GLint r, GLint q -void;qgl;TexCoord4iv;const GLint *v -void;qgl;TexCoord4s;GLshort s, GLshort t, GLshort r, GLshort q -void;qgl;TexCoord4sv;const GLshort *v -void;qgl;TexCoordPointer;GLint size, GLenum type, GLsizei stride, const GLvoid *pointer -void;qgl;TexEnvf;GLenum target, GLenum pname, GLfloat param -void;qgl;TexEnvfv;GLenum target, GLenum pname, const GLfloat *params -void;qgl;TexEnvi;GLenum target, GLenum pname, GLint param -void;qgl;TexEnviv;GLenum target, GLenum pname, const GLint *params -void;qgl;TexGend;GLenum coord, GLenum pname, GLdouble param -void;qgl;TexGendv;GLenum coord, GLenum pname, const GLdouble *params -void;qgl;TexGenf;GLenum coord, GLenum pname, GLfloat param -void;qgl;TexGenfv;GLenum coord, GLenum pname, const GLfloat *params -void;qgl;TexGeni;GLenum coord, GLenum pname, GLint param -void;qgl;TexGeniv;GLenum coord, GLenum pname, const GLint *params -void;qgl;TexImage1D;GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels -void;qgl;TexImage2D;GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels -void;qgl;TexParameterf;GLenum target, GLenum pname, GLfloat param -void;qgl;TexParameterfv;GLenum target, GLenum pname, const GLfloat *params -void;qgl;TexParameteri;GLenum target, GLenum pname, GLint param -void;qgl;TexParameteriv;GLenum target, GLenum pname, const GLint *params -void;qgl;TexSubImage1D;GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels -void;qgl;TexSubImage2D;GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels -void;qgl;Translated;GLdouble x, GLdouble y, GLdouble z -void;qgl;Translatef;GLfloat x, GLfloat y, GLfloat z -void;qgl;Vertex2d;GLdouble x, GLdouble y -void;qgl;Vertex2dv;const GLdouble *v -void;qgl;Vertex2f;GLfloat x, GLfloat y -void;qgl;Vertex2fv;const GLfloat *v -void;qgl;Vertex2i;GLint x, GLint y -void;qgl;Vertex2iv;const GLint *v -void;qgl;Vertex2s;GLshort x, GLshort y -void;qgl;Vertex2sv;const GLshort *v -void;qgl;Vertex3d;GLdouble x, GLdouble y, GLdouble z -void;qgl;Vertex3dv;const GLdouble *v -void;qgl;Vertex3f;GLfloat x, GLfloat y, GLfloat z -void;qgl;Vertex3fv;const GLfloat *v -void;qgl;Vertex3i;GLint x, GLint y, GLint z -void;qgl;Vertex3iv;const GLint *v -void;qgl;Vertex3s;GLshort x, GLshort y, GLshort z -void;qgl;Vertex3sv;const GLshort *v -void;qgl;Vertex4d;GLdouble x, GLdouble y, GLdouble z, GLdouble w -void;qgl;Vertex4dv;const GLdouble *v -void;qgl;Vertex4f;GLfloat x, GLfloat y, GLfloat z, GLfloat w -void;qgl;Vertex4fv;const GLfloat *v -void;qgl;Vertex4i;GLint x, GLint y, GLint z, GLint w -void;qgl;Vertex4iv;const GLint *v -void;qgl;Vertex4s;GLshort x, GLshort y, GLshort z, GLshort w -void;qgl;Vertex4sv;const GLshort *v -void;qgl;VertexPointer;GLint size, GLenum type, GLsizei stride, const GLvoid *pointer -void;qgl;Viewport;GLint x, GLint y, GLsizei width, GLsizei height diff --git a/neo/sys/gllog/glX.api b/neo/sys/gllog/glX.api deleted file mode 100644 index bc1946eb..00000000 --- a/neo/sys/gllog/glX.api +++ /dev/null @@ -1,6 +0,0 @@ -XVisualInfo *;qglX;ChooseVisual;Display *dpy, int screen, int *attribList -GLXContext;qglX;CreateContext;Display *dpy, XVisualInfo *vis, GLXContext shareList, Bool direct -void;qglX;DestroyContext;Display *dpy, GLXContext ctx -Bool;qglX;MakeCurrent;Display *dpy, GLXDrawable drawable, GLXContext ctx -void;qglX;SwapBuffers;Display *dpy, GLXDrawable drawable -GLExtension_t;qglX;GetProcAddressARB;const GLubyte *procName diff --git a/neo/sys/gllog/gl_def.m4 b/neo/sys/gllog/gl_def.m4 deleted file mode 100644 index 74f9f870..00000000 --- a/neo/sys/gllog/gl_def.m4 +++ /dev/null @@ -1,1098 +0,0 @@ -define(`gl_start', `0') -define(`gl_end', `335') -define(`wgl_start', `336') -define(`wgl_end', `357') -define(`glX_start', `358') -define(`glX_end', `363') -define(`f0_ret', `void') -define(`f0_name', `Accum') -define(`f0_params', ``GLenum op, GLfloat value'') -define(`f1_ret', `void') -define(`f1_name', `AlphaFunc') -define(`f1_params', ``GLenum func, GLclampf ref'') -define(`f2_ret', `GLboolean') -define(`f2_name', `AreTexturesResident') -define(`f2_params', ``GLsizei n, const GLuint *textures, GLboolean *residences'') -define(`f3_ret', `void') -define(`f3_name', `ArrayElement') -define(`f3_params', ``GLint i'') -define(`f4_ret', `void') -define(`f4_name', `Begin') -define(`f4_params', ``GLenum mode'') -define(`f5_ret', `void') -define(`f5_name', `BindTexture') -define(`f5_params', ``GLenum target, GLuint texture'') -define(`f6_ret', `void') -define(`f6_name', `Bitmap') -define(`f6_params', ``GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte *bitmap'') -define(`f7_ret', `void') -define(`f7_name', `BlendFunc') -define(`f7_params', ``GLenum sfactor, GLenum dfactor'') -define(`f8_ret', `void') -define(`f8_name', `CallList') -define(`f8_params', ``GLuint list'') -define(`f9_ret', `void') -define(`f9_name', `CallLists') -define(`f9_params', ``GLsizei n, GLenum type, const GLvoid *lists'') -define(`f10_ret', `void') -define(`f10_name', `Clear') -define(`f10_params', ``GLbitfield mask'') -define(`f11_ret', `void') -define(`f11_name', `ClearAccum') -define(`f11_params', ``GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha'') -define(`f12_ret', `void') -define(`f12_name', `ClearColor') -define(`f12_params', ``GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha'') -define(`f13_ret', `void') -define(`f13_name', `ClearDepth') -define(`f13_params', ``GLclampd depth'') -define(`f14_ret', `void') -define(`f14_name', `ClearIndex') -define(`f14_params', ``GLfloat c'') -define(`f15_ret', `void') -define(`f15_name', `ClearStencil') -define(`f15_params', ``GLint s'') -define(`f16_ret', `void') -define(`f16_name', `ClipPlane') -define(`f16_params', ``GLenum plane, const GLdouble *equation'') -define(`f17_ret', `void') -define(`f17_name', `Color3b') -define(`f17_params', ``GLbyte red, GLbyte green, GLbyte blue'') -define(`f18_ret', `void') -define(`f18_name', `Color3bv') -define(`f18_params', ``const GLbyte *v'') -define(`f19_ret', `void') -define(`f19_name', `Color3d') -define(`f19_params', ``GLdouble red, GLdouble green, GLdouble blue'') -define(`f20_ret', `void') -define(`f20_name', `Color3dv') -define(`f20_params', ``const GLdouble *v'') -define(`f21_ret', `void') -define(`f21_name', `Color3f') -define(`f21_params', ``GLfloat red, GLfloat green, GLfloat blue'') -define(`f22_ret', `void') -define(`f22_name', `Color3fv') -define(`f22_params', ``const GLfloat *v'') -define(`f23_ret', `void') -define(`f23_name', `Color3i') -define(`f23_params', ``GLint red, GLint green, GLint blue'') -define(`f24_ret', `void') -define(`f24_name', `Color3iv') -define(`f24_params', ``const GLint *v'') -define(`f25_ret', `void') -define(`f25_name', `Color3s') -define(`f25_params', ``GLshort red, GLshort green, GLshort blue'') -define(`f26_ret', `void') -define(`f26_name', `Color3sv') -define(`f26_params', ``const GLshort *v'') -define(`f27_ret', `void') -define(`f27_name', `Color3ub') -define(`f27_params', ``GLubyte red, GLubyte green, GLubyte blue'') -define(`f28_ret', `void') -define(`f28_name', `Color3ubv') -define(`f28_params', ``const GLubyte *v'') -define(`f29_ret', `void') -define(`f29_name', `Color3ui') -define(`f29_params', ``GLuint red, GLuint green, GLuint blue'') -define(`f30_ret', `void') -define(`f30_name', `Color3uiv') -define(`f30_params', ``const GLuint *v'') -define(`f31_ret', `void') -define(`f31_name', `Color3us') -define(`f31_params', ``GLushort red, GLushort green, GLushort blue'') -define(`f32_ret', `void') -define(`f32_name', `Color3usv') -define(`f32_params', ``const GLushort *v'') -define(`f33_ret', `void') -define(`f33_name', `Color4b') -define(`f33_params', ``GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha'') -define(`f34_ret', `void') -define(`f34_name', `Color4bv') -define(`f34_params', ``const GLbyte *v'') -define(`f35_ret', `void') -define(`f35_name', `Color4d') -define(`f35_params', ``GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha'') -define(`f36_ret', `void') -define(`f36_name', `Color4dv') -define(`f36_params', ``const GLdouble *v'') -define(`f37_ret', `void') -define(`f37_name', `Color4f') -define(`f37_params', ``GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha'') -define(`f38_ret', `void') -define(`f38_name', `Color4fv') -define(`f38_params', ``const GLfloat *v'') -define(`f39_ret', `void') -define(`f39_name', `Color4i') -define(`f39_params', ``GLint red, GLint green, GLint blue, GLint alpha'') -define(`f40_ret', `void') -define(`f40_name', `Color4iv') -define(`f40_params', ``const GLint *v'') -define(`f41_ret', `void') -define(`f41_name', `Color4s') -define(`f41_params', ``GLshort red, GLshort green, GLshort blue, GLshort alpha'') -define(`f42_ret', `void') -define(`f42_name', `Color4sv') -define(`f42_params', ``const GLshort *v'') -define(`f43_ret', `void') -define(`f43_name', `Color4ub') -define(`f43_params', ``GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha'') -define(`f44_ret', `void') -define(`f44_name', `Color4ubv') -define(`f44_params', ``const GLubyte *v'') -define(`f45_ret', `void') -define(`f45_name', `Color4ui') -define(`f45_params', ``GLuint red, GLuint green, GLuint blue, GLuint alpha'') -define(`f46_ret', `void') -define(`f46_name', `Color4uiv') -define(`f46_params', ``const GLuint *v'') -define(`f47_ret', `void') -define(`f47_name', `Color4us') -define(`f47_params', ``GLushort red, GLushort green, GLushort blue, GLushort alpha'') -define(`f48_ret', `void') -define(`f48_name', `Color4usv') -define(`f48_params', ``const GLushort *v'') -define(`f49_ret', `void') -define(`f49_name', `ColorMask') -define(`f49_params', ``GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha'') -define(`f50_ret', `void') -define(`f50_name', `ColorMaterial') -define(`f50_params', ``GLenum face, GLenum mode'') -define(`f51_ret', `void') -define(`f51_name', `ColorPointer') -define(`f51_params', ``GLint size, GLenum type, GLsizei stride, const GLvoid *pointer'') -define(`f52_ret', `void') -define(`f52_name', `CopyPixels') -define(`f52_params', ``GLint x, GLint y, GLsizei width, GLsizei height, GLenum type'') -define(`f53_ret', `void') -define(`f53_name', `CopyTexImage1D') -define(`f53_params', ``GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLint border'') -define(`f54_ret', `void') -define(`f54_name', `CopyTexImage2D') -define(`f54_params', ``GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border'') -define(`f55_ret', `void') -define(`f55_name', `CopyTexSubImage1D') -define(`f55_params', ``GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width'') -define(`f56_ret', `void') -define(`f56_name', `CopyTexSubImage2D') -define(`f56_params', ``GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height'') -define(`f57_ret', `void') -define(`f57_name', `CullFace') -define(`f57_params', ``GLenum mode'') -define(`f58_ret', `void') -define(`f58_name', `DeleteLists') -define(`f58_params', ``GLuint list, GLsizei range'') -define(`f59_ret', `void') -define(`f59_name', `DeleteTextures') -define(`f59_params', ``GLsizei n, const GLuint *textures'') -define(`f60_ret', `void') -define(`f60_name', `DepthFunc') -define(`f60_params', ``GLenum func'') -define(`f61_ret', `void') -define(`f61_name', `DepthMask') -define(`f61_params', ``GLboolean flag'') -define(`f62_ret', `void') -define(`f62_name', `DepthRange') -define(`f62_params', ``GLclampd zNear, GLclampd zFar'') -define(`f63_ret', `void') -define(`f63_name', `Disable') -define(`f63_params', ``GLenum cap'') -define(`f64_ret', `void') -define(`f64_name', `DisableClientState') -define(`f64_params', ``GLenum array'') -define(`f65_ret', `void') -define(`f65_name', `DrawArrays') -define(`f65_params', ``GLenum mode, GLint first, GLsizei count'') -define(`f66_ret', `void') -define(`f66_name', `DrawBuffer') -define(`f66_params', ``GLenum mode'') -define(`f67_ret', `void') -define(`f67_name', `DrawElements') -define(`f67_params', ``GLenum mode, GLsizei count, GLenum type, const GLvoid *indices'') -define(`f68_ret', `void') -define(`f68_name', `DrawPixels') -define(`f68_params', ``GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels'') -define(`f69_ret', `void') -define(`f69_name', `EdgeFlag') -define(`f69_params', ``GLboolean flag'') -define(`f70_ret', `void') -define(`f70_name', `EdgeFlagPointer') -define(`f70_params', ``GLsizei stride, const GLvoid *pointer'') -define(`f71_ret', `void') -define(`f71_name', `EdgeFlagv') -define(`f71_params', ``const GLboolean *flag'') -define(`f72_ret', `void') -define(`f72_name', `Enable') -define(`f72_params', ``GLenum cap'') -define(`f73_ret', `void') -define(`f73_name', `EnableClientState') -define(`f73_params', ``GLenum array'') -define(`f74_ret', `void') -define(`f74_name', `End') -define(`f74_params', ``void'') -define(`f75_ret', `void') -define(`f75_name', `EndList') -define(`f75_params', ``void'') -define(`f76_ret', `void') -define(`f76_name', `EvalCoord1d') -define(`f76_params', ``GLdouble u'') -define(`f77_ret', `void') -define(`f77_name', `EvalCoord1dv') -define(`f77_params', ``const GLdouble *u'') -define(`f78_ret', `void') -define(`f78_name', `EvalCoord1f') -define(`f78_params', ``GLfloat u'') -define(`f79_ret', `void') -define(`f79_name', `EvalCoord1fv') -define(`f79_params', ``const GLfloat *u'') -define(`f80_ret', `void') -define(`f80_name', `EvalCoord2d') -define(`f80_params', ``GLdouble u, GLdouble v'') -define(`f81_ret', `void') -define(`f81_name', `EvalCoord2dv') -define(`f81_params', ``const GLdouble *u'') -define(`f82_ret', `void') -define(`f82_name', `EvalCoord2f') -define(`f82_params', ``GLfloat u, GLfloat v'') -define(`f83_ret', `void') -define(`f83_name', `EvalCoord2fv') -define(`f83_params', ``const GLfloat *u'') -define(`f84_ret', `void') -define(`f84_name', `EvalMesh1') -define(`f84_params', ``GLenum mode, GLint i1, GLint i2'') -define(`f85_ret', `void') -define(`f85_name', `EvalMesh2') -define(`f85_params', ``GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2'') -define(`f86_ret', `void') -define(`f86_name', `EvalPoint1') -define(`f86_params', ``GLint i'') -define(`f87_ret', `void') -define(`f87_name', `EvalPoint2') -define(`f87_params', ``GLint i, GLint j'') -define(`f88_ret', `void') -define(`f88_name', `FeedbackBuffer') -define(`f88_params', ``GLsizei size, GLenum type, GLfloat *buffer'') -define(`f89_ret', `void') -define(`f89_name', `Finish') -define(`f89_params', ``void'') -define(`f90_ret', `void') -define(`f90_name', `Flush') -define(`f90_params', ``void'') -define(`f91_ret', `void') -define(`f91_name', `Fogf') -define(`f91_params', ``GLenum pname, GLfloat param'') -define(`f92_ret', `void') -define(`f92_name', `Fogfv') -define(`f92_params', ``GLenum pname, const GLfloat *params'') -define(`f93_ret', `void') -define(`f93_name', `Fogi') -define(`f93_params', ``GLenum pname, GLint param'') -define(`f94_ret', `void') -define(`f94_name', `Fogiv') -define(`f94_params', ``GLenum pname, const GLint *params'') -define(`f95_ret', `void') -define(`f95_name', `FrontFace') -define(`f95_params', ``GLenum mode'') -define(`f96_ret', `void') -define(`f96_name', `Frustum') -define(`f96_params', ``GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar'') -define(`f97_ret', `GLuint') -define(`f97_name', `GenLists') -define(`f97_params', ``GLsizei range'') -define(`f98_ret', `void') -define(`f98_name', `GenTextures') -define(`f98_params', ``GLsizei n, GLuint *textures'') -define(`f99_ret', `void') -define(`f99_name', `GetBooleanv') -define(`f99_params', ``GLenum pname, GLboolean *params'') -define(`f100_ret', `void') -define(`f100_name', `GetClipPlane') -define(`f100_params', ``GLenum plane, GLdouble *equation'') -define(`f101_ret', `void') -define(`f101_name', `GetDoublev') -define(`f101_params', ``GLenum pname, GLdouble *params'') -define(`f102_ret', `GLenum') -define(`f102_name', `GetError') -define(`f102_params', ``void'') -define(`f103_ret', `void') -define(`f103_name', `GetFloatv') -define(`f103_params', ``GLenum pname, GLfloat *params'') -define(`f104_ret', `void') -define(`f104_name', `GetIntegerv') -define(`f104_params', ``GLenum pname, GLint *params'') -define(`f105_ret', `void') -define(`f105_name', `GetLightfv') -define(`f105_params', ``GLenum light, GLenum pname, GLfloat *params'') -define(`f106_ret', `void') -define(`f106_name', `GetLightiv') -define(`f106_params', ``GLenum light, GLenum pname, GLint *params'') -define(`f107_ret', `void') -define(`f107_name', `GetMapdv') -define(`f107_params', ``GLenum target, GLenum query, GLdouble *v'') -define(`f108_ret', `void') -define(`f108_name', `GetMapfv') -define(`f108_params', ``GLenum target, GLenum query, GLfloat *v'') -define(`f109_ret', `void') -define(`f109_name', `GetMapiv') -define(`f109_params', ``GLenum target, GLenum query, GLint *v'') -define(`f110_ret', `void') -define(`f110_name', `GetMaterialfv') -define(`f110_params', ``GLenum face, GLenum pname, GLfloat *params'') -define(`f111_ret', `void') -define(`f111_name', `GetMaterialiv') -define(`f111_params', ``GLenum face, GLenum pname, GLint *params'') -define(`f112_ret', `void') -define(`f112_name', `GetPixelMapfv') -define(`f112_params', ``GLenum map, GLfloat *values'') -define(`f113_ret', `void') -define(`f113_name', `GetPixelMapuiv') -define(`f113_params', ``GLenum map, GLuint *values'') -define(`f114_ret', `void') -define(`f114_name', `GetPixelMapusv') -define(`f114_params', ``GLenum map, GLushort *values'') -define(`f115_ret', `void') -define(`f115_name', `GetPointerv') -define(`f115_params', ``GLenum pname, GLvoid* *params'') -define(`f116_ret', `void') -define(`f116_name', `GetPolygonStipple') -define(`f116_params', ``GLubyte *mask'') -define(`f117_ret', `const GLubyte *') -define(`f117_name', `GetString') -define(`f117_params', ``GLenum name'') -define(`f118_ret', `void') -define(`f118_name', `GetTexEnvfv') -define(`f118_params', ``GLenum target, GLenum pname, GLfloat *params'') -define(`f119_ret', `void') -define(`f119_name', `GetTexEnviv') -define(`f119_params', ``GLenum target, GLenum pname, GLint *params'') -define(`f120_ret', `void') -define(`f120_name', `GetTexGendv') -define(`f120_params', ``GLenum coord, GLenum pname, GLdouble *params'') -define(`f121_ret', `void') -define(`f121_name', `GetTexGenfv') -define(`f121_params', ``GLenum coord, GLenum pname, GLfloat *params'') -define(`f122_ret', `void') -define(`f122_name', `GetTexGeniv') -define(`f122_params', ``GLenum coord, GLenum pname, GLint *params'') -define(`f123_ret', `void') -define(`f123_name', `GetTexImage') -define(`f123_params', ``GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels'') -define(`f124_ret', `void') -define(`f124_name', `GetTexLevelParameterfv') -define(`f124_params', ``GLenum target, GLint level, GLenum pname, GLfloat *params'') -define(`f125_ret', `void') -define(`f125_name', `GetTexLevelParameteriv') -define(`f125_params', ``GLenum target, GLint level, GLenum pname, GLint *params'') -define(`f126_ret', `void') -define(`f126_name', `GetTexParameterfv') -define(`f126_params', ``GLenum target, GLenum pname, GLfloat *params'') -define(`f127_ret', `void') -define(`f127_name', `GetTexParameteriv') -define(`f127_params', ``GLenum target, GLenum pname, GLint *params'') -define(`f128_ret', `void') -define(`f128_name', `Hint') -define(`f128_params', ``GLenum target, GLenum mode'') -define(`f129_ret', `void') -define(`f129_name', `IndexMask') -define(`f129_params', ``GLuint mask'') -define(`f130_ret', `void') -define(`f130_name', `IndexPointer') -define(`f130_params', ``GLenum type, GLsizei stride, const GLvoid *pointer'') -define(`f131_ret', `void') -define(`f131_name', `Indexd') -define(`f131_params', ``GLdouble c'') -define(`f132_ret', `void') -define(`f132_name', `Indexdv') -define(`f132_params', ``const GLdouble *c'') -define(`f133_ret', `void') -define(`f133_name', `Indexf') -define(`f133_params', ``GLfloat c'') -define(`f134_ret', `void') -define(`f134_name', `Indexfv') -define(`f134_params', ``const GLfloat *c'') -define(`f135_ret', `void') -define(`f135_name', `Indexi') -define(`f135_params', ``GLint c'') -define(`f136_ret', `void') -define(`f136_name', `Indexiv') -define(`f136_params', ``const GLint *c'') -define(`f137_ret', `void') -define(`f137_name', `Indexs') -define(`f137_params', ``GLshort c'') -define(`f138_ret', `void') -define(`f138_name', `Indexsv') -define(`f138_params', ``const GLshort *c'') -define(`f139_ret', `void') -define(`f139_name', `Indexub') -define(`f139_params', ``GLubyte c'') -define(`f140_ret', `void') -define(`f140_name', `Indexubv') -define(`f140_params', ``const GLubyte *c'') -define(`f141_ret', `void') -define(`f141_name', `InitNames') -define(`f141_params', ``void'') -define(`f142_ret', `void') -define(`f142_name', `InterleavedArrays') -define(`f142_params', ``GLenum format, GLsizei stride, const GLvoid *pointer'') -define(`f143_ret', `GLboolean') -define(`f143_name', `IsEnabled') -define(`f143_params', ``GLenum cap'') -define(`f144_ret', `GLboolean') -define(`f144_name', `IsList') -define(`f144_params', ``GLuint list'') -define(`f145_ret', `GLboolean') -define(`f145_name', `IsTexture') -define(`f145_params', ``GLuint texture'') -define(`f146_ret', `void') -define(`f146_name', `LightModelf') -define(`f146_params', ``GLenum pname, GLfloat param'') -define(`f147_ret', `void') -define(`f147_name', `LightModelfv') -define(`f147_params', ``GLenum pname, const GLfloat *params'') -define(`f148_ret', `void') -define(`f148_name', `LightModeli') -define(`f148_params', ``GLenum pname, GLint param'') -define(`f149_ret', `void') -define(`f149_name', `LightModeliv') -define(`f149_params', ``GLenum pname, const GLint *params'') -define(`f150_ret', `void') -define(`f150_name', `Lightf') -define(`f150_params', ``GLenum light, GLenum pname, GLfloat param'') -define(`f151_ret', `void') -define(`f151_name', `Lightfv') -define(`f151_params', ``GLenum light, GLenum pname, const GLfloat *params'') -define(`f152_ret', `void') -define(`f152_name', `Lighti') -define(`f152_params', ``GLenum light, GLenum pname, GLint param'') -define(`f153_ret', `void') -define(`f153_name', `Lightiv') -define(`f153_params', ``GLenum light, GLenum pname, const GLint *params'') -define(`f154_ret', `void') -define(`f154_name', `LineStipple') -define(`f154_params', ``GLint factor, GLushort pattern'') -define(`f155_ret', `void') -define(`f155_name', `LineWidth') -define(`f155_params', ``GLfloat width'') -define(`f156_ret', `void') -define(`f156_name', `ListBase') -define(`f156_params', ``GLuint base'') -define(`f157_ret', `void') -define(`f157_name', `LoadIdentity') -define(`f157_params', ``void'') -define(`f158_ret', `void') -define(`f158_name', `LoadMatrixd') -define(`f158_params', ``const GLdouble *m'') -define(`f159_ret', `void') -define(`f159_name', `LoadMatrixf') -define(`f159_params', ``const GLfloat *m'') -define(`f160_ret', `void') -define(`f160_name', `LoadName') -define(`f160_params', ``GLuint name'') -define(`f161_ret', `void') -define(`f161_name', `LogicOp') -define(`f161_params', ``GLenum opcode'') -define(`f162_ret', `void') -define(`f162_name', `Map1d') -define(`f162_params', ``GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points'') -define(`f163_ret', `void') -define(`f163_name', `Map1f') -define(`f163_params', ``GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points'') -define(`f164_ret', `void') -define(`f164_name', `Map2d') -define(`f164_params', ``GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points'') -define(`f165_ret', `void') -define(`f165_name', `Map2f') -define(`f165_params', ``GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points'') -define(`f166_ret', `void') -define(`f166_name', `MapGrid1d') -define(`f166_params', ``GLint un, GLdouble u1, GLdouble u2'') -define(`f167_ret', `void') -define(`f167_name', `MapGrid1f') -define(`f167_params', ``GLint un, GLfloat u1, GLfloat u2'') -define(`f168_ret', `void') -define(`f168_name', `MapGrid2d') -define(`f168_params', ``GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2'') -define(`f169_ret', `void') -define(`f169_name', `MapGrid2f') -define(`f169_params', ``GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2'') -define(`f170_ret', `void') -define(`f170_name', `Materialf') -define(`f170_params', ``GLenum face, GLenum pname, GLfloat param'') -define(`f171_ret', `void') -define(`f171_name', `Materialfv') -define(`f171_params', ``GLenum face, GLenum pname, const GLfloat *params'') -define(`f172_ret', `void') -define(`f172_name', `Materiali') -define(`f172_params', ``GLenum face, GLenum pname, GLint param'') -define(`f173_ret', `void') -define(`f173_name', `Materialiv') -define(`f173_params', ``GLenum face, GLenum pname, const GLint *params'') -define(`f174_ret', `void') -define(`f174_name', `MatrixMode') -define(`f174_params', ``GLenum mode'') -define(`f175_ret', `void') -define(`f175_name', `MultMatrixd') -define(`f175_params', ``const GLdouble *m'') -define(`f176_ret', `void') -define(`f176_name', `MultMatrixf') -define(`f176_params', ``const GLfloat *m'') -define(`f177_ret', `void') -define(`f177_name', `NewList') -define(`f177_params', ``GLuint list, GLenum mode'') -define(`f178_ret', `void') -define(`f178_name', `Normal3b') -define(`f178_params', ``GLbyte nx, GLbyte ny, GLbyte nz'') -define(`f179_ret', `void') -define(`f179_name', `Normal3bv') -define(`f179_params', ``const GLbyte *v'') -define(`f180_ret', `void') -define(`f180_name', `Normal3d') -define(`f180_params', ``GLdouble nx, GLdouble ny, GLdouble nz'') -define(`f181_ret', `void') -define(`f181_name', `Normal3dv') -define(`f181_params', ``const GLdouble *v'') -define(`f182_ret', `void') -define(`f182_name', `Normal3f') -define(`f182_params', ``GLfloat nx, GLfloat ny, GLfloat nz'') -define(`f183_ret', `void') -define(`f183_name', `Normal3fv') -define(`f183_params', ``const GLfloat *v'') -define(`f184_ret', `void') -define(`f184_name', `Normal3i') -define(`f184_params', ``GLint nx, GLint ny, GLint nz'') -define(`f185_ret', `void') -define(`f185_name', `Normal3iv') -define(`f185_params', ``const GLint *v'') -define(`f186_ret', `void') -define(`f186_name', `Normal3s') -define(`f186_params', ``GLshort nx, GLshort ny, GLshort nz'') -define(`f187_ret', `void') -define(`f187_name', `Normal3sv') -define(`f187_params', ``const GLshort *v'') -define(`f188_ret', `void') -define(`f188_name', `NormalPointer') -define(`f188_params', ``GLenum type, GLsizei stride, const GLvoid *pointer'') -define(`f189_ret', `void') -define(`f189_name', `Ortho') -define(`f189_params', ``GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar'') -define(`f190_ret', `void') -define(`f190_name', `PassThrough') -define(`f190_params', ``GLfloat token'') -define(`f191_ret', `void') -define(`f191_name', `PixelMapfv') -define(`f191_params', ``GLenum map, GLsizei mapsize, const GLfloat *values'') -define(`f192_ret', `void') -define(`f192_name', `PixelMapuiv') -define(`f192_params', ``GLenum map, GLsizei mapsize, const GLuint *values'') -define(`f193_ret', `void') -define(`f193_name', `PixelMapusv') -define(`f193_params', ``GLenum map, GLsizei mapsize, const GLushort *values'') -define(`f194_ret', `void') -define(`f194_name', `PixelStoref') -define(`f194_params', ``GLenum pname, GLfloat param'') -define(`f195_ret', `void') -define(`f195_name', `PixelStorei') -define(`f195_params', ``GLenum pname, GLint param'') -define(`f196_ret', `void') -define(`f196_name', `PixelTransferf') -define(`f196_params', ``GLenum pname, GLfloat param'') -define(`f197_ret', `void') -define(`f197_name', `PixelTransferi') -define(`f197_params', ``GLenum pname, GLint param'') -define(`f198_ret', `void') -define(`f198_name', `PixelZoom') -define(`f198_params', ``GLfloat xfactor, GLfloat yfactor'') -define(`f199_ret', `void') -define(`f199_name', `PointSize') -define(`f199_params', ``GLfloat size'') -define(`f200_ret', `void') -define(`f200_name', `PolygonMode') -define(`f200_params', ``GLenum face, GLenum mode'') -define(`f201_ret', `void') -define(`f201_name', `PolygonOffset') -define(`f201_params', ``GLfloat factor, GLfloat units'') -define(`f202_ret', `void') -define(`f202_name', `PolygonStipple') -define(`f202_params', ``const GLubyte *mask'') -define(`f203_ret', `void') -define(`f203_name', `PopAttrib') -define(`f203_params', ``void'') -define(`f204_ret', `void') -define(`f204_name', `PopClientAttrib') -define(`f204_params', ``void'') -define(`f205_ret', `void') -define(`f205_name', `PopMatrix') -define(`f205_params', ``void'') -define(`f206_ret', `void') -define(`f206_name', `PopName') -define(`f206_params', ``void'') -define(`f207_ret', `void') -define(`f207_name', `PrioritizeTextures') -define(`f207_params', ``GLsizei n, const GLuint *textures, const GLclampf *priorities'') -define(`f208_ret', `void') -define(`f208_name', `PushAttrib') -define(`f208_params', ``GLbitfield mask'') -define(`f209_ret', `void') -define(`f209_name', `PushClientAttrib') -define(`f209_params', ``GLbitfield mask'') -define(`f210_ret', `void') -define(`f210_name', `PushMatrix') -define(`f210_params', ``void'') -define(`f211_ret', `void') -define(`f211_name', `PushName') -define(`f211_params', ``GLuint name'') -define(`f212_ret', `void') -define(`f212_name', `RasterPos2d') -define(`f212_params', ``GLdouble x, GLdouble y'') -define(`f213_ret', `void') -define(`f213_name', `RasterPos2dv') -define(`f213_params', ``const GLdouble *v'') -define(`f214_ret', `void') -define(`f214_name', `RasterPos2f') -define(`f214_params', ``GLfloat x, GLfloat y'') -define(`f215_ret', `void') -define(`f215_name', `RasterPos2fv') -define(`f215_params', ``const GLfloat *v'') -define(`f216_ret', `void') -define(`f216_name', `RasterPos2i') -define(`f216_params', ``GLint x, GLint y'') -define(`f217_ret', `void') -define(`f217_name', `RasterPos2iv') -define(`f217_params', ``const GLint *v'') -define(`f218_ret', `void') -define(`f218_name', `RasterPos2s') -define(`f218_params', ``GLshort x, GLshort y'') -define(`f219_ret', `void') -define(`f219_name', `RasterPos2sv') -define(`f219_params', ``const GLshort *v'') -define(`f220_ret', `void') -define(`f220_name', `RasterPos3d') -define(`f220_params', ``GLdouble x, GLdouble y, GLdouble z'') -define(`f221_ret', `void') -define(`f221_name', `RasterPos3dv') -define(`f221_params', ``const GLdouble *v'') -define(`f222_ret', `void') -define(`f222_name', `RasterPos3f') -define(`f222_params', ``GLfloat x, GLfloat y, GLfloat z'') -define(`f223_ret', `void') -define(`f223_name', `RasterPos3fv') -define(`f223_params', ``const GLfloat *v'') -define(`f224_ret', `void') -define(`f224_name', `RasterPos3i') -define(`f224_params', ``GLint x, GLint y, GLint z'') -define(`f225_ret', `void') -define(`f225_name', `RasterPos3iv') -define(`f225_params', ``const GLint *v'') -define(`f226_ret', `void') -define(`f226_name', `RasterPos3s') -define(`f226_params', ``GLshort x, GLshort y, GLshort z'') -define(`f227_ret', `void') -define(`f227_name', `RasterPos3sv') -define(`f227_params', ``const GLshort *v'') -define(`f228_ret', `void') -define(`f228_name', `RasterPos4d') -define(`f228_params', ``GLdouble x, GLdouble y, GLdouble z, GLdouble w'') -define(`f229_ret', `void') -define(`f229_name', `RasterPos4dv') -define(`f229_params', ``const GLdouble *v'') -define(`f230_ret', `void') -define(`f230_name', `RasterPos4f') -define(`f230_params', ``GLfloat x, GLfloat y, GLfloat z, GLfloat w'') -define(`f231_ret', `void') -define(`f231_name', `RasterPos4fv') -define(`f231_params', ``const GLfloat *v'') -define(`f232_ret', `void') -define(`f232_name', `RasterPos4i') -define(`f232_params', ``GLint x, GLint y, GLint z, GLint w'') -define(`f233_ret', `void') -define(`f233_name', `RasterPos4iv') -define(`f233_params', ``const GLint *v'') -define(`f234_ret', `void') -define(`f234_name', `RasterPos4s') -define(`f234_params', ``GLshort x, GLshort y, GLshort z, GLshort w'') -define(`f235_ret', `void') -define(`f235_name', `RasterPos4sv') -define(`f235_params', ``const GLshort *v'') -define(`f236_ret', `void') -define(`f236_name', `ReadBuffer') -define(`f236_params', ``GLenum mode'') -define(`f237_ret', `void') -define(`f237_name', `ReadPixels') -define(`f237_params', ``GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels'') -define(`f238_ret', `void') -define(`f238_name', `Rectd') -define(`f238_params', ``GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2'') -define(`f239_ret', `void') -define(`f239_name', `Rectdv') -define(`f239_params', ``const GLdouble *v1, const GLdouble *v2'') -define(`f240_ret', `void') -define(`f240_name', `Rectf') -define(`f240_params', ``GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2'') -define(`f241_ret', `void') -define(`f241_name', `Rectfv') -define(`f241_params', ``const GLfloat *v1, const GLfloat *v2'') -define(`f242_ret', `void') -define(`f242_name', `Recti') -define(`f242_params', ``GLint x1, GLint y1, GLint x2, GLint y2'') -define(`f243_ret', `void') -define(`f243_name', `Rectiv') -define(`f243_params', ``const GLint *v1, const GLint *v2'') -define(`f244_ret', `void') -define(`f244_name', `Rects') -define(`f244_params', ``GLshort x1, GLshort y1, GLshort x2, GLshort y2'') -define(`f245_ret', `void') -define(`f245_name', `Rectsv') -define(`f245_params', ``const GLshort *v1, const GLshort *v2'') -define(`f246_ret', `GLint') -define(`f246_name', `RenderMode') -define(`f246_params', ``GLenum mode'') -define(`f247_ret', `void') -define(`f247_name', `Rotated') -define(`f247_params', ``GLdouble angle, GLdouble x, GLdouble y, GLdouble z'') -define(`f248_ret', `void') -define(`f248_name', `Rotatef') -define(`f248_params', ``GLfloat angle, GLfloat x, GLfloat y, GLfloat z'') -define(`f249_ret', `void') -define(`f249_name', `Scaled') -define(`f249_params', ``GLdouble x, GLdouble y, GLdouble z'') -define(`f250_ret', `void') -define(`f250_name', `Scalef') -define(`f250_params', ``GLfloat x, GLfloat y, GLfloat z'') -define(`f251_ret', `void') -define(`f251_name', `Scissor') -define(`f251_params', ``GLint x, GLint y, GLsizei width, GLsizei height'') -define(`f252_ret', `void') -define(`f252_name', `SelectBuffer') -define(`f252_params', ``GLsizei size, GLuint *buffer'') -define(`f253_ret', `void') -define(`f253_name', `ShadeModel') -define(`f253_params', ``GLenum mode'') -define(`f254_ret', `void') -define(`f254_name', `StencilFunc') -define(`f254_params', ``GLenum func, GLint ref, GLuint mask'') -define(`f255_ret', `void') -define(`f255_name', `StencilMask') -define(`f255_params', ``GLuint mask'') -define(`f256_ret', `void') -define(`f256_name', `StencilOp') -define(`f256_params', ``GLenum fail, GLenum zfail, GLenum zpass'') -define(`f257_ret', `void') -define(`f257_name', `TexCoord1d') -define(`f257_params', ``GLdouble s'') -define(`f258_ret', `void') -define(`f258_name', `TexCoord1dv') -define(`f258_params', ``const GLdouble *v'') -define(`f259_ret', `void') -define(`f259_name', `TexCoord1f') -define(`f259_params', ``GLfloat s'') -define(`f260_ret', `void') -define(`f260_name', `TexCoord1fv') -define(`f260_params', ``const GLfloat *v'') -define(`f261_ret', `void') -define(`f261_name', `TexCoord1i') -define(`f261_params', ``GLint s'') -define(`f262_ret', `void') -define(`f262_name', `TexCoord1iv') -define(`f262_params', ``const GLint *v'') -define(`f263_ret', `void') -define(`f263_name', `TexCoord1s') -define(`f263_params', ``GLshort s'') -define(`f264_ret', `void') -define(`f264_name', `TexCoord1sv') -define(`f264_params', ``const GLshort *v'') -define(`f265_ret', `void') -define(`f265_name', `TexCoord2d') -define(`f265_params', ``GLdouble s, GLdouble t'') -define(`f266_ret', `void') -define(`f266_name', `TexCoord2dv') -define(`f266_params', ``const GLdouble *v'') -define(`f267_ret', `void') -define(`f267_name', `TexCoord2f') -define(`f267_params', ``GLfloat s, GLfloat t'') -define(`f268_ret', `void') -define(`f268_name', `TexCoord2fv') -define(`f268_params', ``const GLfloat *v'') -define(`f269_ret', `void') -define(`f269_name', `TexCoord2i') -define(`f269_params', ``GLint s, GLint t'') -define(`f270_ret', `void') -define(`f270_name', `TexCoord2iv') -define(`f270_params', ``const GLint *v'') -define(`f271_ret', `void') -define(`f271_name', `TexCoord2s') -define(`f271_params', ``GLshort s, GLshort t'') -define(`f272_ret', `void') -define(`f272_name', `TexCoord2sv') -define(`f272_params', ``const GLshort *v'') -define(`f273_ret', `void') -define(`f273_name', `TexCoord3d') -define(`f273_params', ``GLdouble s, GLdouble t, GLdouble r'') -define(`f274_ret', `void') -define(`f274_name', `TexCoord3dv') -define(`f274_params', ``const GLdouble *v'') -define(`f275_ret', `void') -define(`f275_name', `TexCoord3f') -define(`f275_params', ``GLfloat s, GLfloat t, GLfloat r'') -define(`f276_ret', `void') -define(`f276_name', `TexCoord3fv') -define(`f276_params', ``const GLfloat *v'') -define(`f277_ret', `void') -define(`f277_name', `TexCoord3i') -define(`f277_params', ``GLint s, GLint t, GLint r'') -define(`f278_ret', `void') -define(`f278_name', `TexCoord3iv') -define(`f278_params', ``const GLint *v'') -define(`f279_ret', `void') -define(`f279_name', `TexCoord3s') -define(`f279_params', ``GLshort s, GLshort t, GLshort r'') -define(`f280_ret', `void') -define(`f280_name', `TexCoord3sv') -define(`f280_params', ``const GLshort *v'') -define(`f281_ret', `void') -define(`f281_name', `TexCoord4d') -define(`f281_params', ``GLdouble s, GLdouble t, GLdouble r, GLdouble q'') -define(`f282_ret', `void') -define(`f282_name', `TexCoord4dv') -define(`f282_params', ``const GLdouble *v'') -define(`f283_ret', `void') -define(`f283_name', `TexCoord4f') -define(`f283_params', ``GLfloat s, GLfloat t, GLfloat r, GLfloat q'') -define(`f284_ret', `void') -define(`f284_name', `TexCoord4fv') -define(`f284_params', ``const GLfloat *v'') -define(`f285_ret', `void') -define(`f285_name', `TexCoord4i') -define(`f285_params', ``GLint s, GLint t, GLint r, GLint q'') -define(`f286_ret', `void') -define(`f286_name', `TexCoord4iv') -define(`f286_params', ``const GLint *v'') -define(`f287_ret', `void') -define(`f287_name', `TexCoord4s') -define(`f287_params', ``GLshort s, GLshort t, GLshort r, GLshort q'') -define(`f288_ret', `void') -define(`f288_name', `TexCoord4sv') -define(`f288_params', ``const GLshort *v'') -define(`f289_ret', `void') -define(`f289_name', `TexCoordPointer') -define(`f289_params', ``GLint size, GLenum type, GLsizei stride, const GLvoid *pointer'') -define(`f290_ret', `void') -define(`f290_name', `TexEnvf') -define(`f290_params', ``GLenum target, GLenum pname, GLfloat param'') -define(`f291_ret', `void') -define(`f291_name', `TexEnvfv') -define(`f291_params', ``GLenum target, GLenum pname, const GLfloat *params'') -define(`f292_ret', `void') -define(`f292_name', `TexEnvi') -define(`f292_params', ``GLenum target, GLenum pname, GLint param'') -define(`f293_ret', `void') -define(`f293_name', `TexEnviv') -define(`f293_params', ``GLenum target, GLenum pname, const GLint *params'') -define(`f294_ret', `void') -define(`f294_name', `TexGend') -define(`f294_params', ``GLenum coord, GLenum pname, GLdouble param'') -define(`f295_ret', `void') -define(`f295_name', `TexGendv') -define(`f295_params', ``GLenum coord, GLenum pname, const GLdouble *params'') -define(`f296_ret', `void') -define(`f296_name', `TexGenf') -define(`f296_params', ``GLenum coord, GLenum pname, GLfloat param'') -define(`f297_ret', `void') -define(`f297_name', `TexGenfv') -define(`f297_params', ``GLenum coord, GLenum pname, const GLfloat *params'') -define(`f298_ret', `void') -define(`f298_name', `TexGeni') -define(`f298_params', ``GLenum coord, GLenum pname, GLint param'') -define(`f299_ret', `void') -define(`f299_name', `TexGeniv') -define(`f299_params', ``GLenum coord, GLenum pname, const GLint *params'') -define(`f300_ret', `void') -define(`f300_name', `TexImage1D') -define(`f300_params', ``GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels'') -define(`f301_ret', `void') -define(`f301_name', `TexImage2D') -define(`f301_params', ``GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels'') -define(`f302_ret', `void') -define(`f302_name', `TexParameterf') -define(`f302_params', ``GLenum target, GLenum pname, GLfloat param'') -define(`f303_ret', `void') -define(`f303_name', `TexParameterfv') -define(`f303_params', ``GLenum target, GLenum pname, const GLfloat *params'') -define(`f304_ret', `void') -define(`f304_name', `TexParameteri') -define(`f304_params', ``GLenum target, GLenum pname, GLint param'') -define(`f305_ret', `void') -define(`f305_name', `TexParameteriv') -define(`f305_params', ``GLenum target, GLenum pname, const GLint *params'') -define(`f306_ret', `void') -define(`f306_name', `TexSubImage1D') -define(`f306_params', ``GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels'') -define(`f307_ret', `void') -define(`f307_name', `TexSubImage2D') -define(`f307_params', ``GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels'') -define(`f308_ret', `void') -define(`f308_name', `Translated') -define(`f308_params', ``GLdouble x, GLdouble y, GLdouble z'') -define(`f309_ret', `void') -define(`f309_name', `Translatef') -define(`f309_params', ``GLfloat x, GLfloat y, GLfloat z'') -define(`f310_ret', `void') -define(`f310_name', `Vertex2d') -define(`f310_params', ``GLdouble x, GLdouble y'') -define(`f311_ret', `void') -define(`f311_name', `Vertex2dv') -define(`f311_params', ``const GLdouble *v'') -define(`f312_ret', `void') -define(`f312_name', `Vertex2f') -define(`f312_params', ``GLfloat x, GLfloat y'') -define(`f313_ret', `void') -define(`f313_name', `Vertex2fv') -define(`f313_params', ``const GLfloat *v'') -define(`f314_ret', `void') -define(`f314_name', `Vertex2i') -define(`f314_params', ``GLint x, GLint y'') -define(`f315_ret', `void') -define(`f315_name', `Vertex2iv') -define(`f315_params', ``const GLint *v'') -define(`f316_ret', `void') -define(`f316_name', `Vertex2s') -define(`f316_params', ``GLshort x, GLshort y'') -define(`f317_ret', `void') -define(`f317_name', `Vertex2sv') -define(`f317_params', ``const GLshort *v'') -define(`f318_ret', `void') -define(`f318_name', `Vertex3d') -define(`f318_params', ``GLdouble x, GLdouble y, GLdouble z'') -define(`f319_ret', `void') -define(`f319_name', `Vertex3dv') -define(`f319_params', ``const GLdouble *v'') -define(`f320_ret', `void') -define(`f320_name', `Vertex3f') -define(`f320_params', ``GLfloat x, GLfloat y, GLfloat z'') -define(`f321_ret', `void') -define(`f321_name', `Vertex3fv') -define(`f321_params', ``const GLfloat *v'') -define(`f322_ret', `void') -define(`f322_name', `Vertex3i') -define(`f322_params', ``GLint x, GLint y, GLint z'') -define(`f323_ret', `void') -define(`f323_name', `Vertex3iv') -define(`f323_params', ``const GLint *v'') -define(`f324_ret', `void') -define(`f324_name', `Vertex3s') -define(`f324_params', ``GLshort x, GLshort y, GLshort z'') -define(`f325_ret', `void') -define(`f325_name', `Vertex3sv') -define(`f325_params', ``const GLshort *v'') -define(`f326_ret', `void') -define(`f326_name', `Vertex4d') -define(`f326_params', ``GLdouble x, GLdouble y, GLdouble z, GLdouble w'') -define(`f327_ret', `void') -define(`f327_name', `Vertex4dv') -define(`f327_params', ``const GLdouble *v'') -define(`f328_ret', `void') -define(`f328_name', `Vertex4f') -define(`f328_params', ``GLfloat x, GLfloat y, GLfloat z, GLfloat w'') -define(`f329_ret', `void') -define(`f329_name', `Vertex4fv') -define(`f329_params', ``const GLfloat *v'') -define(`f330_ret', `void') -define(`f330_name', `Vertex4i') -define(`f330_params', ``GLint x, GLint y, GLint z, GLint w'') -define(`f331_ret', `void') -define(`f331_name', `Vertex4iv') -define(`f331_params', ``const GLint *v'') -define(`f332_ret', `void') -define(`f332_name', `Vertex4s') -define(`f332_params', ``GLshort x, GLshort y, GLshort z, GLshort w'') -define(`f333_ret', `void') -define(`f333_name', `Vertex4sv') -define(`f333_params', ``const GLshort *v'') -define(`f334_ret', `void') -define(`f334_name', `VertexPointer') -define(`f334_params', ``GLint size, GLenum type, GLsizei stride, const GLvoid *pointer'') -define(`f335_ret', `void') -define(`f335_name', `Viewport') -define(`f335_params', ``GLint x, GLint y, GLsizei width, GLsizei height'') -define(`f336_ret', `int') -define(`f336_name', `SwapIntervalEXT') -define(`f336_params', `` int interval '') -define(`f337_ret', `int') -define(`f337_name', `ChoosePixelFormat ') -define(`f337_params', ``HDC, CONST PIXELFORMATDESCRIPTOR *'') -define(`f338_ret', `int') -define(`f338_name', `DescribePixelFormat') -define(`f338_params', ``HDC, int, UINT, LPPIXELFORMATDESCRIPTOR'') -define(`f339_ret', `int') -define(`f339_name', `GetPixelFormat') -define(`f339_params', ``HDC'') -define(`f340_ret', `BOOL') -define(`f340_name', `SetPixelFormat') -define(`f340_params', ``HDC, int, CONST PIXELFORMATDESCRIPTOR *'') -define(`f341_ret', `BOOL') -define(`f341_name', `SwapBuffers') -define(`f341_params', ``HDC'') -define(`f342_ret', `BOOL') -define(`f342_name', `CopyContext') -define(`f342_params', ``HGLRC, HGLRC, UINT'') -define(`f343_ret', `HGLRC') -define(`f343_name', `CreateContext') -define(`f343_params', ``HDC'') -define(`f344_ret', `HGLRC') -define(`f344_name', `CreateLayerContext') -define(`f344_params', ``HDC, int'') -define(`f345_ret', `BOOL') -define(`f345_name', `DeleteContext') -define(`f345_params', ``HGLRC'') -define(`f346_ret', `HGLRC') -define(`f346_name', `GetCurrentContext') -define(`f346_params', ``VOID'') -define(`f347_ret', `HDC') -define(`f347_name', `GetCurrentDC') -define(`f347_params', ``VOID'') -define(`f348_ret', `PROC') -define(`f348_name', `GetProcAddress') -define(`f348_params', ``LPCSTR'') -define(`f349_ret', `BOOL') -define(`f349_name', `MakeCurrent') -define(`f349_params', ``HDC, HGLRC'') -define(`f350_ret', `BOOL') -define(`f350_name', `ShareLists') -define(`f350_params', ``HGLRC, HGLRC'') -define(`f351_ret', `BOOL') -define(`f351_name', `UseFontBitmaps') -define(`f351_params', ``HDC, DWORD, DWORD, DWORD'') -define(`f352_ret', `BOOL') -define(`f352_name', `UseFontOutlines') -define(`f352_params', ``HDC, DWORD, DWORD, DWORD, FLOAT, FLOAT, int, LPGLYPHMETRICSFLOAT'') -define(`f353_ret', `BOOL') -define(`f353_name', `DescribeLayerPlane') -define(`f353_params', ``HDC, int, int, UINT, LPLAYERPLANEDESCRIPTOR'') -define(`f354_ret', `int') -define(`f354_name', `SetLayerPaletteEntries') -define(`f354_params', ``HDC, int, int, int, CONST COLORREF *'') -define(`f355_ret', `int') -define(`f355_name', `GetLayerPaletteEntries') -define(`f355_params', ``HDC, int, int, int, COLORREF *'') -define(`f356_ret', `BOOL') -define(`f356_name', `RealizeLayerPalette') -define(`f356_params', ``HDC, int, BOOL'') -define(`f357_ret', `BOOL') -define(`f357_name', `SwapLayerBuffers') -define(`f357_params', ``HDC, UINT'') -define(`f358_ret', `XVisualInfo *') -define(`f358_name', `ChooseVisual') -define(`f358_params', ``Display *dpy, int screen, int *attribList'') -define(`f359_ret', `GLXContext') -define(`f359_name', `CreateContext') -define(`f359_params', ``Display *dpy, XVisualInfo *vis, GLXContext shareList, Bool direct'') -define(`f360_ret', `void') -define(`f360_name', `DestroyContext') -define(`f360_params', ``Display *dpy, GLXContext ctx'') -define(`f361_ret', `Bool') -define(`f361_name', `MakeCurrent') -define(`f361_params', ``Display *dpy, GLXDrawable drawable, GLXContext ctx'') -define(`f362_ret', `void') -define(`f362_name', `SwapBuffers') -define(`f362_params', ``Display *dpy, GLXDrawable drawable'') -define(`f363_ret', `GLExtension_t') -define(`f363_name', `GetProcAddressARB') -define(`f363_params', ``const GLubyte *procname'') diff --git a/neo/sys/gllog/gl_extensions.cpp.m4 b/neo/sys/gllog/gl_extensions.cpp.m4 deleted file mode 100644 index d1aa2d89..00000000 --- a/neo/sys/gllog/gl_extensions.cpp.m4 +++ /dev/null @@ -1,61 +0,0 @@ -#include "idlib/precompiled.h" -#pragma hdrstop - -dnl ===================================================== -dnl utils -dnl ===================================================== - -define(`forloop', - `pushdef(`$1', `$2')_forloop(`$1', `$2', `$3', `$4')popdef(`$1')') -define(`_forloop', - `$4`'ifelse($1, `$3', , - `define(`$1', incr($1))_forloop(`$1', `$2', `$3', `$4')')') - -dnl ===================================================== -dnl GL extensions -dnl ===================================================== - -typedef struct { - const char *ext_name; -} glExtName_t; - -glExtName_t glExtNames[] = { - { NULL } -}; - -static void StubFunction( void ) { } - -GLExtension_t GLimp_ExtensionPointer( const char *name ) { - if ( strstr( name, "wgl" ) == name ) { - common->DPrintf( "WARNING: GLimp_ExtensionPointer for '%s'\n", name ); - } -#ifdef ID_DEDICATED - common->Printf("GLimp_ExtensionPointer %s\n", name); - return StubFunction; -#else - #if 0 - glExtName_t *n; - for ( n = glExtNames ; n->ext_name ; n++ ) { - if ( !strcmp( name, n->ext_name ) ) { - common->DPrintf("matched GL extension: %s\n", name ); - break; - } - } - if ( ! n->ext_name ) { - common->DPrintf("unmatched GL extension name: %s\n", name ); - } - #endif - GLExtension_t ret; - #if defined(__linux__) - // for some reason glXGetProcAddressARB doesn't work on RH9? - ret = qglXGetProcAddressARB((const GLubyte *) name); - if ( !ret ) { - common->Printf("glXGetProcAddressARB failed: \"%s\"\n", name); - return StubFunction; - } - #else - #error Need OS define - #endif - return ret; -#endif -} diff --git a/neo/sys/gllog/logfunc.py b/neo/sys/gllog/logfunc.py deleted file mode 100644 index 320f8b75..00000000 --- a/neo/sys/gllog/logfunc.py +++ /dev/null @@ -1,75 +0,0 @@ -#!/usr/bin/env python -# generate logging code -# this requires an analysis of the parameters for verbose and do actual call - -import sys, string, re -from read import read_gl - -def do_logfunc(f_in, f_out): - - (gl, wgl, glX) = read_gl(f_in) - - for l in (gl, glX): - for t in l: - # process ret type to strip trailing spaces - t[0] = string.strip(t[0]) - f_out.write('static %s APIENTRY log%s(%s) {\n' % ( t[0], t[2], t[3] )) - # work on parameters - base_params = string.split(t[3], ',') - #f_out.write('// %s\n' % repr(base_params)) - # init format string and parameter list - params = [] - format = t[1][1:] + t[2] - # a general help list - types = [] - names = [] - for i in base_params: - regex = re.compile('([a-zA-Z0-9]*)$') - name = regex.search(i).group(1) - type = string.strip(i[0:len(i)-len(name)]) - # catch type with no name - if (len(type) == 0): - type = name - name = '' - #f_out.write('// type: "%s" name: "%s"\n' % (type, name)) - types.append(type) - names.append(name) - # verbose the types - if (type == 'GLenum'): - format += ' %s' - params.append( 'EnumString(' + name + ')' ) - elif (type == 'GLfloat' or type == 'GLclampf' or type == 'GLdouble'): - format += ' %g' - params.append( name ) - elif (type == 'GLint' or type == 'GLuint' or type == 'GLsizei' or type == 'GLbyte' or type == 'GLshort' - or type == 'GLubyte' or type == 'GLushort'): - format += ' %d' - params.append( name ) - elif (type == 'GLboolean'): - format += ' %s' - params.append( name + ' ? "Y" : "N"' ) - elif (type == 'void'): - pass - else: - f_out.write('// unknown type: "%s" name: "%s"\n' % (type, name)) - format += ' \'' + type + ' ' + name + '\'' - f_out.write('\tfprintf( tr.logFile, "' + format + '\\n"') - for par in params: - f_out.write(', ' + par) - f_out.write(' );\n') - if (t[0] != 'void'): - f_out.write('\treturn dll%s(' % t[2]) - else: - f_out.write('\tdll%s(' % t[2]) - started = 0 - for i in names: - if (started): - f_out.write(', ') - else: - started = 1 - f_out.write(i) - f_out.write(');\n') - f_out.write('}\n\n') - -if __name__ == '__main__': - do_logfunc(sys.stdin, sys.stdout) diff --git a/neo/sys/gllog/read.py b/neo/sys/gllog/read.py deleted file mode 100644 index fec3a1e3..00000000 --- a/neo/sys/gllog/read.py +++ /dev/null @@ -1,26 +0,0 @@ -# utility module to process incoming GL description - -import sys, string - -def read_gl(f_in): - buffer = f_in.read() - lines = string.split(buffer, '\n') - - gl = [] - wgl = [] - glX = [] - - for line in lines: - if ( len(line) ): # drop empty lines - tokens = string.split(line, ';') - if ( tokens[1] == 'qgl' ): - gl.append(tokens) - elif ( tokens[1] == 'qwgl' ): - wgl.append(tokens) - elif ( tokens[1] == 'qglX' ): - glX.append(tokens) - else: - sys.stderr.write('ERROR: unknown type %s\n' % tokens[1]) - raise "abort" - - return (gl, wgl, glX) diff --git a/neo/sys/gllog/wgl.api b/neo/sys/gllog/wgl.api deleted file mode 100644 index 7ba7ceca..00000000 --- a/neo/sys/gllog/wgl.api +++ /dev/null @@ -1,22 +0,0 @@ -int ;qwgl;SwapIntervalEXT; int interval -int ;qwgl;ChoosePixelFormat ;HDC, CONST PIXELFORMATDESCRIPTOR * -int ;qwgl;DescribePixelFormat;HDC, int, UINT, LPPIXELFORMATDESCRIPTOR -int ;qwgl;GetPixelFormat;HDC -BOOL ;qwgl;SetPixelFormat;HDC, int, CONST PIXELFORMATDESCRIPTOR * -BOOL ;qwgl;SwapBuffers;HDC -BOOL ;qwgl;CopyContext;HGLRC, HGLRC, UINT -HGLRC ;qwgl;CreateContext;HDC -HGLRC ;qwgl;CreateLayerContext;HDC, int -BOOL ;qwgl;DeleteContext;HGLRC -HGLRC ;qwgl;GetCurrentContext;VOID -HDC ;qwgl;GetCurrentDC;VOID -PROC ;qwgl;GetProcAddress;LPCSTR -BOOL ;qwgl;MakeCurrent;HDC, HGLRC -BOOL ;qwgl;ShareLists;HGLRC, HGLRC -BOOL ;qwgl;UseFontBitmaps;HDC, DWORD, DWORD, DWORD -BOOL ;qwgl;UseFontOutlines;HDC, DWORD, DWORD, DWORD, FLOAT, FLOAT, int, LPGLYPHMETRICSFLOAT -BOOL ;qwgl;DescribeLayerPlane;HDC, int, int, UINT, LPLAYERPLANEDESCRIPTOR -int ;qwgl;SetLayerPaletteEntries;HDC, int, int, int, CONST COLORREF * -int ;qwgl;GetLayerPaletteEntries;HDC, int, int, int, COLORREF * -BOOL ;qwgl;RealizeLayerPalette;HDC, int, BOOL -BOOL ;qwgl;SwapLayerBuffers;HDC, UINT diff --git a/neo/sys/linux/dedicated.cpp b/neo/sys/linux/dedicated.cpp index 6338495b..fac3c273 100644 --- a/neo/sys/linux/dedicated.cpp +++ b/neo/sys/linux/dedicated.cpp @@ -71,21 +71,4 @@ int Sys_GetVideoRam( void ) { GL ========== */ - -void GLimp_EnableLogging( bool enable ) { } - -bool GLimp_Init( glimpParms_t a ) { return true; } - -void GLimp_SetGamma( unsigned short red[256], - unsigned short green[256], - unsigned short blue[256] ) { } - -void GLimp_Shutdown( void ) { } - -void GLimp_SwapBuffers( void ) { } - -void GLimp_DeactivateContext( void ) { } - -void GLimp_ActivateContext( void ) { } - bool GLimp_SetScreenParms( glimpParms_t parms ) { return true; } diff --git a/neo/sys/linux/glimp.cpp b/neo/sys/linux/glimp.cpp index 286d843c..d2fc4ea3 100644 --- a/neo/sys/linux/glimp.cpp +++ b/neo/sys/linux/glimp.cpp @@ -64,16 +64,14 @@ void GLimp_WakeBackEnd(void *a) { common->DPrintf("GLimp_WakeBackEnd stub\n"); } -#ifdef ID_GL_HARDLINK void GLimp_EnableLogging(bool log) { static bool logging; if (log != logging) { - common->DPrintf("GLimp_EnableLogging - disabled at compile time (ID_GL_HARDLINK)\n"); + common->DPrintf("GLimp_EnableLogging - not available\n"); logging = log; } } -#endif void GLimp_FrontEndSleep() { common->DPrintf("GLimp_FrontEndSleep stub\n"); @@ -188,10 +186,6 @@ void GLimp_Shutdown() { qglXDestroyContext( dpy, ctx ); -#if !defined( ID_GL_HARDLINK ) - GLimp_dlclose(); -#endif - XDestroyWindow( dpy, win ); if ( vidmode_active ) { XF86VidModeSwitchToMode( dpy, scrnum, vidmodes[0] ); @@ -563,12 +557,6 @@ bool GLimp_Init( glimpParms_t a ) { return false; } -#ifndef ID_GL_HARDLINK - if ( !GLimp_dlopen() ) { - return false; - } -#endif - if (!GLX_Init(a)) { return false; } @@ -665,3 +653,33 @@ int Sys_GetVideoRam( void ) { run_once = 64; return run_once; } + +/* +=================== +GLimp_ExtensionPointer +=================== +*/ +static void StubFunction( void ) { } + +GLExtension_t GLimp_ExtensionPointer( const char *name ) { + if ( strstr( name, "wgl" ) == name ) { + common->DPrintf( "WARNING: GLimp_ExtensionPointer for '%s'\n", name ); + } +#ifdef ID_DEDICATED + common->Printf("GLimp_ExtensionPointer %s\n", name); + return StubFunction; +#else + GLExtension_t ret; + #if defined(__unix__) + // for some reason glXGetProcAddressARB doesn't work on RH9? + ret = qglXGetProcAddressARB((const GLubyte *) name); + if ( !ret ) { + common->Printf("glXGetProcAddressARB failed: \"%s\"\n", name); + return StubFunction; + } + #else + #error Need OS define + #endif + return ret; +#endif +} diff --git a/neo/sys/linux/glimp_dlopen.cpp.m4 b/neo/sys/linux/glimp_dlopen.cpp.m4 deleted file mode 100644 index cbca8038..00000000 --- a/neo/sys/linux/glimp_dlopen.cpp.m4 +++ /dev/null @@ -1,135 +0,0 @@ -#include "idlib/precompiled.h" -#include "renderer/tr_local.h" -#include "sys/linux/local.h" -#include "glimp_local.h" - -#include - -dnl ===================================================== -dnl utils -dnl ===================================================== - -define(`forloop', - `pushdef(`$1', `$2')_forloop(`$1', `$2', `$3', `$4')popdef(`$1')') -define(`_forloop', - `$4`'ifelse($1, `$3', , - `define(`$1', incr($1))_forloop(`$1', `$2', `$3', `$4')')') - -dnl ===================================================== -dnl the gl wgl glX definitions -dnl ===================================================== -include(../gllog/gl_def.m4) - -dnl ===================================================== -dnl qgl function ptrs -dnl ===================================================== - -define(`instance_funcptr', ``$1' ( APIENTRY * qgl`$2' )(`$3');') -forloop(`i', gl_start, gl_end, `instance_funcptr(indir(`f'i`_ret'), indir(`f'i`_name'), indir(`f'i`_params')) -') - -dnl ===================================================== -dnl glX function ptrs -dnl ===================================================== - -define(`instance_funcptr', ``$1' ( * qglX`$2' )(`$3');') -forloop(`i', glX_start, glX_end, `instance_funcptr(indir(`f'i`_ret'), indir(`f'i`_name'), indir(`f'i`_params')) -') - -dnl ===================================================== -dnl dll ptrs -dnl those are the actual dlsym'ed pointers -dnl logging configuration redirects qgl / qglX to either log or dll versions -dnl ===================================================== - -define(`instance_funcptr', ``$1' ( * dll`$2' )(`$3');') -forloop(`i', gl_start, gl_end, `instance_funcptr(indir(`f'i`_ret'), indir(`f'i`_name'), indir(`f'i`_params')) -') -forloop(`i', glX_start, glX_end, `instance_funcptr(indir(`f'i`_ret'), indir(`f'i`_name'), indir(`f'i`_params')) -') - -dnl ===================================================== -dnl code -dnl ===================================================== - -/* -====================== -GLimp_BindNative -====================== -*/ -void GLimp_BindNative() { -define(`assign_funcptr', `qgl`$1' = dll`$1';') -forloop(`i', gl_start, gl_end, `assign_funcptr(indir(`f'i`_name')) -') - -define(`assign_funcptr', `qglX`$1' = dll`$1';') -forloop(`i', glX_start, glX_end, `assign_funcptr(indir(`f'i`_name')) -') -} - -static void *glHandle = NULL; - -/* -====================== -GLimp_dlsym_failed -====================== -*/ -void GLimp_dlsym_failed(const char *name) { - common->DPrintf("dlsym(%s) failed: %s\n", name, dlerror()); -} - -/* -====================== -GLimp_dlopen -====================== -*/ -bool GLimp_dlopen() { - const char *driverName = r_glDriver.GetString()[0] ? r_glDriver.GetString() : "libGL.so.1"; - common->Printf("dlopen(%s)\n", driverName); - if ( !( glHandle = dlopen( driverName, RTLD_NOW | RTLD_GLOBAL ) ) ) { - common->DPrintf("dlopen(%s) failed: %s\n", driverName, dlerror()); - return false; - } - - // dlsym the symbols - -define(`dlsym_funcptr', `dll`$2' = ( `$1' ( APIENTRY *)(`$3') ) dlsym( glHandle, "gl`$2'" );') -define(`safe_dlsym_funcptr', `dlsym_funcptr(`$1', `$2', `$3') -if (!dll`$2') { GLimp_dlsym_failed("gl`$2'"); return false; }') -forloop(`i', gl_start, gl_end, `safe_dlsym_funcptr(indir(`f'i`_ret'), indir(`f'i`_name'), indir(`f'i`_params')) -') - -define(`dlsym_funcptr', `dll`$2' = ( `$1' ( APIENTRY *)(`$3') ) dlsym( glHandle, "glX`$2'" );') -define(`safe_dlsym_funcptr', `dlsym_funcptr(`$1', `$2', `$3') -if (!dll`$2') { GLimp_dlsym_failed("glX`$2'"); return false; }') -forloop(`i', glX_start, glX_end, `safe_dlsym_funcptr(indir(`f'i`_ret'), indir(`f'i`_name'), indir(`f'i`_params')) -') - - // make the initial binding - GLimp_BindNative(); - - return true; -} - -/* -====================== -GLimp_dlclose -====================== -*/ -void GLimp_dlclose() { - if ( !glHandle ) { - common->DPrintf("dlclose: GL handle is NULL\n"); - } else { - dlclose( glHandle ); - glHandle = NULL; - } - -define(`reset_funcptr', `qgl`$1' = NULL;') -forloop(`i', gl_start, gl_end, `reset_funcptr(indir(`f'i`_name')) -') - -define(`reset_funcptr', `qglX`$1' = NULL;') -forloop(`i', glX_start, glX_end, `reset_funcptr(indir(`f'i`_name')) -') - -} diff --git a/neo/sys/linux/glimp_glenum.h b/neo/sys/linux/glimp_glenum.h deleted file mode 100644 index 0693a02b..00000000 --- a/neo/sys/linux/glimp_glenum.h +++ /dev/null @@ -1,434 +0,0 @@ -/* -=========================================================================== - -Doom 3 GPL Source Code -Copyright (C) 1999-2011 id Software LLC, a ZeniMax Media company. - -This file is part of the Doom 3 GPL Source Code ("Doom 3 Source Code"). - -Doom 3 Source Code is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -Doom 3 Source Code 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with Doom 3 Source Code. If not, see . - -In addition, the Doom 3 Source Code is also subject to certain additional terms. You should have received a copy of these additional terms immediately following the terms and conditions of the GNU General Public License which accompanied the Doom 3 Source Code. If not, please request a copy in writing from id Software at the address below. - -If you have questions concerning this license or the applicable additional terms, you may contact in writing id Software LLC, c/o ZeniMax Media Inc., Suite 120, Rockville, Maryland 20850 USA. - -=========================================================================== -*/ -DEF(GL_FALSE) -DEF(GL_TRUE) -DEF(GL_BYTE) -DEF(GL_UNSIGNED_BYTE) -DEF(GL_SHORT) -DEF(GL_UNSIGNED_SHORT) -DEF(GL_INT) -DEF(GL_UNSIGNED_INT) -DEF(GL_FLOAT) -DEF(GL_DOUBLE) -DEF(GL_TEXTURE_CUBE_MAP_EXT) -DEF(GL_TEXTURE_3D) -DEF(GL_TEXTURE_2D) -DEF(GL_BLEND) -DEF(GL_DEPTH_TEST) -DEF(GL_CULL_FACE) -DEF(GL_CLIP_PLANE0) -DEF(GL_COLOR_ARRAY) -DEF(GL_TEXTURE_COORD_ARRAY) -DEF(GL_VERTEX_ARRAY) -DEF(GL_ALPHA_TEST) -DEF(GL_TEXTURE_GEN_S) -DEF(GL_TEXTURE_GEN_T) -DEF(GL_TEXTURE_GEN_R) -DEF(GL_TEXTURE_GEN_Q) -DEF(GL_STENCIL_TEST) -DEF(GL_POLYGON_OFFSET_FILL) -DEF(GL_TRIANGLES) -DEF(GL_TRIANGLE_STRIP) -DEF(GL_TRIANGLE_FAN) -DEF(GL_QUADS) -DEF(GL_QUAD_STRIP) -DEF(GL_POLYGON) -DEF(GL_POINTS) -DEF(GL_LINES) -DEF(GL_LINE_STRIP) -DEF(GL_LINE_LOOP) -DEF(GL_ALWAYS) -DEF(GL_NEVER) -DEF(GL_LEQUAL) -DEF(GL_LESS) -DEF(GL_EQUAL) -DEF(GL_GREATER) -DEF(GL_GEQUAL) -DEF(GL_NOTEQUAL) -DEF(GL_ONE) -DEF(GL_ZERO) -DEF(GL_SRC_ALPHA) -DEF(GL_ONE_MINUS_SRC_ALPHA) -DEF(GL_DST_COLOR) -DEF(GL_ONE_MINUS_DST_COLOR) -DEF(GL_DST_ALPHA) -DEF(GL_MODELVIEW) -DEF(GL_PROJECTION) -DEF(GL_TEXTURE) -DEF(GL_NONE) -DEF(GL_FRONT_LEFT) -DEF(GL_FRONT_RIGHT) -DEF(GL_BACK_LEFT) -DEF(GL_BACK_RIGHT) -DEF(GL_FRONT) -DEF(GL_BACK) -DEF(GL_LEFT) -DEF(GL_RIGHT) -DEF(GL_FRONT_AND_BACK) -DEF(GL_AUX0) -DEF(GL_AUX1) -DEF(GL_AUX2) -DEF(GL_AUX3) -DEF(GL_CURRENT_COLOR) -DEF(GL_CURRENT_INDEX) -DEF(GL_CURRENT_NORMAL) -DEF(GL_CURRENT_TEXTURE_COORDS) -DEF(GL_CURRENT_RASTER_COLOR) -DEF(GL_CURRENT_RASTER_INDEX) -DEF(GL_CURRENT_RASTER_TEXTURE_COORDS) -DEF(GL_CURRENT_RASTER_POSITION) -DEF(GL_CURRENT_RASTER_POSITION_VALID) -DEF(GL_CURRENT_RASTER_DISTANCE) -DEF(GL_POINT_SMOOTH) -DEF(GL_POINT_SIZE) -DEF(GL_POINT_SIZE_RANGE) -DEF(GL_POINT_SIZE_GRANULARITY) -DEF(GL_LINE_SMOOTH) -DEF(GL_LINE_WIDTH) -DEF(GL_LINE_WIDTH_RANGE) -DEF(GL_LINE_WIDTH_GRANULARITY) -DEF(GL_LINE_STIPPLE) -DEF(GL_LINE_STIPPLE_PATTERN) -DEF(GL_LINE_STIPPLE_REPEAT) -DEF(GL_LIST_MODE) -DEF(GL_MAX_LIST_NESTING) -DEF(GL_LIST_BASE) -DEF(GL_LIST_INDEX) -DEF(GL_POLYGON_MODE) -DEF(GL_POLYGON_SMOOTH) -DEF(GL_POLYGON_STIPPLE) -DEF(GL_EDGE_FLAG) -DEF(GL_CULL_FACE) -DEF(GL_CULL_FACE_MODE) -DEF(GL_FRONT_FACE) -DEF(GL_LIGHTING) -DEF(GL_LIGHT_MODEL_LOCAL_VIEWER) -DEF(GL_LIGHT_MODEL_TWO_SIDE) -DEF(GL_LIGHT_MODEL_AMBIENT) -DEF(GL_SHADE_MODEL) -DEF(GL_COLOR_MATERIAL_FACE) -DEF(GL_COLOR_MATERIAL_PARAMETER) -DEF(GL_COLOR_MATERIAL) -DEF(GL_FOG) -DEF(GL_FOG_INDEX) -DEF(GL_FOG_DENSITY) -DEF(GL_FOG_START) -DEF(GL_FOG_END) -DEF(GL_FOG_MODE) -DEF(GL_FOG_COLOR) -DEF(GL_DEPTH_RANGE) -DEF(GL_DEPTH_TEST) -DEF(GL_DEPTH_WRITEMASK) -DEF(GL_DEPTH_CLEAR_VALUE) -DEF(GL_DEPTH_FUNC) -DEF(GL_ACCUM_CLEAR_VALUE) -DEF(GL_STENCIL_TEST) -DEF(GL_STENCIL_CLEAR_VALUE) -DEF(GL_STENCIL_FUNC) -DEF(GL_STENCIL_VALUE_MASK) -DEF(GL_STENCIL_FAIL) -DEF(GL_STENCIL_PASS_DEPTH_FAIL) -DEF(GL_STENCIL_PASS_DEPTH_PASS) -DEF(GL_STENCIL_REF) -DEF(GL_STENCIL_WRITEMASK) -DEF(GL_MATRIX_MODE) -DEF(GL_NORMALIZE) -DEF(GL_VIEWPORT) -DEF(GL_MODELVIEW_STACK_DEPTH) -DEF(GL_PROJECTION_STACK_DEPTH) -DEF(GL_TEXTURE_STACK_DEPTH) -DEF(GL_MODELVIEW_MATRIX) -DEF(GL_PROJECTION_MATRIX) -DEF(GL_TEXTURE_MATRIX) -DEF(GL_ATTRIB_STACK_DEPTH) -DEF(GL_CLIENT_ATTRIB_STACK_DEPTH) -DEF(GL_ALPHA_TEST) -DEF(GL_ALPHA_TEST_FUNC) -DEF(GL_ALPHA_TEST_REF) -DEF(GL_DITHER) -DEF(GL_BLEND_DST) -DEF(GL_BLEND_SRC) -DEF(GL_BLEND) -DEF(GL_LOGIC_OP_MODE) -DEF(GL_INDEX_LOGIC_OP) -DEF(GL_COLOR_LOGIC_OP) -DEF(GL_AUX_BUFFERS) -DEF(GL_DRAW_BUFFER) -DEF(GL_READ_BUFFER) -DEF(GL_SCISSOR_BOX) -DEF(GL_SCISSOR_TEST) -DEF(GL_INDEX_CLEAR_VALUE) -DEF(GL_INDEX_WRITEMASK) -DEF(GL_COLOR_CLEAR_VALUE) -DEF(GL_COLOR_WRITEMASK) -DEF(GL_INDEX_MODE) -DEF(GL_RGBA_MODE) -DEF(GL_DOUBLEBUFFER) -DEF(GL_STEREO) -DEF(GL_RENDER_MODE) -DEF(GL_PERSPECTIVE_CORRECTION_HINT) -DEF(GL_POINT_SMOOTH_HINT) -DEF(GL_LINE_SMOOTH_HINT) -DEF(GL_POLYGON_SMOOTH_HINT) -DEF(GL_FOG_HINT) -DEF(GL_TEXTURE_GEN_S) -DEF(GL_TEXTURE_GEN_T) -DEF(GL_TEXTURE_GEN_R) -DEF(GL_TEXTURE_GEN_Q) -DEF(GL_PIXEL_MAP_I_TO_I) -DEF(GL_PIXEL_MAP_S_TO_S) -DEF(GL_PIXEL_MAP_I_TO_R) -DEF(GL_PIXEL_MAP_I_TO_G) -DEF(GL_PIXEL_MAP_I_TO_B) -DEF(GL_PIXEL_MAP_I_TO_A) -DEF(GL_PIXEL_MAP_R_TO_R) -DEF(GL_PIXEL_MAP_G_TO_G) -DEF(GL_PIXEL_MAP_B_TO_B) -DEF(GL_PIXEL_MAP_A_TO_A) -DEF(GL_PIXEL_MAP_I_TO_I_SIZE) -DEF(GL_PIXEL_MAP_S_TO_S_SIZE) -DEF(GL_PIXEL_MAP_I_TO_R_SIZE) -DEF(GL_PIXEL_MAP_I_TO_G_SIZE) -DEF(GL_PIXEL_MAP_I_TO_B_SIZE) -DEF(GL_PIXEL_MAP_I_TO_A_SIZE) -DEF(GL_PIXEL_MAP_R_TO_R_SIZE) -DEF(GL_PIXEL_MAP_G_TO_G_SIZE) -DEF(GL_PIXEL_MAP_B_TO_B_SIZE) -DEF(GL_PIXEL_MAP_A_TO_A_SIZE) -DEF(GL_UNPACK_SWAP_BYTES) -DEF(GL_UNPACK_LSB_FIRST) -DEF(GL_UNPACK_ROW_LENGTH) -DEF(GL_UNPACK_SKIP_ROWS) -DEF(GL_UNPACK_SKIP_PIXELS) -DEF(GL_UNPACK_ALIGNMENT) -DEF(GL_PACK_SWAP_BYTES) -DEF(GL_PACK_LSB_FIRST) -DEF(GL_PACK_ROW_LENGTH) -DEF(GL_PACK_SKIP_ROWS) -DEF(GL_PACK_SKIP_PIXELS) -DEF(GL_PACK_ALIGNMENT) -DEF(GL_MAP_COLOR) -DEF(GL_MAP_STENCIL) -DEF(GL_INDEX_SHIFT) -DEF(GL_INDEX_OFFSET) -DEF(GL_RED_SCALE) -DEF(GL_RED_BIAS) -DEF(GL_ZOOM_X) -DEF(GL_ZOOM_Y) -DEF(GL_GREEN_SCALE) -DEF(GL_GREEN_BIAS) -DEF(GL_BLUE_SCALE) -DEF(GL_BLUE_BIAS) -DEF(GL_ALPHA_SCALE) -DEF(GL_ALPHA_BIAS) -DEF(GL_DEPTH_SCALE) -DEF(GL_DEPTH_BIAS) -DEF(GL_MAX_EVAL_ORDER) -DEF(GL_MAX_LIGHTS) -DEF(GL_MAX_CLIP_PLANES) -DEF(GL_MAX_TEXTURE_SIZE) -DEF(GL_MAX_PIXEL_MAP_TABLE) -DEF(GL_MAX_ATTRIB_STACK_DEPTH) -DEF(GL_MAX_MODELVIEW_STACK_DEPTH) -DEF(GL_MAX_NAME_STACK_DEPTH) -DEF(GL_MAX_PROJECTION_STACK_DEPTH) -DEF(GL_MAX_TEXTURE_STACK_DEPTH) -DEF(GL_MAX_VIEWPORT_DIMS) -DEF(GL_MAX_CLIENT_ATTRIB_STACK_DEPTH) -DEF(GL_SUBPIXEL_BITS) -DEF(GL_INDEX_BITS) -DEF(GL_RED_BITS) -DEF(GL_GREEN_BITS) -DEF(GL_BLUE_BITS) -DEF(GL_ALPHA_BITS) -DEF(GL_DEPTH_BITS) -DEF(GL_STENCIL_BITS) -DEF(GL_ACCUM_RED_BITS) -DEF(GL_ACCUM_GREEN_BITS) -DEF(GL_ACCUM_BLUE_BITS) -DEF(GL_ACCUM_ALPHA_BITS) -DEF(GL_NAME_STACK_DEPTH) -DEF(GL_AUTO_NORMAL) -DEF(GL_MAP1_COLOR_4) -DEF(GL_MAP1_INDEX) -DEF(GL_MAP1_NORMAL) -DEF(GL_MAP1_TEXTURE_COORD_1) -DEF(GL_MAP1_TEXTURE_COORD_2) -DEF(GL_MAP1_TEXTURE_COORD_3) -DEF(GL_MAP1_TEXTURE_COORD_4) -DEF(GL_MAP1_VERTEX_3) -DEF(GL_MAP1_VERTEX_4) -DEF(GL_MAP2_COLOR_4) -DEF(GL_MAP2_INDEX) -DEF(GL_MAP2_NORMAL) -DEF(GL_MAP2_TEXTURE_COORD_1) -DEF(GL_MAP2_TEXTURE_COORD_2) -DEF(GL_MAP2_TEXTURE_COORD_3) -DEF(GL_MAP2_TEXTURE_COORD_4) -DEF(GL_MAP2_VERTEX_3) -DEF(GL_MAP2_VERTEX_4) -DEF(GL_MAP1_GRID_DOMAIN) -DEF(GL_MAP1_GRID_SEGMENTS) -DEF(GL_MAP2_GRID_DOMAIN) -DEF(GL_MAP2_GRID_SEGMENTS) -DEF(GL_TEXTURE_1D) -DEF(GL_TEXTURE_2D) -DEF(GL_FEEDBACK_BUFFER_POINTER) -DEF(GL_FEEDBACK_BUFFER_SIZE) -DEF(GL_FEEDBACK_BUFFER_TYPE) -DEF(GL_SELECTION_BUFFER_POINTER) -DEF(GL_SELECTION_BUFFER_SIZE) -DEF(GL_COLOR) -DEF(GL_DEPTH) -DEF(GL_STENCIL) -DEF(GL_COLOR_INDEX) -DEF(GL_STENCIL_INDEX) -DEF(GL_DEPTH_COMPONENT) -DEF(GL_RED) -DEF(GL_GREEN) -DEF(GL_BLUE) -DEF(GL_ALPHA) -DEF(GL_RGB) -DEF(GL_RGBA) -DEF(GL_LUMINANCE) -DEF(GL_LUMINANCE_ALPHA) -DEF(GL_PIXEL_MAP_I_TO_I) -DEF(GL_PIXEL_MAP_S_TO_S) -DEF(GL_PIXEL_MAP_I_TO_R) -DEF(GL_PIXEL_MAP_I_TO_G) -DEF(GL_PIXEL_MAP_I_TO_B) -DEF(GL_PIXEL_MAP_I_TO_A) -DEF(GL_PIXEL_MAP_R_TO_R) -DEF(GL_PIXEL_MAP_G_TO_G) -DEF(GL_PIXEL_MAP_B_TO_B) -DEF(GL_PIXEL_MAP_A_TO_A) -DEF(GL_UNPACK_SWAP_BYTES) -DEF(GL_UNPACK_LSB_FIRST) -DEF(GL_UNPACK_ROW_LENGTH) -DEF(GL_UNPACK_SKIP_ROWS) -DEF(GL_UNPACK_SKIP_PIXELS) -DEF(GL_UNPACK_ALIGNMENT) -DEF(GL_PACK_SWAP_BYTES) -DEF(GL_PACK_LSB_FIRST) -DEF(GL_PACK_ROW_LENGTH) -DEF(GL_PACK_SKIP_ROWS) -DEF(GL_PACK_SKIP_PIXELS) -DEF(GL_PACK_ALIGNMENT) -DEF(GL_MAP_COLOR) -DEF(GL_MAP_STENCIL) -DEF(GL_INDEX_SHIFT) -DEF(GL_INDEX_OFFSET) -DEF(GL_RED_SCALE) -DEF(GL_RED_BIAS) -DEF(GL_GREEN_SCALE) -DEF(GL_GREEN_BIAS) -DEF(GL_BLUE_SCALE) -DEF(GL_BLUE_BIAS) -DEF(GL_ALPHA_SCALE) -DEF(GL_ALPHA_BIAS) -DEF(GL_DEPTH_SCALE) -DEF(GL_DEPTH_BIAS) -DEF(GL_BITMAP) -DEF(GL_BYTE) -DEF(GL_UNSIGNED_BYTE) -DEF(GL_SHORT) -DEF(GL_UNSIGNED_SHORT) -DEF(GL_INT) -DEF(GL_UNSIGNED_INT) -DEF(GL_FLOAT) -DEF(GL_POINT) -DEF(GL_LINE) -DEF(GL_FILL) -DEF(GL_RENDER) -DEF(GL_FEEDBACK) -DEF(GL_SELECT) -DEF(GL_FLAT) -DEF(GL_SMOOTH) -DEF(GL_ZERO) -DEF(GL_KEEP) -DEF(GL_REPLACE) -DEF(GL_INCR) -DEF(GL_DECR) -DEF(GL_INVERT) -DEF(GL_VENDOR) -DEF(GL_RENDERER) -DEF(GL_VERSION) -DEF(GL_EXTENSIONS) -DEF(GL_S) -DEF(GL_T) -DEF(GL_R) -DEF(GL_Q) -DEF(GL_SHORT) -DEF(GL_INT) -DEF(GL_FLOAT) -DEF(GL_DOUBLE) -DEF(GL_MODULATE) -DEF(GL_DECAL) -DEF(GL_BLEND) -DEF(GL_REPLACE) -DEF(GL_TEXTURE_ENV_MODE) -DEF(GL_TEXTURE_ENV_COLOR) -DEF(GL_TEXTURE_ENV) -DEF(GL_EYE_LINEAR) -DEF(GL_OBJECT_LINEAR) -DEF(GL_SPHERE_MAP) -DEF(GL_TEXTURE_GEN_MODE) -DEF(GL_OBJECT_PLANE) -DEF(GL_EYE_PLANE) -DEF(GL_NEAREST) -DEF(GL_LINEAR) -DEF(GL_NEAREST) -DEF(GL_LINEAR) -DEF(GL_NEAREST_MIPMAP_NEAREST) -DEF(GL_LINEAR_MIPMAP_NEAREST) -DEF(GL_NEAREST_MIPMAP_LINEAR) -DEF(GL_LINEAR_MIPMAP_LINEAR) -DEF(GL_TEXTURE_MAG_FILTER) -DEF(GL_TEXTURE_MIN_FILTER) -DEF(GL_TEXTURE_WRAP_S) -DEF(GL_TEXTURE_WRAP_T) -DEF(GL_TEXTURE_BORDER_COLOR) -DEF(GL_TEXTURE_PRIORITY) -DEF(GL_TEXTURE_1D) -DEF(GL_TEXTURE_2D) -DEF(GL_PROXY_TEXTURE_1D) -DEF(GL_PROXY_TEXTURE_2D) -DEF(GL_CLAMP) -DEF(GL_REPEAT) -DEF(GL_SHORT) -DEF(GL_INT) -DEF(GL_FLOAT) -DEF(GL_DOUBLE) -DEF(GL_CLIENT_PIXEL_STORE_BIT) -DEF(GL_CLIENT_VERTEX_ARRAY_BIT) -/* DEF(GL_CLIENT_ALL_ATTRIB_BITS) */ -DEF(GL_POLYGON_OFFSET_FACTOR) -DEF(GL_POLYGON_OFFSET_UNITS) -DEF(GL_POLYGON_OFFSET_POINT) -DEF(GL_POLYGON_OFFSET_LINE) -DEF(GL_POLYGON_OFFSET_FILL) diff --git a/neo/sys/linux/glimp_local.h.m4 b/neo/sys/linux/glimp_local.h.m4 deleted file mode 100644 index 5e2d08ba..00000000 --- a/neo/sys/linux/glimp_local.h.m4 +++ /dev/null @@ -1,24 +0,0 @@ -dnl ===================================================== -dnl utils -dnl ===================================================== - -define(`forloop', - `pushdef(`$1', `$2')_forloop(`$1', `$2', `$3', `$4')popdef(`$1')') -define(`_forloop', - `$4`'ifelse($1, `$3', , - `define(`$1', incr($1))_forloop(`$1', `$2', `$3', `$4')')') - -dnl ===================================================== -dnl the gl wgl glX definitions -dnl ===================================================== -include(../gllog/gl_def.m4) - -dnl ===================================================== -dnl dll funcs declare -dnl ===================================================== - -define(`declare_funcptr', `extern `$1' ( * dll`$2' )(`$3');') -forloop(`i', gl_start, gl_end, `declare_funcptr(indir(`f'i`_ret'), indir(`f'i`_name'), indir(`f'i`_params')) -') -forloop(`i', glX_start, glX_end, `declare_funcptr(indir(`f'i`_ret'), indir(`f'i`_name'), indir(`f'i`_params')) -') diff --git a/neo/sys/linux/glimp_logging.cpp.m4 b/neo/sys/linux/glimp_logging.cpp.m4 deleted file mode 100644 index 3748ecfa..00000000 --- a/neo/sys/linux/glimp_logging.cpp.m4 +++ /dev/null @@ -1,187 +0,0 @@ -#include "idlib/precompiled.h" -#include "renderer/tr_local.h" -#include "sys/linux/local.h" -#include "glimp_local.h" -#pragma hdrstop - -#include -#define ID_LOG_TO_STDOUT 0 - -dnl ===================================================== -dnl utils -dnl ===================================================== - -define(`forloop', - `pushdef(`$1', `$2')_forloop(`$1', `$2', `$3', `$4')popdef(`$1')') -define(`_forloop', - `$4`'ifelse($1, `$3', , - `define(`$1', incr($1))_forloop(`$1', `$2', `$3', `$4')')') - -dnl ===================================================== -dnl the gl wgl glX definitions -dnl ===================================================== -include(../gllog/gl_def.m4) - -dnl ===================================================== -dnl logging functions -dnl ===================================================== - -typedef struct { - GLenum e; - const char *name; -} glEnumName_t; - -#define DEF(x) { x, #x }, - -glEnumName_t glEnumNames[] = { -#include "sys/linux/glimp_glenum.h" - { 0, NULL } -}; - -/* -====================== -EnumString -====================== -*/ -static const char *EnumString( GLenum t ) -{ - static char buffer[8][1024]; - static int index = 0; - - for ( glEnumName_t *n = glEnumNames ; n->name ; n++ ) { - if ( t == n->e ) { - return n->name; - } - } - - int oldIndex = index; - index = ( index + 1 ) & 7; - sprintf( buffer[oldIndex], "0x%x", t ); - - return buffer[oldIndex]; -} - -/* -====================== -FloatData -====================== -*/ -#if 0 -static const char *FloatData( const GLfloat *v, int count ) { - static char buffer[8][1024]; - static int index = 0; - char *name; - - name = buffer[index&7]; - sprintf( name, "f%i", index ); - index++; - - fprintf( tr.logFile, "static float %s[%i] = {", name, count ); - for( int i = 0 ; i < count ; i++ ) { - if ( i < count - 1 ) { - fprintf( tr.logFile, "%f,", v[i] ); - } else { - fprintf( tr.logFile, "%f};\n", v[i] ); - } - } - - return name; -} -#endif -# -#include "glimp_logfuncs.cpp" - -dnl define(`log_func', `static `$1' APIENTRY log`$2'(`$3') { -dnl }') -dnl forloop(`i', gl_start, gl_end, `log_func(indir(`f'i`_ret'), indir(`f'i`_name'), indir(`f'i`_params')) -dnl ') -dnl forloop(`i', glX_start, glX_end, `log_func(indir(`f'i`_ret'), indir(`f'i`_name'), indir(`f'i`_params')) -dnl ') - -/* -====================== -GLimp_BindLogging -====================== -*/ -void GLimp_BindLogging() { -define(`assign_funcptr', `qgl`$1' = log`$1';') -forloop(`i', gl_start, gl_end, `assign_funcptr(indir(`f'i`_name')) -') - -define(`assign_funcptr', `qglX`$1' = log`$1';') -forloop(`i', glX_start, glX_end, `assign_funcptr(indir(`f'i`_name')) -') -} - -/* -====================== -GLimp_EnableLogging -====================== -*/ -void GLimp_EnableLogging(bool enable) { - static bool isEnabled = false; - static idStr ospath; - static int initialFrames; - - // return if we're already active - if ( isEnabled && enable ) { - // decrement log counter and stop if it has reached 0 - r_logFile.SetInteger( r_logFile.GetInteger() - 1 ); - if ( r_logFile.GetInteger() ) { - return; - } -#if ID_LOG_TO_STDOUT - common->Printf( "end stdout GL loggging after %i frames.\n", initialFrames ); -#else - common->Printf( "closing GL logfile '%s' after %i frames.\n", ospath.c_str(), initialFrames ); - - fclose( tr.logFile ); -#endif - enable = false; - tr.logFile = NULL; - } - - // return if we're already disabled - if ( !enable && !isEnabled ) { - return; - } - - isEnabled = enable; - - if ( enable ) { - if ( !tr.logFile ) { - struct tm *newtime; - time_t aclock; - idStr qpath; - int i; - - initialFrames = r_logFile.GetInteger(); - -#if ID_LOG_TO_STDOUT - tr.logFile = fdopen( STDOUT_FILENO, "w" ); -#else - // scan for an unused filename - for ( i = 0 ; i < 9999 ; i++ ) { - sprintf( qpath, "renderlog_%i.txt", i ); - if ( fileSystem->ReadFile( qpath, NULL, NULL ) == -1 ) { - break; // use this name - } - } - - ospath = fileSystem->RelativePathToOSPath( qpath ); - tr.logFile = fopen( ospath, "wt" ); -#endif - - // write the time out to the top of the file - time( &aclock ); - newtime = localtime( &aclock ); - fprintf( tr.logFile, "// %s", asctime( newtime ) ); - fprintf( tr.logFile, "// %s\n\n", com_version.GetString() ); - } - - GLimp_BindLogging(); - } else { - - GLimp_BindNative(); - } -} diff --git a/neo/sys/linux/glimp_stub.cpp.m4 b/neo/sys/linux/glimp_stub.cpp.m4 deleted file mode 100644 index 9521171a..00000000 --- a/neo/sys/linux/glimp_stub.cpp.m4 +++ /dev/null @@ -1,66 +0,0 @@ -// glimp_stub.cpp.m4 -// stub gl/glX APIs - -#include "idlib/precompiled.h" -#include "renderer/tr_local.h" -#pragma hdrstop - -dnl ===================================================== -dnl utils -dnl ===================================================== - -define(`forloop', - `pushdef(`$1', `$2')_forloop(`$1', `$2', `$3', `$4')popdef(`$1')') -define(`_forloop', - `$4`'ifelse($1, `$3', , - `define(`$1', incr($1))_forloop(`$1', `$2', `$3', `$4')')') - -dnl ===================================================== -dnl the gl wgl glX definitions -dnl ===================================================== -include(../gllog/gl_def.m4) - -dnl ===================================================== -dnl qgl stubs -dnl there is a number of functions for which we have special case code -dnl ===================================================== - -define(`override_GetError', `') -define(`override_GenLists', `') -define(`override_GetIntegerv', `') -define(`override_GetString', `') - -define(`instance_funcptr', ``$1' gl`$2'(`$3'){}') -define(`try_instance_funcptr', `ifdef(`override_'$2, ,`instance_funcptr(`$1', `$2', `$3')')') -forloop(`i', gl_start, gl_end, `try_instance_funcptr(indir(`f'i`_ret'), indir(`f'i`_name'), indir(`f'i`_params')) -') - -dnl ===================================================== -dnl glX stubs -dnl ===================================================== - -define(`override_GetProcAddressARB', `') - -define(`instance_funcptr', ``$1' glX`$2'(`$3'){}') -define(`try_instance_funcptr', `ifdef(`override_'$2, ,`instance_funcptr(`$1', `$2', `$3')')') -forloop(`i', glX_start, glX_end, `try_instance_funcptr(indir(`f'i`_ret'), indir(`f'i`_name'), indir(`f'i`_params')) -') - -GLenum glGetError(void){return 0;} - -GLuint glGenLists(GLsizei range){return 0;} - -void glGetIntegerv(GLenum pname, GLint *params){ - switch( pname ) { - case GL_MAX_TEXTURE_SIZE: *params = 1024; break; - case GL_MAX_TEXTURE_UNITS_ARB: *params = 2; break; - default: *params = 0; break; - } -} - -const GLubyte * glGetString(GLenum name){ - switch( name ) { - case GL_EXTENSIONS: return (GLubyte *)"GL_ARB_multitexture GL_ARB_texture_env_combine GL_ARB_texture_cube_map GL_ARB_texture_env_dot3"; - } - return (const GLubyte *)""; -} diff --git a/neo/sys/linux/local.h b/neo/sys/linux/local.h index 6fea5405..b99fce6c 100644 --- a/neo/sys/linux/local.h +++ b/neo/sys/linux/local.h @@ -52,12 +52,4 @@ void Sys_XUninstallGrabs(); #define MOUSE_MASK (ButtonPressMask | ButtonReleaseMask | PointerMotionMask | ButtonMotionMask ) #define X_MASK (KEY_MASK | MOUSE_MASK | VisibilityChangeMask | StructureNotifyMask ) -#ifndef ID_GL_HARDLINK -bool GLimp_dlopen(); -void GLimp_dlclose(); - -void GLimp_BindLogging(); -void GLimp_BindNative(); -#endif - #endif diff --git a/neo/sys/linux/process.py b/neo/sys/linux/process.py deleted file mode 100644 index 9a897564..00000000 --- a/neo/sys/linux/process.py +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env python -# process stdin into an M4 macro definition file -# recognize three keyword qgl qwgl qglX -# -# output -# global macros keep track of the three intervals for function types: -# gl_start gl_end wgl_start wgl_end glX_start glX_end -# NOTE: will we need similar thing for extensions? -# -# each function: -# f_ret: return type -# f_name: function name -# f_params: complete params -# -# ex: -# define(`f1_ret', `void') -# define(`f1_name', `Accum') -# define(`f1_params', ``GLenum op, GLfloat value'') -# - -import sys, string -from read import read_gl - -(gl, wgl, glX) = read_gl(sys.stdin) - -sys.stdout.write('define(`gl_start\', `0\')\n') -sys.stdout.write('define(`gl_end\', `%d\')\n' % int(len(gl)-1)) -sys.stdout.write('define(`wgl_start\', `%d\')\n' % int(len(gl))) -sys.stdout.write('define(`wgl_end\', `%d\')\n' % int(len(gl)+len(wgl)-1)) -sys.stdout.write('define(`glX_start\', `%d\')\n' % int(len(gl)+len(wgl))) -sys.stdout.write('define(`glX_end\', `%d\')\n' % int(len(gl)+len(wgl)+len(glX)-1)) - -i = 0 -for l in (gl, wgl, glX): - for t in l: - # process ret type to strip trailing spaces - t[0] = string.strip(t[0]) - sys.stdout.write('define(`f%d_ret\', `%s\')\n' % (i, t[0])) - sys.stdout.write('define(`f%d_name\', `%s\')\n' % (i, t[2])) - sys.stdout.write('define(`f%d_params\', ``%s\'\')\n' % (i, t[3])) - i += 1 diff --git a/neo/sys/linux/qgl_enforce.h b/neo/sys/linux/qgl_enforce.h deleted file mode 100644 index 3a201eae..00000000 --- a/neo/sys/linux/qgl_enforce.h +++ /dev/null @@ -1,1476 +0,0 @@ -/* -=========================================================================== - -Doom 3 GPL Source Code -Copyright (C) 1999-2011 id Software LLC, a ZeniMax Media company. - -This file is part of the Doom 3 GPL Source Code ("Doom 3 Source Code"). - -Doom 3 Source Code is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -Doom 3 Source Code 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with Doom 3 Source Code. If not, see . - -In addition, the Doom 3 Source Code is also subject to certain additional terms. You should have received a copy of these additional terms immediately following the terms and conditions of the GNU General Public License which accompanied the Doom 3 Source Code. If not, please request a copy in writing from id Software at the address below. - -If you have questions concerning this license or the applicable additional terms, you may contact in writing id Software LLC, c/o ZeniMax Media Inc., Suite 120, Rockville, Maryland 20850 USA. - -=========================================================================== -*/ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -#define glAccum use_qglAccum -#define glAlphaFunc use_qglAlphaFunc -#define glAreTexturesResident use_qglAreTexturesResident -#define glArrayElement use_qglArrayElement -#define glBegin use_qglBegin -#define glBindTexture use_qglBindTexture -#define glBitmap use_qglBitmap -#define glBlendFunc use_qglBlendFunc -#define glCallList use_qglCallList -#define glCallLists use_qglCallLists -#define glClear use_qglClear -#define glClearAccum use_qglClearAccum -#define glClearColor use_qglClearColor -#define glClearDepth use_qglClearDepth -#define glClearIndex use_qglClearIndex -#define glClearStencil use_qglClearStencil -#define glClipPlane use_qglClipPlane -#define glColor3b use_qglColor3b -#define glColor3bv use_qglColor3bv -#define glColor3d use_qglColor3d -#define glColor3dv use_qglColor3dv -#define glColor3f use_qglColor3f -#define glColor3fv use_qglColor3fv -#define glColor3i use_qglColor3i -#define glColor3iv use_qglColor3iv -#define glColor3s use_qglColor3s -#define glColor3sv use_qglColor3sv -#define glColor3ub use_qglColor3ub -#define glColor3ubv use_qglColor3ubv -#define glColor3ui use_qglColor3ui -#define glColor3uiv use_qglColor3uiv -#define glColor3us use_qglColor3us -#define glColor3usv use_qglColor3usv -#define glColor4b use_qglColor4b -#define glColor4bv use_qglColor4bv -#define glColor4d use_qglColor4d -#define glColor4dv use_qglColor4dv -#define glColor4f use_qglColor4f -#define glColor4fv use_qglColor4fv -#define glColor4i use_qglColor4i -#define glColor4iv use_qglColor4iv -#define glColor4s use_qglColor4s -#define glColor4sv use_qglColor4sv -#define glColor4ub use_qglColor4ub -#define glColor4ubv use_qglColor4ubv -#define glColor4ui use_qglColor4ui -#define glColor4uiv use_qglColor4uiv -#define glColor4us use_qglColor4us -#define glColor4usv use_qglColor4usv -#define glColorMask use_qglColorMask -#define glColorMaterial use_qglColorMaterial -#define glColorPointer use_qglColorPointer -#define glCopyPixels use_qglCopyPixels -#define glCopyTexImage1D use_qglCopyTexImage1D -#define glCopyTexImage2D use_qglCopyTexImage2D -#define glCopyTexSubImage1D use_qglCopyTexSubImage1D -#define glCopyTexSubImage2D use_qglCopyTexSubImage2D -#define glCullFace use_qglCullFace -#define glDeleteLists use_qglDeleteLists -#define glDeleteTextures use_qglDeleteTextures -#define glDepthFunc use_qglDepthFunc -#define glDepthMask use_qglDepthMask -#define glDepthRange use_qglDepthRange -#define glDisable use_qglDisable -#define glDisableClientState use_qglDisableClientState -#define glDrawArrays use_qglDrawArrays -#define glDrawBuffer use_qglDrawBuffer -#define glDrawElements use_qglDrawElements -#define glDrawPixels use_qglDrawPixels -#define glEdgeFlag use_qglEdgeFlag -#define glEdgeFlagPointer use_qglEdgeFlagPointer -#define glEdgeFlagv use_qglEdgeFlagv -#define glEnable use_qglEnable -#define glEnableClientState use_qglEnableClientState -#define glEnd use_qglEnd -#define glEndList use_qglEndList -#define glEvalCoord1d use_qglEvalCoord1d -#define glEvalCoord1dv use_qglEvalCoord1dv -#define glEvalCoord1f use_qglEvalCoord1f -#define glEvalCoord1fv use_qglEvalCoord1fv -#define glEvalCoord2d use_qglEvalCoord2d -#define glEvalCoord2dv use_qglEvalCoord2dv -#define glEvalCoord2f use_qglEvalCoord2f -#define glEvalCoord2fv use_qglEvalCoord2fv -#define glEvalMesh1 use_qglEvalMesh1 -#define glEvalMesh2 use_qglEvalMesh2 -#define glEvalPoint1 use_qglEvalPoint1 -#define glEvalPoint2 use_qglEvalPoint2 -#define glFeedbackBuffer use_qglFeedbackBuffer -#define glFinish use_qglFinish -#define glFlush use_qglFlush -#define glFogf use_qglFogf -#define glFogfv use_qglFogfv -#define glFogi use_qglFogi -#define glFogiv use_qglFogiv -#define glFrontFace use_qglFrontFace -#define glFrustum use_qglFrustum -#define glGenLists use_qglGenLists -#define glGenTextures use_qglGenTextures -#define glGetBooleanv use_qglGetBooleanv -#define glGetClipPlane use_qglGetClipPlane -#define glGetDoublev use_qglGetDoublev -#define glGetError use_qglGetError -#define glGetFloatv use_qglGetFloatv -#define glGetIntegerv use_qglGetIntegerv -#define glGetLightfv use_qglGetLightfv -#define glGetLightiv use_qglGetLightiv -#define glGetMapdv use_qglGetMapdv -#define glGetMapfv use_qglGetMapfv -#define glGetMapiv use_qglGetMapiv -#define glGetMaterialfv use_qglGetMaterialfv -#define glGetMaterialiv use_qglGetMaterialiv -#define glGetPixelMapfv use_qglGetPixelMapfv -#define glGetPixelMapuiv use_qglGetPixelMapuiv -#define glGetPixelMapusv use_qglGetPixelMapusv -#define glGetPointerv use_qglGetPointerv -#define glGetPolygonStipple use_qglGetPolygonStipple -#define glGetString use_qglGetString -#define glGetTexEnvfv use_qglGetTexEnvfv -#define glGetTexEnviv use_qglGetTexEnviv -#define glGetTexGendv use_qglGetTexGendv -#define glGetTexGenfv use_qglGetTexGenfv -#define glGetTexGeniv use_qglGetTexGeniv -#define glGetTexImage use_qglGetTexImage -#define glGetTexLevelParameterfv use_qglGetTexLevelParameterfv -#define glGetTexLevelParameteriv use_qglGetTexLevelParameteriv -#define glGetTexParameterfv use_qglGetTexParameterfv -#define glGetTexParameteriv use_qglGetTexParameteriv -#define glHint use_qglHint -#define glIndexMask use_qglIndexMask -#define glIndexPointer use_qglIndexPointer -#define glIndexd use_qglIndexd -#define glIndexdv use_qglIndexdv -#define glIndexf use_qglIndexf -#define glIndexfv use_qglIndexfv -#define glIndexi use_qglIndexi -#define glIndexiv use_qglIndexiv -#define glIndexs use_qglIndexs -#define glIndexsv use_qglIndexsv -#define glIndexub use_qglIndexub -#define glIndexubv use_qglIndexubv -#define glInitNames use_qglInitNames -#define glInterleavedArrays use_qglInterleavedArrays -#define glIsEnabled use_qglIsEnabled -#define glIsList use_qglIsList -#define glIsTexture use_qglIsTexture -#define glLightModelf use_qglLightModelf -#define glLightModelfv use_qglLightModelfv -#define glLightModeli use_qglLightModeli -#define glLightModeliv use_qglLightModeliv -#define glLightf use_qglLightf -#define glLightfv use_qglLightfv -#define glLighti use_qglLighti -#define glLightiv use_qglLightiv -#define glLineStipple use_qglLineStipple -#define glLineWidth use_qglLineWidth -#define glListBase use_qglListBase -#define glLoadIdentity use_qglLoadIdentity -#define glLoadMatrixd use_qglLoadMatrixd -#define glLoadMatrixf use_qglLoadMatrixf -#define glLoadName use_qglLoadName -#define glLogicOp use_qglLogicOp -#define glMap1d use_qglMap1d -#define glMap1f use_qglMap1f -#define glMap2d use_qglMap2d -#define glMap2f use_qglMap2f -#define glMapGrid1d use_qglMapGrid1d -#define glMapGrid1f use_qglMapGrid1f -#define glMapGrid2d use_qglMapGrid2d -#define glMapGrid2f use_qglMapGrid2f -#define glMaterialf use_qglMaterialf -#define glMaterialfv use_qglMaterialfv -#define glMateriali use_qglMateriali -#define glMaterialiv use_qglMaterialiv -#define glMatrixMode use_qglMatrixMode -#define glMultMatrixd use_qglMultMatrixd -#define glMultMatrixf use_qglMultMatrixf -#define glNewList use_qglNewList -#define glNormal3b use_qglNormal3b -#define glNormal3bv use_qglNormal3bv -#define glNormal3d use_qglNormal3d -#define glNormal3dv use_qglNormal3dv -#define glNormal3f use_qglNormal3f -#define glNormal3fv use_qglNormal3fv -#define glNormal3i use_qglNormal3i -#define glNormal3iv use_qglNormal3iv -#define glNormal3s use_qglNormal3s -#define glNormal3sv use_qglNormal3sv -#define glNormalPointer use_qglNormalPointer -#define glOrtho use_qglOrtho -#define glPassThrough use_qglPassThrough -#define glPixelMapfv use_qglPixelMapfv -#define glPixelMapuiv use_qglPixelMapuiv -#define glPixelMapusv use_qglPixelMapusv -#define glPixelStoref use_qglPixelStoref -#define glPixelStorei use_qglPixelStorei -#define glPixelTransferf use_qglPixelTransferf -#define glPixelTransferi use_qglPixelTransferi -#define glPixelZoom use_qglPixelZoom -#define glPointSize use_qglPointSize -#define glPolygonMode use_qglPolygonMode -#define glPolygonOffset use_qglPolygonOffset -#define glPolygonStipple use_qglPolygonStipple -#define glPopAttrib use_qglPopAttrib -#define glPopClientAttrib use_qglPopClientAttrib -#define glPopMatrix use_qglPopMatrix -#define glPopName use_qglPopName -#define glPrioritizeTextures use_qglPrioritizeTextures -#define glPushAttrib use_qglPushAttrib -#define glPushClientAttrib use_qglPushClientAttrib -#define glPushMatrix use_qglPushMatrix -#define glPushName use_qglPushName -#define glRasterPos2d use_qglRasterPos2d -#define glRasterPos2dv use_qglRasterPos2dv -#define glRasterPos2f use_qglRasterPos2f -#define glRasterPos2fv use_qglRasterPos2fv -#define glRasterPos2i use_qglRasterPos2i -#define glRasterPos2iv use_qglRasterPos2iv -#define glRasterPos2s use_qglRasterPos2s -#define glRasterPos2sv use_qglRasterPos2sv -#define glRasterPos3d use_qglRasterPos3d -#define glRasterPos3dv use_qglRasterPos3dv -#define glRasterPos3f use_qglRasterPos3f -#define glRasterPos3fv use_qglRasterPos3fv -#define glRasterPos3i use_qglRasterPos3i -#define glRasterPos3iv use_qglRasterPos3iv -#define glRasterPos3s use_qglRasterPos3s -#define glRasterPos3sv use_qglRasterPos3sv -#define glRasterPos4d use_qglRasterPos4d -#define glRasterPos4dv use_qglRasterPos4dv -#define glRasterPos4f use_qglRasterPos4f -#define glRasterPos4fv use_qglRasterPos4fv -#define glRasterPos4i use_qglRasterPos4i -#define glRasterPos4iv use_qglRasterPos4iv -#define glRasterPos4s use_qglRasterPos4s -#define glRasterPos4sv use_qglRasterPos4sv -#define glReadBuffer use_qglReadBuffer -#define glReadPixels use_qglReadPixels -#define glRectd use_qglRectd -#define glRectdv use_qglRectdv -#define glRectf use_qglRectf -#define glRectfv use_qglRectfv -#define glRecti use_qglRecti -#define glRectiv use_qglRectiv -#define glRects use_qglRects -#define glRectsv use_qglRectsv -#define glRenderMode use_qglRenderMode -#define glRotated use_qglRotated -#define glRotatef use_qglRotatef -#define glScaled use_qglScaled -#define glScalef use_qglScalef -#define glScissor use_qglScissor -#define glSelectBuffer use_qglSelectBuffer -#define glShadeModel use_qglShadeModel -#define glStencilFunc use_qglStencilFunc -#define glStencilMask use_qglStencilMask -#define glStencilOp use_qglStencilOp -#define glTexCoord1d use_qglTexCoord1d -#define glTexCoord1dv use_qglTexCoord1dv -#define glTexCoord1f use_qglTexCoord1f -#define glTexCoord1fv use_qglTexCoord1fv -#define glTexCoord1i use_qglTexCoord1i -#define glTexCoord1iv use_qglTexCoord1iv -#define glTexCoord1s use_qglTexCoord1s -#define glTexCoord1sv use_qglTexCoord1sv -#define glTexCoord2d use_qglTexCoord2d -#define glTexCoord2dv use_qglTexCoord2dv -#define glTexCoord2f use_qglTexCoord2f -#define glTexCoord2fv use_qglTexCoord2fv -#define glTexCoord2i use_qglTexCoord2i -#define glTexCoord2iv use_qglTexCoord2iv -#define glTexCoord2s use_qglTexCoord2s -#define glTexCoord2sv use_qglTexCoord2sv -#define glTexCoord3d use_qglTexCoord3d -#define glTexCoord3dv use_qglTexCoord3dv -#define glTexCoord3f use_qglTexCoord3f -#define glTexCoord3fv use_qglTexCoord3fv -#define glTexCoord3i use_qglTexCoord3i -#define glTexCoord3iv use_qglTexCoord3iv -#define glTexCoord3s use_qglTexCoord3s -#define glTexCoord3sv use_qglTexCoord3sv -#define glTexCoord4d use_qglTexCoord4d -#define glTexCoord4dv use_qglTexCoord4dv -#define glTexCoord4f use_qglTexCoord4f -#define glTexCoord4fv use_qglTexCoord4fv -#define glTexCoord4i use_qglTexCoord4i -#define glTexCoord4iv use_qglTexCoord4iv -#define glTexCoord4s use_qglTexCoord4s -#define glTexCoord4sv use_qglTexCoord4sv -#define glTexCoordPointer use_qglTexCoordPointer -#define glTexEnvf use_qglTexEnvf -#define glTexEnvfv use_qglTexEnvfv -#define glTexEnvi use_qglTexEnvi -#define glTexEnviv use_qglTexEnviv -#define glTexGend use_qglTexGend -#define glTexGendv use_qglTexGendv -#define glTexGenf use_qglTexGenf -#define glTexGenfv use_qglTexGenfv -#define glTexGeni use_qglTexGeni -#define glTexGeniv use_qglTexGeniv -#define glTexImage1D use_qglTexImage1D -#define glTexImage2D use_qglTexImage2D -#define glTexParameterf use_qglTexParameterf -#define glTexParameterfv use_qglTexParameterfv -#define glTexParameteri use_qglTexParameteri -#define glTexParameteriv use_qglTexParameteriv -#define glTexSubImage1D use_qglTexSubImage1D -#define glTexSubImage2D use_qglTexSubImage2D -#define glTranslated use_qglTranslated -#define glTranslatef use_qglTranslatef -#define glVertex2d use_qglVertex2d -#define glVertex2dv use_qglVertex2dv -#define glVertex2f use_qglVertex2f -#define glVertex2fv use_qglVertex2fv -#define glVertex2i use_qglVertex2i -#define glVertex2iv use_qglVertex2iv -#define glVertex2s use_qglVertex2s -#define glVertex2sv use_qglVertex2sv -#define glVertex3d use_qglVertex3d -#define glVertex3dv use_qglVertex3dv -#define glVertex3f use_qglVertex3f -#define glVertex3fv use_qglVertex3fv -#define glVertex3i use_qglVertex3i -#define glVertex3iv use_qglVertex3iv -#define glVertex3s use_qglVertex3s -#define glVertex3sv use_qglVertex3sv -#define glVertex4d use_qglVertex4d -#define glVertex4dv use_qglVertex4dv -#define glVertex4f use_qglVertex4f -#define glVertex4fv use_qglVertex4fv -#define glVertex4i use_qglVertex4i -#define glVertex4iv use_qglVertex4iv -#define glVertex4s use_qglVertex4s -#define glVertex4sv use_qglVertex4sv -#define glVertexPointer use_qglVertexPointer -#define glViewport use_qglViewport - -#define glChooseVisual use_qglChooseVisual -#define glCreateContext use_qglCreateContext -#define glDestroyContext use_qglDestroyContext -#define glMakeCurrent use_qglMakeCurrent -#define glSwapBuffers use_qglSwapBuffers -#define glGetProcAddressARB use_qglGetProcAddressARB diff --git a/neo/sys/linux/qgl_enforce.h.m4 b/neo/sys/linux/qgl_enforce.h.m4 deleted file mode 100644 index d9cd79be..00000000 --- a/neo/sys/linux/qgl_enforce.h.m4 +++ /dev/null @@ -1,23 +0,0 @@ -dnl ===================================================== -dnl utils -dnl ===================================================== - -define(`forloop', - `pushdef(`$1', `$2')_forloop(`$1', `$2', `$3', `$4')popdef(`$1')') -define(`_forloop', - `$4`'ifelse($1, `$3', , - `define(`$1', incr($1))_forloop(`$1', `$2', `$3', `$4')')') - -dnl ===================================================== -dnl the gl wgl glX definitions -dnl ===================================================== -include(../gllog/gl_def.m4) - -dnl ===================================================== -dnl issue the defines to lock out gl usage -dnl ===================================================== -define(`define_out', `#define gl$1 use_qgl$1') -forloop(`i', gl_start, gl_end, `define_out(indir(`f'i`_name')) -') -forloop(`i', glX_start, glX_end, `define_out(indir(`f'i`_name')) -') diff --git a/neo/sys/scons/SConscript.core b/neo/sys/scons/SConscript.core index 9073c1b8..377126ee 100644 --- a/neo/sys/scons/SConscript.core +++ b/neo/sys/scons/SConscript.core @@ -210,7 +210,9 @@ if ( local_dedicated == 0 ): linux/input.cpp \ linux/libXNVCtrl/NVCtrl.c' else: - sys_string += ' linux/dedicated.cpp' + sys_string += ' \ + stub/stub_gl.cpp \ + linux/dedicated.cpp' sys_list = scons_utils.BuildList( 'sys', sys_string ) @@ -229,7 +231,7 @@ for i in range( len( core_list ) ): local_env = g_env.Clone() if ( local_dedicated == 1 ): - local_env.Append( CPPDEFINES = [ 'ID_DEDICATED', 'ID_GL_HARDLINK' ] ) + local_env.Append( CPPDEFINES = [ 'ID_DEDICATED' ] ) # don't enable alsa for a dedicated server binary ALSA = '0' @@ -255,6 +257,9 @@ sound_lib = sound_env.StaticLibrary( 'sound', sound_list ) local_env.Append( LIBS = [ 'pthread', 'jpeg', 'vorbisfile' ] ) +if ( local_dedicated == 0 ): + local_env.Append( LIBS = [ 'GL' ] ) + if (g_os == "Linux"): local_env.Append( LIBS = [ 'dl' ] ) @@ -267,7 +272,6 @@ if ( local_dedicated == 0 ): source_list = core_list source_list += idlib_objects -source_list += [ '../../glimp/sys/scons/libglimp.a' ] source_list += sound_lib source_list += [ '../../openal/stubs.cpp' ] diff --git a/neo/sys/scons/SConscript.gl b/neo/sys/scons/SConscript.gl deleted file mode 100644 index 593c4efb..00000000 --- a/neo/sys/scons/SConscript.gl +++ /dev/null @@ -1,101 +0,0 @@ -# -*- mode: python -*- -# DOOM build script -# TTimo -# http://scons.sourceforge.net - -# various GL-related code: -# GL logging functions (used on all platforms) -# GLimp code (Linux only) -# The C code is generated using M4 macros from a description of the GL API -# on win32, the logging functions are generated ones and kept in the source -# on other platforms, scons generates on the fly at build time - -import time -Import('GLOBALS') -Import(GLOBALS) - -# NOTE: make sure the .api files are in LF line endings, CRLF isn't working so well -def build_logfuncs(env, target, source): - import os, sys - # search for the module - source repository might make things harder - gllog_path = 'sys/gllog' - if ( not os.path.exists( gllog_path + '/logfunc.py' ) ): - gllog_path = '/var/local/Doom/neo/sys/gllog' - sys.path.append( gllog_path ) - from logfunc import do_logfunc - f_out = open('%s' % target[0], 'w') - f_out.write('// generated file, do not modify!\n') - f_out.write('// ' + time.asctime() + '\n') - f_out.write('// see SConscript.gl and sys/gllog/\n\n') - - f_in = open( gllog_path + '/gl.api', 'r') - do_logfunc(f_in, f_out) - f_in.close() - - f_out.write('\n#ifdef __linux__\n\n') - f_in = open( gllog_path + '/glX.api', 'r') - do_logfunc(f_in, f_out) - f_in.close() - f_out.write('\n#endif\n\n') - - f_out.write('\n#ifdef WIN32\n\n') - f_in = open( gllog_path + '/wgl.api', 'r') - do_logfunc(f_in, f_out) - f_in.close() - f_out.write('\n#endif\n\n') - - f_out.close() - - print 'Generated %s' % target[0] - -gl_env = g_env.Clone() -gl_env.Append( CPPPATH = '#' ) -gl_env.Append( CPPFLAGS = '-DGLIMP' ) - -if ( local_dedicated == 1 ): - gl_env.Append( CPPFLAGS = '-DID_DEDICATED' ) - -# general M4 builder setup -# files we are going to generate from their M4 counterparts - -m4_list = ( - '../gllog/gl_extensions.cpp', - '../linux/glimp_dlopen.cpp', - '../linux/glimp_logging.cpp', - '../linux/glimp_stub.cpp', - '../linux/glimp_local.h' ) - -for i_m4 in m4_list: - gl_env.M4( i_m4, i_m4 + '.m4' ) - gl_env.Depends( i_m4, '../gllog/gl_def.m4' ) - -# enable if you need to generate again -# FIXME: conflicts when several environements are used. move that to seperate script -#enforce = gl_env.M4( '#sys/linux/qgl_enforce.h', '../linux/qgl_enforce.h.m4' ) -#gl_env.Depends( enforce, '../gllog/gl_def.m4' ) - -# logging functions, python generated ( that's beyond my m4-fu ) - -gl_env.Depends( '../linux/glimp_logging.cpp', '../linux/glimp_logfuncs.cpp' ) - -logfuncs = gl_env.Command( '../linux/glimp_logfuncs.cpp', '../gllog/logfunc.py', build_logfuncs ) -gl_env.Depends( logfuncs, '../gllog/gl_def.m4' ) - -sources = [] -sources.append( '../gllog/gl_extensions.cpp' ) - -if ( local_dedicated == 1 ): - sources.append( '../linux/glimp_stub.cpp' ) -else: - sources.append( '../linux/glimp_dlopen.cpp' ) - sources.append( '../linux/glimp_logging.cpp' ) - -#if ( DEDICATED != '0' ): -# sources.append( '../linux/glimp_stub.cpp' ) -# -#if ( GL_HARDLINK == '0' ): -# sources.append( '../linux/glimp_dlopen.cpp' ) -# sources.append( '../linux/glimp_logging.cpp' ) - -lib = gl_env.StaticLibrary( 'glimp', sources ) -#gl_env.Install( '../..', lib )