From f72e4424d960b1751845d9e0579e8fdcca93b3d0 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Tue, 4 Jan 2005 00:58:29 +0000 Subject: Use the GLX 1.3 pbuffer/fbconfig functions in preference to the SGIX ones. Added more functions to pbutil.[ch] to better isolate API differences. --- progs/xdemos/pbutil.h | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) (limited to 'progs/xdemos/pbutil.h') diff --git a/progs/xdemos/pbutil.h b/progs/xdemos/pbutil.h index d13c969c4c..68ba8808c2 100644 --- a/progs/xdemos/pbutil.h +++ b/progs/xdemos/pbutil.h @@ -1,4 +1,3 @@ - /* * OpenGL pbuffers utility functions. * @@ -15,23 +14,41 @@ #include +#if defined(GLX_VERSION_1_3) +#define PBUFFER GLXPbuffer +#define FBCONFIG GLXFBConfig +#elif defined(GLX_SGIX_fbconfig) && defined(GLX_SGIX_pbuffer) +#define PBUFFER GLXPbufferSGIX +#define FBCONFIG GLXFBConfigSGIX +#else +#define PBUFFER int +#define FBCONFIG int +#endif + + extern int QueryPbuffers(Display *dpy, int screen); -#ifdef GLX_SGIX_fbconfig +extern void +PrintFBConfigInfo(Display *dpy, int screen, FBCONFIG config, Bool horizFormat); + +extern FBCONFIG * +ChooseFBConfig(Display *dpy, int screen, const int attribs[], int *nConfigs); -extern void -PrintFBConfigInfo(Display *dpy, GLXFBConfigSGIX fbConfig, Bool horizFormat); +extern XVisualInfo * +GetVisualFromFBConfig(Display *dpy, int screen, FBCONFIG config); -extern GLXPbufferSGIX -CreatePbuffer( Display *dpy, GLXFBConfigSGIX fbConfig, - int width, int height, int *pbAttribs ); +extern PBUFFER +CreatePbuffer(Display *dpy, int screen, FBCONFIG config, + int width, int height, Bool preserve, Bool largest); -#endif /*GLX_SGIX_fbconfig*/ + +extern void +DestroyPbuffer(Display *dpy, int screen, PBUFFER pbuffer); #endif /*PBUTIL_H*/ -- cgit v1.2.3