diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2001-05-24 19:06:21 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2001-05-24 19:06:21 +0000 |
| commit | 7cf50e137da497a590ec9001a9918972a6246142 (patch) | |
| tree | 9fcca81397dc0b47510ad9081634bd13f428099e /src/mesa/drivers/x11/glxapi.h | |
| parent | bcebfe647f4f26681e100c5499684ab6ee4b8813 (diff) | |
Initial changes to allow Mesa and its fake GLX to be built into XFree86 libGL.
Diffstat (limited to 'src/mesa/drivers/x11/glxapi.h')
| -rw-r--r-- | src/mesa/drivers/x11/glxapi.h | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/src/mesa/drivers/x11/glxapi.h b/src/mesa/drivers/x11/glxapi.h index d24b74bcbd..ea287473a6 100644 --- a/src/mesa/drivers/x11/glxapi.h +++ b/src/mesa/drivers/x11/glxapi.h @@ -1,10 +1,10 @@ -/* $Id: glxapi.h,v 1.8 2000/12/15 04:02:50 brianp Exp $ */ +/* $Id: glxapi.h,v 1.9 2001/05/24 19:06:21 brianp Exp $ */ /* * Mesa 3-D graphics library * Version: 3.5 * - * Copyright (C) 1999-2000 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -33,6 +33,21 @@ #include "GL/glx.h" +#ifdef GLX_BUILD_IN_XLIB_MESA +/* The GLX API dispatcher is being built into XFree86's libGL */ +#include "glxclient.h" +#else +/* The GLX API dispatcher is being built into stand-alone Mesa */ +typedef struct __GLXcontextRec { + Display *currentDpy; + GLboolean isDirect; + GLXDrawable currentDrawable; + GLXDrawable currentReadable; + XID xid; +} __GLXcontext; +#endif + + /* * Almost all the GLX API functions get routed through this dispatch table. * The exceptions are the glXGetCurrentXXX() functions. @@ -106,7 +121,7 @@ struct _glxapi_table { #ifdef GLX_SGI_make_current_read Bool (*MakeCurrentReadSGI)(Display *, GLXDrawable, GLXDrawable, GLXContext); - GLXDrawable (*GetCurrentReadDrawableSGI)(void); + /*GLXDrawable (*GetCurrentReadDrawableSGI)(void);*/ #endif #if defined(_VL_H) && defined(GLX_SGIX_video_source) @@ -117,7 +132,7 @@ struct _glxapi_table { #ifdef GLX_EXT_import_context void (*FreeContextEXT)(Display *dpy, GLXContext context); GLXContextID (*GetContextIDEXT)(const GLXContext context); - Display *(*GetCurrentDisplayEXT)(void); + /*Display *(*GetCurrentDisplayEXT)(void);*/ GLXContext (*ImportContextEXT)(Display *dpy, GLXContextID contextID); int (*QueryContextInfoEXT)(Display *dpy, GLXContext context, int attribute,int *value); #endif |