dhewm/dhewm3-sdk
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3-sdk.git synced 2024-11-24 21:41:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Get rid of GL_HARDLINK, always link against libGL

Browse source 
This kills the funky GL logging stubs, which unnecessarily
complicates the build process (think future cmake).
As for logging GL calls: Use apitrace for that
https://github.com/apitrace/apitrace
This commit is contained in:
dhewg 2011-12-07 18:35:59 +01:00 committed by Daniel Gibson
parent 4cfc2d87a5
commit 8585be83f9
2 changed files with 1 additions and 1499 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
renderer/qgl.h
View file

@ -166,7 +166,7 @@ extern PFNGLDEPTHBOUNDSEXTPROC qglDepthBoundsEXT;
//=========================================================================== //===========================================================================
// non-windows systems will just redefine qgl* to gl* // non-windows systems will just redefine qgl* to gl*
#if defined( __APPLE__ ) || defined( ID_GL_HARDLINK ) #ifndef _WIN32
#include "qgl_linked.h" #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 * qglVertexPointer )(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
extern void ( APIENTRY * qglViewport )(GLint x, GLint y, GLsizei width, GLsizei height); 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 * qwglChoosePixelFormat )(HDC, CONST PIXELFORMATDESCRIPTOR *);
extern int ( WINAPI * qwglDescribePixelFormat) (HDC, int, UINT, LPPIXELFORMATDESCRIPTOR); extern int ( WINAPI * qwglDescribePixelFormat) (HDC, int, UINT, LPPIXELFORMATDESCRIPTOR);
extern int ( WINAPI * qwglGetPixelFormat)(HDC); extern int ( WINAPI * qwglGetPixelFormat)(HDC);
@ -544,24 +542,4 @@ extern BOOL ( WINAPI * qwglSwapLayerBuffers)(HDC, UINT);
#endif // _WIN32 #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 #endif

1476
sys/linux/qgl_enforce.h
View file

File diff suppressed because it is too large Load diff