X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_internal.h;h=770e9084236d71fd69fb044b3afa686ba5246a93;hb=30971e75717f3d7b826714fbbb1171dfaf9164cf;hp=8bedf5aa028fbfb344fa1829e4dcb01039af5bdc;hpb=71968c367fd725119878eb2d2225171a647002e8;p=freeglut diff --git a/src/freeglut_internal.h b/src/freeglut_internal.h index 8bedf5a..770e908 100644 --- a/src/freeglut_internal.h +++ b/src/freeglut_internal.h @@ -302,6 +302,9 @@ struct tagSFG_State char *ProgramName; /* Name of the invoking program */ GLboolean JoysticksInitialised; /* Only initialize if application calls for them */ GLboolean InputDevsInitialised; /* Only initialize if application calls for them */ + + int AuxiliaryBufferNumber; /* Number of auxiliary buffers */ + int SampleNumber; /* Number of samples per pixel */ }; /* The structure used by display initialization in freeglut_init.c */ @@ -380,7 +383,7 @@ struct tagSFG_Context SFG_WindowContextType Context; /* The window's OpenGL/WGL context */ #if TARGET_HOST_POSIX_X11 - XVisualInfo* VisualInfo; /* The window's visual information */ + GLXFBConfig* FBConfig; /* The window's FBConfig */ #elif TARGET_HOST_MS_WINDOWS HDC Device; /* The window's device context */ #endif @@ -556,10 +559,6 @@ enum typedef struct tagSFG_MenuContext SFG_MenuContext; struct tagSFG_MenuContext { -#if TARGET_HOST_POSIX_X11 - XVisualInfo* MVisualInfo; /* The window's visual information */ -#endif - SFG_WindowContextType MContext; /* The menu window's WGL context */ }; @@ -786,7 +785,7 @@ void fgDestroyStructure( void ); /* A helper function to check if a display mode is possible to use */ #if TARGET_HOST_POSIX_X11 -XVisualInfo* fgChooseVisual( void ); +GLXFBConfig* fgChooseFBConfig( void ); #endif /* The window procedure for Win32 events handling */ @@ -803,12 +802,14 @@ GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly, * Defined in freeglut_structure.c, freeglut_window.c. */ SFG_Window* fgCreateWindow( SFG_Window* parent, const char* title, - int x, int y, int w, int h, + GLboolean positionUse, int x, int y, + GLboolean sizeUse, int w, int h, GLboolean gameMode, GLboolean isMenu ); void fgSetWindow ( SFG_Window *window ); void fgOpenWindow( SFG_Window* window, const char* title, - int x, int y, int w, int h, GLboolean gameMode, - GLboolean isSubWindow ); + GLboolean positionUse, int x, int y, + GLboolean sizeUse, int w, int h, + GLboolean gameMode, GLboolean isSubWindow ); void fgCloseWindow( SFG_Window* window ); void fgAddToWindowDestroyList ( SFG_Window* window ); void fgCloseWindows ();