* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
+#define FREEGLUT_BUILDING_LIB
#include <GL/freeglut.h>
#include "freeglut_internal.h"
ATTRIB_VAL( GLX_ACCUM_ALPHA_SIZE, 1 );
}
- if ((fgState.DisplayMode & GLUT_AUX)
- || (fgState.DisplayMode & GLUT_AUX1)
- || (fgState.DisplayMode & GLUT_AUX2)
- || (fgState.DisplayMode & GLUT_AUX3)
- || (fgState.DisplayMode & GLUT_AUX4))
- {
- ATTRIB_VAL(GLX_AUX_BUFFERS, fgState.AuxiliaryBufferNumber)
- }
+ if( fgState.DisplayMode & GLUT_AUX4 )
+ {
+ ATTRIB_VAL(GLX_AUX_BUFFERS, 4);
+ }
+ else if( fgState.DisplayMode & GLUT_AUX3 )
+ {
+ ATTRIB_VAL(GLX_AUX_BUFFERS, 3);
+ }
+ else if( fgState.DisplayMode & GLUT_AUX2 )
+ {
+ ATTRIB_VAL(GLX_AUX_BUFFERS, 2);
+ }
+ else if( fgState.DisplayMode & GLUT_AUX1 ) /* NOTE: Same as GLUT_AUX! */
+ {
+ ATTRIB_VAL(GLX_AUX_BUFFERS, fgState.AuxiliaryBufferNumber);
+ }
if (fgState.DisplayMode & GLUT_MULTISAMPLE)
{
HGLRC context;
int attribs[7];
PFNWGLCREATECONTEXTATTRIBSARBPROC wglCreateContextAttribsARB;
+ const char * pWglExtString;
- if( (fgState.ContextFlags & GLUT_FORWARD_COMPATIBLE) &&
- (fgState.MajorVersion > 2) )
+ /* If nothing fancy has been required, leave the context as it is */
+ if ( fgState.MajorVersion == 1 && fgState.MinorVersion == 0 && fgState.ContextFlags == 0 )
{
return;
}
return;
}
- const char * pWglExtString=wglGetEntensionsStringARB(window->Window.Device);
+ pWglExtString=wglGetEntensionsStringARB(window->Window.Device);
if (( pWglExtString == NULL ) || ( strstr(pWglExtString, "WGL_ARB_create_context") == NULL ))
{
return;
pfd.cAuxBuffers = 3;
else if( fgState.DisplayMode & GLUT_AUX2 )
pfd.cAuxBuffers = 2;
- else if( fgState.DisplayMode & GLUT_AUX1 )
- pfd.cAuxBuffers = 1;
+ else if( fgState.DisplayMode & GLUT_AUX1 ) /* NOTE: Same as GLUT_AUX! */
+ pfd.cAuxBuffers = fgState.AuxiliaryBufferNumber;
else
pfd.cAuxBuffers = 0;
pAttributes[iCounter++]=WGL_DOUBLE_BUFFER_ARB; pAttributes[iCounter++]=(fgState.DisplayMode & GLUT_DOUBLE)!=0;
pAttributes[iCounter++]=WGL_SAMPLE_BUFFERS_ARB; pAttributes[iCounter++]=GL_TRUE;
- pAttributes[iCounter++]=WGL_SAMPLES_ARB; pAttributes[iCounter++]=4;
+ pAttributes[iCounter++]=WGL_SAMPLES_ARB; pAttributes[iCounter++]=fgState.SampleNumber;
pAttributes[iCounter++]=0; pAttributes[iCounter++]=0; /* terminator */
bValid = wglChoosePixelFormatARBProc(window->Window.Device,pAttributes,fAttributes,1,&iPixelFormat,&numFormats);
{
#if TARGET_HOST_POSIX_X11
- glXDestroyContext( fgDisplay.Display, window->Window.Context );
+ if( window->Window.Context )
+ glXDestroyContext( fgDisplay.Display, window->Window.Context );
XFree( window->Window.FBConfig );
XDestroyWindow( fgDisplay.Display, window->Window.Handle );
/* XFlush( fgDisplay.Display ); */ /* XXX Shouldn't need this */
GL_FALSE, GL_FALSE )->ID;
}
+#ifdef _WIN32
+int FGAPIENTRY __glutCreateWindowWithExit( const char *title, void (__cdecl *exit_function)(int) )
+{
+ __glutExitFunc = exit_function;
+ return glutCreateWindow( title );
+}
+#endif
+
/*
* This function creates a sub window.
*/