FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added support for sRGB framebuffers via the GLX_ARB_framebuffer_sRGB /

Browse Source 
WGL_ARB_framebuffer_sRGB extensions. Added support for context profiles via the
new parts of the GLX_ARB_create_context / WGL_ARB_create_context extensions.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@832 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
spanne 2009-08-10 18:39:58 +00:00
parent 5c6071fa45
commit baf772ecb7
9 changed files with 359 additions and 236 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
freeglut/freeglut/ChangeLog
View File

@ -1,3 +1,12 @@
2009-08-10 Sven Panne <sven.panne@aedion.de>
* include/GL/freeglut_ext.h,include/GL/freeglut_std.h,src/freeglut_ext.c,
src/freeglut_init.c,src/freeglut_internal.h,src/freeglut_state.c,
src/freeglut_window.c,src/freeglutdll.def: Added support for sRGB
framebuffers via the GLX_ARB_framebuffer_sRGB / WGL_ARB_framebuffer_sRGB
extensions. Added support for context profiles via the new parts of the
GLX_ARB_create_context / WGL_ARB_create_context extensions.
2009-06-11 Paul Blew <paul.blew@northgatearinso.com> 2009-06-11 Paul Blew <paul.blew@northgatearinso.com>
* replaced broken IDE based OpenWatcom build with a makefile based one * replaced broken IDE based OpenWatcom build with a makefile based one

16
freeglut/freeglut/include/GL/freeglut_ext.h
View File

@ -95,6 +95,7 @@
#define GLUT_INIT_MAJOR_VERSION 0x0200 #define GLUT_INIT_MAJOR_VERSION 0x0200
#define GLUT_INIT_MINOR_VERSION 0x0201 #define GLUT_INIT_MINOR_VERSION 0x0201
#define GLUT_INIT_FLAGS 0x0202 #define GLUT_INIT_FLAGS 0x0202
#define GLUT_INIT_PROFILE 0x0203
/* /*
* Flags for glutInitContextFlags, see freeglut_init.c * Flags for glutInitContextFlags, see freeglut_init.c
@ -102,6 +103,13 @@
#define GLUT_DEBUG 0x0001 #define GLUT_DEBUG 0x0001
#define GLUT_FORWARD_COMPATIBLE 0x0002 #define GLUT_FORWARD_COMPATIBLE 0x0002
/*
* Flags for glutInitContextProfile, see freeglut_init.c
*/
#define GLUT_CORE_PROFILE 0x0001
#define GLUT_COMPATIBILITY_PROFILE 0x0002
/* /*
* Process loop function, see freeglut_main.c * Process loop function, see freeglut_main.c
*/ */
@ -186,6 +194,14 @@ void glutJoystickGetCenter( int ident, float *axes );
*/ */
FGAPI void FGAPIENTRY glutInitContextVersion( int majorVersion, int minorVersion ); FGAPI void FGAPIENTRY glutInitContextVersion( int majorVersion, int minorVersion );
FGAPI void FGAPIENTRY glutInitContextFlags( int flags ); FGAPI void FGAPIENTRY glutInitContextFlags( int flags );
FGAPI void FGAPIENTRY glutInitContextProfile( int profile );
/*
* GLUT API macro definitions -- the display mode definitions
*/
#define GLUT_CAPTIONLESS 0x0400
#define GLUT_BORDERLESS 0x0800
#define GLUT_SRGB 0x1000
#ifdef __cplusplus #ifdef __cplusplus
} }

2
freeglut/freeglut/include/GL/freeglut_std.h
View File

@ -171,8 +171,6 @@
#define GLUT_MULTISAMPLE 0x0080 #define GLUT_MULTISAMPLE 0x0080
#define GLUT_STEREO 0x0100 #define GLUT_STEREO 0x0100
#define GLUT_LUMINANCE 0x0200 #define GLUT_LUMINANCE 0x0200
#define GLUT_CAPTIONLESS 0x0400
#define GLUT_BORDERLESS 0x0800
/* /*
* GLUT API macro definitions -- windows and menu related definitions * GLUT API macro definitions -- windows and menu related definitions

1
freeglut/freeglut/src/freeglut_ext.c
View File

@ -195,6 +195,7 @@ static GLUTproc fghGetGLUTProcAddress( const char* procName )
CHECK_NAME(glutJoystickGetCenter); CHECK_NAME(glutJoystickGetCenter);
CHECK_NAME(glutInitContextVersion); CHECK_NAME(glutInitContextVersion);
CHECK_NAME(glutInitContextFlags); CHECK_NAME(glutInitContextFlags);
CHECK_NAME(glutInitContextProfile);
#undef CHECK_NAME #undef CHECK_NAME
return NULL; return NULL;

10
freeglut/freeglut/src/freeglut_init.c
View File

@ -89,7 +89,8 @@ SFG_State fgState = { { -1, -1, GL_FALSE }, /* Position */
4, /* SampleNumber */ 4, /* SampleNumber */
1, /* MajorVersion */ 1, /* MajorVersion */
0, /* MajorVersion */ 0, /* MajorVersion */
0 /* ContextFlags */ 0, /* ContextFlags */
0 /* ContextProfile */
}; };
@ -425,6 +426,7 @@ void fgDeinitialize( void )
fgState.MajorVersion = 1; fgState.MajorVersion = 1;
fgState.MinorVersion = 0; fgState.MinorVersion = 0;
fgState.ContextFlags = 0; fgState.ContextFlags = 0;
fgState.ContextProfile = 0;
fgState.Initialised = GL_FALSE; fgState.Initialised = GL_FALSE;
@ -1153,4 +1155,10 @@ void FGAPIENTRY glutInitContextFlags( int flags )
fgState.ContextFlags = flags; fgState.ContextFlags = flags;
} }
void FGAPIENTRY glutInitContextProfile( int profile )
{
/* We will make use of this value when creating a new OpenGL context... */
fgState.ContextProfile = profile;
}
/*** END OF FILE ***/ /*** END OF FILE ***/

1
freeglut/freeglut/src/freeglut_internal.h
View File

@ -324,6 +324,7 @@ struct tagSFG_State
int MajorVersion; /* Major OpenGL context version */ int MajorVersion; /* Major OpenGL context version */
int MinorVersion; /* Minor OpenGL context version */ int MinorVersion; /* Minor OpenGL context version */
int ContextFlags; /* OpenGL context flags */ int ContextFlags; /* OpenGL context flags */
int ContextProfile; /* OpenGL context profile */
}; };
/* The structure used by display initialization in freeglut_init.c */ /* The structure used by display initialization in freeglut_init.c */

1
freeglut/freeglut/src/freeglut_state.c
View File

@ -206,6 +206,7 @@ int FGAPIENTRY glutGet( GLenum eWhat )
case GLUT_INIT_MAJOR_VERSION: return fgState.MajorVersion ; case GLUT_INIT_MAJOR_VERSION: return fgState.MajorVersion ;
case GLUT_INIT_MINOR_VERSION: return fgState.MinorVersion ; case GLUT_INIT_MINOR_VERSION: return fgState.MinorVersion ;
case GLUT_INIT_FLAGS: return fgState.ContextFlags ; case GLUT_INIT_FLAGS: return fgState.ContextFlags ;
case GLUT_INIT_PROFILE: return fgState.ContextProfile ;
#if TARGET_HOST_POSIX_X11 #if TARGET_HOST_POSIX_X11
/* /*

554
freeglut/freeglut/src/freeglut_window.c
View File

@ -51,6 +51,10 @@ static wchar_t* fghWstrFromStr(const char* str)
#endif /* defined(_WIN32_WCE) */ #endif /* defined(_WIN32_WCE) */
/* pushing attribute/value pairs into an array */
#define ATTRIB(a) attributes[where++]=(a)
#define ATTRIB_VAL(a,v) {ATTRIB(a); ATTRIB(v);}
/* /*
* TODO BEFORE THE STABLE RELEASE: * TODO BEFORE THE STABLE RELEASE:
* *
@ -76,88 +80,120 @@ static wchar_t* fghWstrFromStr(const char* str)
/* -- PRIVATE FUNCTIONS ---------------------------------------------------- */ /* -- PRIVATE FUNCTIONS ---------------------------------------------------- */
static int fghIsLegacyContextVersionRequested( void )
{
return fgState.MajorVersion == 1 && fgState.MinorVersion == 0;
}
static int fghIsLegacyContextRequested( void )
{
return fghIsLegacyContextVersionRequested() &&
fgState.ContextFlags == 0 &&
fgState.ContextProfile == 0;
}
static int fghNumberOfAuxBuffersRequested( void )
{
if ( fgState.DisplayMode & GLUT_AUX4 ) {
return 4;
}
if ( fgState.DisplayMode & GLUT_AUX3 ) {
return 3;
}
if ( fgState.DisplayMode & GLUT_AUX2 ) {
return 2;
}
if ( fgState.DisplayMode & GLUT_AUX1 ) { /* NOTE: Same as GLUT_AUX! */
return fgState.AuxiliaryBufferNumber;
}
return 0;
}
static int fghMapBit( int mask, int from, int to )
{
return ( mask & from ) ? to : 0;
}
static void fghContextCreationError( void )
{
fgError( "Unable to create OpenGL %d.%d context (flags %x, profile %x)",
fgState.MajorVersion, fgState.MinorVersion, fgState.ContextFlags,
fgState.ContextProfile );
}
/* /*
* Chooses a visual basing on the current display mode settings * Chooses a visual basing on the current display mode settings
*/ */
#if TARGET_HOST_POSIX_X11 #if TARGET_HOST_POSIX_X11
#ifndef GLX_FRAMEBUFFER_SRGB_CAPABLE_ARB
#define GLX_FRAMEBUFFER_SRGB_CAPABLE_ARB 0x20B2
#endif
GLXFBConfig* fgChooseFBConfig( void ) GLXFBConfig* fgChooseFBConfig( void )
{ {
GLboolean wantIndexedMode = GL_FALSE; GLboolean wantIndexedMode = GL_FALSE;
int attributes[ 32 ]; int attributes[ 100 ];
int where = 0; int where = 0, numAuxBuffers;
/* First we have to process the display mode settings... */ /* First we have to process the display mode settings... */
/* if( fgState.DisplayMode & GLUT_INDEX ) {
* XXX Why is there a semi-colon in this #define? The code ATTRIB_VAL( GLX_BUFFER_SIZE, 8 );
* XXX that uses the macro seems to always add more semicolons... /* Buffer size is selected later. */
*/
#define ATTRIB(a) attributes[where++]=a;
#define ATTRIB_VAL(a,v) {ATTRIB(a); ATTRIB(v);}
if( fgState.DisplayMode & GLUT_INDEX ) ATTRIB_VAL( GLX_RENDER_TYPE, GLX_COLOR_INDEX_BIT );
{ wantIndexedMode = GL_TRUE;
ATTRIB_VAL( GLX_BUFFER_SIZE, 8 ); } else {
/* Buffer size is selected later. */ ATTRIB_VAL( GLX_RED_SIZE, 1 );
ATTRIB_VAL( GLX_GREEN_SIZE, 1 );
ATTRIB_VAL( GLX_RENDER_TYPE, GLX_COLOR_INDEX_BIT ); ATTRIB_VAL( GLX_BLUE_SIZE, 1 );
wantIndexedMode = GL_TRUE; if( fgState.DisplayMode & GLUT_ALPHA ) {
ATTRIB_VAL( GLX_ALPHA_SIZE, 1 );
} }
else }
{
ATTRIB_VAL( GLX_RED_SIZE, 1 ); if( fgState.DisplayMode & GLUT_DOUBLE ) {
ATTRIB_VAL( GLX_GREEN_SIZE, 1 ); ATTRIB_VAL( GLX_DOUBLEBUFFER, True );
ATTRIB_VAL( GLX_BLUE_SIZE, 1 ); }
if( fgState.DisplayMode & GLUT_ALPHA )
ATTRIB_VAL( GLX_ALPHA_SIZE, 1 ); if( fgState.DisplayMode & GLUT_STEREO ) {
ATTRIB_VAL( GLX_STEREO, True );
}
if( fgState.DisplayMode & GLUT_DEPTH ) {
ATTRIB_VAL( GLX_DEPTH_SIZE, 1 );
}
if( fgState.DisplayMode & GLUT_STENCIL ) {
ATTRIB_VAL( GLX_STENCIL_SIZE, 1 );
}
if( fgState.DisplayMode & GLUT_ACCUM ) {
ATTRIB_VAL( GLX_ACCUM_RED_SIZE, 1 );
ATTRIB_VAL( GLX_ACCUM_GREEN_SIZE, 1 );
ATTRIB_VAL( GLX_ACCUM_BLUE_SIZE, 1 );
if( fgState.DisplayMode & GLUT_ALPHA ) {
ATTRIB_VAL( GLX_ACCUM_ALPHA_SIZE, 1 );
} }
}
if( fgState.DisplayMode & GLUT_DOUBLE ) numAuxBuffers = fghNumberOfAuxBuffersRequested();
ATTRIB_VAL( GLX_DOUBLEBUFFER, True ); if ( numAuxBuffers > 0 ) {
ATTRIB_VAL( GLX_AUX_BUFFERS, numAuxBuffers );
}
if( fgState.DisplayMode & GLUT_STEREO ) if( fgState.DisplayMode & GLUT_SRGB ) {
ATTRIB_VAL( GLX_STEREO, True ); ATTRIB_VAL( GLX_FRAMEBUFFER_SRGB_CAPABLE_ARB, True );
}
if( fgState.DisplayMode & GLUT_DEPTH ) if (fgState.DisplayMode & GLUT_MULTISAMPLE) {
ATTRIB_VAL( GLX_DEPTH_SIZE, 1 ); ATTRIB_VAL(GLX_SAMPLE_BUFFERS, 1);
ATTRIB_VAL(GLX_SAMPLES, fgState.SampleNumber);
}
if( fgState.DisplayMode & GLUT_STENCIL ) /* Push a terminator at the end of the list */
ATTRIB_VAL( GLX_STENCIL_SIZE, 1 ); ATTRIB( None );
if( fgState.DisplayMode & GLUT_ACCUM )
{
ATTRIB_VAL( GLX_ACCUM_RED_SIZE, 1 );
ATTRIB_VAL( GLX_ACCUM_GREEN_SIZE, 1 );
ATTRIB_VAL( GLX_ACCUM_BLUE_SIZE, 1 );
if( fgState.DisplayMode & GLUT_ALPHA )
ATTRIB_VAL( GLX_ACCUM_ALPHA_SIZE, 1 );
}
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)
{
ATTRIB_VAL(GLX_SAMPLE_BUFFERS, 1)
ATTRIB_VAL(GLX_SAMPLES, fgState.SampleNumber)
}
/* Push a null at the end of the list */
ATTRIB( None );
{ {
GLXFBConfig * fbconfigArray; /* Array of FBConfigs */ GLXFBConfig * fbconfigArray; /* Array of FBConfigs */
@ -291,6 +327,9 @@ typedef BOOL (WINAPI * PFNWGLCHOOSEPIXELFORMATARBPROC) (HDC hdc, const int *piAt
#define WGL_SAMPLE_BUFFERS_ARB 0x2041 #define WGL_SAMPLE_BUFFERS_ARB 0x2041
#define WGL_SAMPLES_ARB 0x2042 #define WGL_SAMPLES_ARB 0x2042
#define WGL_TYPE_RGBA_FLOAT_ARB 0x21A0
#define WGL_FRAMEBUFFER_SRGB_CAPABLE_ARB 0x20A9
#ifndef WGL_ARB_create_context #ifndef WGL_ARB_create_context
#define WGL_ARB_create_context 1 #define WGL_ARB_create_context 1
@ -299,54 +338,80 @@ extern HGLRC WINAPI wglCreateContextAttribsARB (HDC, HGLRC, const int *);
#endif /* WGL_WGLEXT_PROTOTYPES */ #endif /* WGL_WGLEXT_PROTOTYPES */
typedef HGLRC (WINAPI * PFNWGLCREATECONTEXTATTRIBSARBPROC) (HDC hDC, HGLRC hShareContext, const int *attribList); typedef HGLRC (WINAPI * PFNWGLCREATECONTEXTATTRIBSARBPROC) (HDC hDC, HGLRC hShareContext, const int *attribList);
#define WGL_CONTEXT_DEBUG_BIT_ARB 0x0001
#define WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x0002
#define WGL_CONTEXT_MAJOR_VERSION_ARB 0x2091 #define WGL_CONTEXT_MAJOR_VERSION_ARB 0x2091
#define WGL_CONTEXT_MINOR_VERSION_ARB 0x2092 #define WGL_CONTEXT_MINOR_VERSION_ARB 0x2092
#define WGL_CONTEXT_LAYER_PLANE_ARB 0x2093 #define WGL_CONTEXT_LAYER_PLANE_ARB 0x2093
#define WGL_CONTEXT_FLAGS_ARB 0x2094 #define WGL_CONTEXT_FLAGS_ARB 0x2094
#define WGL_CONTEXT_PROFILE_MASK_ARB 0x9126
#define WGL_CONTEXT_DEBUG_BIT_ARB 0x0001
#define WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x0002
#define WGL_CONTEXT_CORE_PROFILE_BIT_ARB 0x00000001
#define WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 0x00000002
#define ERROR_INVALID_VERSION_ARB 0x2095 #define ERROR_INVALID_VERSION_ARB 0x2095
#define ERROR_INVALID_PROFILE_ARB 0x2096
#endif #endif
static void fghFillContextAttributes( int *attributes ) {
int where = 0, contextFlags, contextProfile;
if ( !fghIsLegacyContextVersionRequested() ) {
ATTRIB_VAL( WGL_CONTEXT_MAJOR_VERSION_ARB, fgState.MajorVersion );
ATTRIB_VAL( WGL_CONTEXT_MINOR_VERSION_ARB, fgState.MinorVersion );
}
contextFlags =
fghMapBit( fgState.ContextFlags, GLUT_DEBUG, WGL_CONTEXT_DEBUG_BIT_ARB ) |
fghMapBit( fgState.ContextFlags, GLUT_FORWARD_COMPATIBLE, WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB );
if ( contextFlags != 0 ) {
ATTRIB_VAL( WGL_CONTEXT_FLAGS_ARB, contextFlags );
}
contextProfile =
fghMapBit( fgState.ContextProfile, GLUT_CORE_PROFILE, WGL_CONTEXT_CORE_PROFILE_BIT_ARB ) |
fghMapBit( fgState.ContextProfile, GLUT_COMPATIBILITY_PROFILE, WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB );
if ( contextProfile != 0 ) {
ATTRIB_VAL( WGL_CONTEXT_PROFILE_MASK_ARB, contextProfile );
}
ATTRIB( 0 );
}
static int fghIsExtensionSupported( HDC hdc, const char *extension ) {
const char *pWglExtString;
PFNWGLGETEXTENSIONSSTRINGARBPROC wglGetEntensionsStringARB =
(PFNWGLGETEXTENSIONSSTRINGARBPROC) wglGetProcAddress("wglGetExtensionsStringARB");
if ( wglGetEntensionsStringARB == NULL )
{
return FALSE;
}
pWglExtString = wglGetEntensionsStringARB( hdc );
return ( pWglExtString != NULL ) && ( strstr(pWglExtString, extension) != NULL );
}
void fgNewWGLCreateContext( SFG_Window* window ) void fgNewWGLCreateContext( SFG_Window* window )
{ {
PFNWGLGETEXTENSIONSSTRINGARBPROC wglGetEntensionsStringARB;
HGLRC context; HGLRC context;
int attribs[7]; int attributes[9];
PFNWGLCREATECONTEXTATTRIBSARBPROC wglCreateContextAttribsARB; PFNWGLCREATECONTEXTATTRIBSARBPROC wglCreateContextAttribsARB;
const char * pWglExtString;
/* If nothing fancy has been required, leave the context as it is */ /* If nothing fancy has been required, leave the context as it is */
if ( fgState.MajorVersion == 1 && fgState.MinorVersion == 0 && fgState.ContextFlags == 0 ) if ( fghIsLegacyContextRequested() )
{ {
return; return;
} }
wglMakeCurrent( window->Window.Device, wglMakeCurrent( window->Window.Device, window->Window.Context );
window->Window.Context );
wglGetEntensionsStringARB=(PFNWGLGETEXTENSIONSSTRINGARBPROC)wglGetProcAddress("wglGetExtensionsStringARB"); if ( !fghIsExtensionSupported( window->Window.Device, "WGL_ARB_create_context" ) )
if ( wglGetEntensionsStringARB == NULL )
{
return;
}
pWglExtString=wglGetEntensionsStringARB(window->Window.Device);
if (( pWglExtString == NULL ) || ( strstr(pWglExtString, "WGL_ARB_create_context") == NULL ))
{ {
return; return;
} }
/* new context creation */ /* new context creation */
attribs[0] = WGL_CONTEXT_MAJOR_VERSION_ARB; fghFillContextAttributes( attributes );
attribs[1] = fgState.MajorVersion;
attribs[2] = WGL_CONTEXT_MINOR_VERSION_ARB;
attribs[3] = fgState.MinorVersion;
attribs[4] = WGL_CONTEXT_FLAGS_ARB;
attribs[5] = ((fgState.ContextFlags & GLUT_DEBUG) ? WGL_CONTEXT_DEBUG_BIT_ARB : 0) |
((fgState.ContextFlags & GLUT_FORWARD_COMPATIBLE) ? WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB : 0);
attribs[6] = 0;
wglCreateContextAttribsARB = (PFNWGLCREATECONTEXTATTRIBSARBPROC) wglGetProcAddress( "wglCreateContextAttribsARB" ); wglCreateContextAttribsARB = (PFNWGLCREATECONTEXTATTRIBSARBPROC) wglGetProcAddress( "wglCreateContextAttribsARB" );
if ( wglCreateContextAttribsARB == NULL ) if ( wglCreateContextAttribsARB == NULL )
@ -354,11 +419,10 @@ void fgNewWGLCreateContext( SFG_Window* window )
fgError( "wglCreateContextAttribsARB not found" ); fgError( "wglCreateContextAttribsARB not found" );
} }
context = wglCreateContextAttribsARB( window->Window.Device, 0, attribs ); context = wglCreateContextAttribsARB( window->Window.Device, 0, attributes );
if ( context == NULL ) if ( context == NULL )
{ {
fgError( "Unable to create OpenGL %d.%d context (flags %x)", fghContextCreationError();
fgState.MajorVersion, fgState.MinorVersion, fgState.ContextFlags );
} }
wglMakeCurrent( NULL, NULL ); wglMakeCurrent( NULL, NULL );
@ -366,6 +430,90 @@ void fgNewWGLCreateContext( SFG_Window* window )
window->Window.Context = context; window->Window.Context = context;
} }
#if !defined(_WIN32_WCE)
static void fghFillPFD( PIXELFORMATDESCRIPTOR *ppfd, HDC hdc, unsigned char layer_type )
{
int flags = PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL;
if ( fgState.DisplayMode & GLUT_DOUBLE ) {
flags |= PFD_DOUBLEBUFFER;
}
if ( fgState.DisplayMode & GLUT_STEREO ) {
flags |= PFD_STEREO;
}
#if defined(_MSC_VER)
#pragma message( "fgSetupPixelFormat(): there is still some work to do here!" )
#endif
/* Specify which pixel format do we opt for... */
ppfd->nSize = sizeof(PIXELFORMATDESCRIPTOR);
ppfd->nVersion = 1;
ppfd->dwFlags = flags;
if( fgState.DisplayMode & GLUT_INDEX ) {
ppfd->iPixelType = PFD_TYPE_COLORINDEX;
ppfd->cRedBits = 0;
ppfd->cGreenBits = 0;
ppfd->cBlueBits = 0;
ppfd->cAlphaBits = 0;
} else {
ppfd->iPixelType = PFD_TYPE_RGBA;
ppfd->cRedBits = 8;
ppfd->cGreenBits = 8;
ppfd->cBlueBits = 8;
ppfd->cAlphaBits = ( fgState.DisplayMode & GLUT_ALPHA ) ? 8 : 0;
}
ppfd->cColorBits = 24;
ppfd->cRedShift = 0;
ppfd->cGreenShift = 0;
ppfd->cBlueShift = 0;
ppfd->cAlphaShift = 0;
ppfd->cAccumBits = 0;
ppfd->cAccumRedBits = 0;
ppfd->cAccumGreenBits = 0;
ppfd->cAccumBlueBits = 0;
ppfd->cAccumAlphaBits = 0;
/* Hmmm, or 32/0 instead of 24/8? */
ppfd->cDepthBits = 24;
ppfd->cStencilBits = 8;
ppfd->cAuxBuffers = fghNumberOfAuxBuffersRequested();
ppfd->iLayerType = layer_type;
ppfd->bReserved = 0;
ppfd->dwLayerMask = 0;
ppfd->dwVisibleMask = 0;
ppfd->dwDamageMask = 0;
ppfd->cColorBits = (BYTE) GetDeviceCaps( hdc, BITSPIXEL );
}
static void fghFillPixelFormatAttributes( int *attributes, const PIXELFORMATDESCRIPTOR *ppfd )
{
int where = 0;
ATTRIB_VAL( WGL_DRAW_TO_WINDOW_ARB, GL_TRUE );
ATTRIB_VAL( WGL_SUPPORT_OPENGL_ARB, GL_TRUE );
ATTRIB_VAL( WGL_ACCELERATION_ARB, WGL_FULL_ACCELERATION_ARB );
ATTRIB_VAL( WGL_COLOR_BITS_ARB, ppfd->cColorBits );
ATTRIB_VAL( WGL_ALPHA_BITS_ARB, ppfd->cAlphaBits );
ATTRIB_VAL( WGL_DEPTH_BITS_ARB, ppfd->cDepthBits );
ATTRIB_VAL( WGL_STENCIL_BITS_ARB, ppfd->cStencilBits );
ATTRIB_VAL( WGL_DOUBLE_BUFFER_ARB, ( fgState.DisplayMode & GLUT_DOUBLE ) != 0 );
if ( fgState.DisplayMode & GLUT_SRGB ) {
ATTRIB_VAL( WGL_FRAMEBUFFER_SRGB_CAPABLE_ARB, TRUE );
}
ATTRIB_VAL( WGL_SAMPLE_BUFFERS_ARB, GL_TRUE );
ATTRIB_VAL( WGL_SAMPLES_ARB, fgState.SampleNumber );
ATTRIB( 0 );
}
#endif
GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly, GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,
unsigned char layer_type ) unsigned char layer_type )
@ -373,89 +521,17 @@ GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,
#if defined(_WIN32_WCE) #if defined(_WIN32_WCE)
return GL_TRUE; return GL_TRUE;
#else #else
PIXELFORMATDESCRIPTOR* ppfd, pfd; PIXELFORMATDESCRIPTOR pfd;
int flags, pixelformat; PIXELFORMATDESCRIPTOR* ppfd = &pfd;
int pixelformat;
freeglut_return_val_if_fail( window != NULL, 0 );
flags = PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL;
if( fgState.DisplayMode & GLUT_DOUBLE )
flags |= PFD_DOUBLEBUFFER;
if( fgState.DisplayMode & GLUT_STEREO )
flags |= PFD_STEREO;
#if defined(_MSC_VER)
#pragma message( "fgSetupPixelFormat(): there is still some work to do here!" )
#endif
/* Specify which pixel format do we opt for... */
pfd.nSize = sizeof(PIXELFORMATDESCRIPTOR);
pfd.nVersion = 1;
pfd.dwFlags = flags;
if( fgState.DisplayMode & GLUT_INDEX )
{
pfd.iPixelType = PFD_TYPE_COLORINDEX;
pfd.cRedBits = 0;
pfd.cGreenBits = 0;
pfd.cBlueBits = 0;
pfd.cAlphaBits = 0;
}
else
{
pfd.iPixelType = PFD_TYPE_RGBA;
pfd.cRedBits = 8;
pfd.cGreenBits = 8;
pfd.cBlueBits = 8;
if ( fgState.DisplayMode & GLUT_ALPHA )
pfd.cAlphaBits = 8;
else
pfd.cAlphaBits = 0;
}
pfd.cColorBits = 24;
pfd.cRedShift = 0;
pfd.cGreenShift = 0;
pfd.cBlueShift = 0;
pfd.cAlphaShift = 0;
pfd.cAccumBits = 0;
pfd.cAccumRedBits = 0;
pfd.cAccumGreenBits = 0;
pfd.cAccumBlueBits = 0;
pfd.cAccumAlphaBits = 0;
#if 0
pfd.cDepthBits = 32;
pfd.cStencilBits = 0;
#else
pfd.cDepthBits = 24;
pfd.cStencilBits = 8;
#endif
if( fgState.DisplayMode & GLUT_AUX4 )
pfd.cAuxBuffers = 4;
else if( fgState.DisplayMode & GLUT_AUX3 )
pfd.cAuxBuffers = 3;
else if( fgState.DisplayMode & GLUT_AUX2 )
pfd.cAuxBuffers = 2;
else if( fgState.DisplayMode & GLUT_AUX1 ) /* NOTE: Same as GLUT_AUX! */
pfd.cAuxBuffers = fgState.AuxiliaryBufferNumber;
else
pfd.cAuxBuffers = 0;
pfd.iLayerType = layer_type;
pfd.bReserved = 0;
pfd.dwLayerMask = 0;
pfd.dwVisibleMask = 0;
pfd.dwDamageMask = 0;
pfd.cColorBits = (BYTE) GetDeviceCaps( window->Window.Device, BITSPIXEL );
ppfd = &pfd;
fghFillPFD( ppfd, window->Window.Device, layer_type );
pixelformat = ChoosePixelFormat( window->Window.Device, ppfd ); pixelformat = ChoosePixelFormat( window->Window.Device, ppfd );
/* windows hack for multismapling */ /* windows hack for multismapling/sRGB */
if (fgState.DisplayMode&GLUT_MULTISAMPLE) if ( ( fgState.DisplayMode & GLUT_MULTISAMPLE ) ||
( fgState.DisplayMode & GLUT_SRGB ) )
{ {
PFNWGLGETEXTENSIONSSTRINGARBPROC wglGetEntensionsStringARB=NULL;
HGLRC rc, rc_before=wglGetCurrentContext(); HGLRC rc, rc_before=wglGetCurrentContext();
HWND hWnd; HWND hWnd;
HDC hDC, hDC_before=wglGetCurrentDC(); HDC hDC, hDC_before=wglGetCurrentDC();
@ -476,60 +552,35 @@ GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,
rc = wglCreateContext( hDC ); rc = wglCreateContext( hDC );
wglMakeCurrent(hDC, rc); wglMakeCurrent(hDC, rc);
wglGetEntensionsStringARB=(PFNWGLGETEXTENSIONSSTRINGARBPROC)wglGetProcAddress("wglGetExtensionsStringARB"); if ( fghIsExtensionSupported( hDC, "WGL_ARB_multisample" ) )
if (wglGetEntensionsStringARB)
{ {
const char * pWglExtString=wglGetEntensionsStringARB(hDC); PFNWGLCHOOSEPIXELFORMATARBPROC wglChoosePixelFormatARBProc =
if (pWglExtString) (PFNWGLCHOOSEPIXELFORMATARBPROC) wglGetProcAddress("wglChoosePixelFormatARB");
if ( wglChoosePixelFormatARBProc )
{ {
if (strstr(pWglExtString, "WGL_ARB_multisample")) int attributes[100];
int iPixelFormat;
BOOL bValid;
float fAttributes[] = { 0, 0 };
UINT numFormats;
fghFillPixelFormatAttributes( attributes, ppfd );
bValid = wglChoosePixelFormatARBProc(window->Window.Device, attributes, fAttributes, 1, &iPixelFormat, &numFormats);
if ( bValid && numFormats > 0 )
{ {
int pAttributes[100]; pixelformat = iPixelFormat;
int iCounter=0;
int iPixelFormat;
BOOL bValid;
float fAttributes[] = {0,0};
UINT numFormats;
PFNWGLCHOOSEPIXELFORMATARBPROC wglChoosePixelFormatARBProc=NULL;
wglChoosePixelFormatARBProc=(PFNWGLCHOOSEPIXELFORMATARBPROC)wglGetProcAddress("wglChoosePixelFormatARB");
if ( wglChoosePixelFormatARBProc )
{
pAttributes[iCounter++]=WGL_DRAW_TO_WINDOW_ARB; pAttributes[iCounter++]=GL_TRUE;
pAttributes[iCounter++]=WGL_SUPPORT_OPENGL_ARB; pAttributes[iCounter++]=GL_TRUE;
pAttributes[iCounter++]=WGL_ACCELERATION_ARB; pAttributes[iCounter++]=WGL_FULL_ACCELERATION_ARB;
pAttributes[iCounter++]=WGL_COLOR_BITS_ARB; pAttributes[iCounter++]=pfd.cColorBits ;
pAttributes[iCounter++]=WGL_ALPHA_BITS_ARB; pAttributes[iCounter++]=pfd.cAlphaBits;
pAttributes[iCounter++]=WGL_DEPTH_BITS_ARB; pAttributes[iCounter++]=pfd.cDepthBits;
pAttributes[iCounter++]=WGL_STENCIL_BITS_ARB; pAttributes[iCounter++]=pfd.cStencilBits;
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++]=fgState.SampleNumber;
pAttributes[iCounter++]=0; pAttributes[iCounter++]=0; /* terminator */
bValid = wglChoosePixelFormatARBProc(window->Window.Device,pAttributes,fAttributes,1,&iPixelFormat,&numFormats);
if (bValid && numFormats>0)
pixelformat=iPixelFormat;
}
} }
wglMakeCurrent( hDC_before, rc_before);
wglDeleteContext(rc);
ReleaseDC(hWnd, hDC);
DestroyWindow(hWnd);
UnregisterClass(_T("FREEGLUT_dummy"), fgDisplay.Instance);
} }
} }
wglMakeCurrent( hDC_before, rc_before);
wglDeleteContext(rc);
ReleaseDC(hWnd, hDC);
DestroyWindow(hWnd);
UnregisterClass(_T("FREEGLUT_dummy"), fgDisplay.Instance);
} }
if( pixelformat == 0 ) return ( pixelformat != 0 ) && ( checkOnly || SetPixelFormat( window->Window.Device, pixelformat, ppfd ) );
return GL_FALSE;
if( checkOnly )
return GL_TRUE;
return SetPixelFormat( window->Window.Device, pixelformat, ppfd );
#endif /* defined(_WIN32_WCE) */ #endif /* defined(_WIN32_WCE) */
} }
#endif /* TARGET_HOST_MS_WINDOWS */ #endif /* TARGET_HOST_MS_WINDOWS */
@ -581,6 +632,10 @@ void fgSetWindow ( SFG_Window *window )
#define GLX_CONTEXT_FLAGS_ARB 0x2094 #define GLX_CONTEXT_FLAGS_ARB 0x2094
#endif #endif
#ifndef GLX_CONTEXT_PROFILE_MASK_ARB
#define GLX_CONTEXT_PROFILE_MASK_ARB 0x9126
#endif
#ifndef GLX_CONTEXT_DEBUG_BIT_ARB #ifndef GLX_CONTEXT_DEBUG_BIT_ARB
#define GLX_CONTEXT_DEBUG_BIT_ARB 0x0001 #define GLX_CONTEXT_DEBUG_BIT_ARB 0x0001
#endif #endif
@ -589,6 +644,47 @@ void fgSetWindow ( SFG_Window *window )
#define GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x0002 #define GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x0002
#endif #endif
#ifndef GLX_CONTEXT_CORE_PROFILE_BIT_ARB
#define GLX_CONTEXT_CORE_PROFILE_BIT_ARB 0x00000001
#endif
#ifndef GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB
#define GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 0x00000002
#endif
#ifndef GLX_RGBA_FLOAT_TYPE
#define GLX_RGBA_FLOAT_TYPE 0x20B9
#endif
#ifndef GLX_RGBA_FLOAT_BIT
#define GLX_RGBA_FLOAT_BIT 0x00000004
#endif
static void fghFillContextAttributes( int *attributes ) {
int where = 0, contextFlags, contextProfile;
if ( !fghIsLegacyContextVersionRequested() ) {
ATTRIB_VAL( GLX_CONTEXT_MAJOR_VERSION_ARB, fgState.MajorVersion );
ATTRIB_VAL( GLX_CONTEXT_MINOR_VERSION_ARB, fgState.MinorVersion );
}
contextFlags =
fghMapBit( fgState.ContextFlags, GLUT_DEBUG, GLX_CONTEXT_DEBUG_BIT_ARB ) |
fghMapBit( fgState.ContextFlags, GLUT_FORWARD_COMPATIBLE, GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB );
if ( contextFlags != 0 ) {
ATTRIB_VAL( GLX_CONTEXT_FLAGS_ARB, contextFlags );
}
contextProfile =
fghMapBit( fgState.ContextProfile, GLUT_CORE_PROFILE, GLX_CONTEXT_CORE_PROFILE_BIT_ARB ) |
fghMapBit( fgState.ContextProfile, GLUT_COMPATIBILITY_PROFILE, GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB );
if ( contextProfile != 0 ) {
ATTRIB_VAL( GLX_CONTEXT_PROFILE_MASK_ARB, contextProfile );
}
ATTRIB( 0 );
}
typedef GLXContext (*CreateContextAttribsProc)(Display *dpy, GLXFBConfig config, typedef GLXContext (*CreateContextAttribsProc)(Display *dpy, GLXFBConfig config,
GLXContext share_list, Bool direct, GLXContext share_list, Bool direct,
const int *attrib_list); const int *attrib_list);
@ -608,15 +704,15 @@ static GLXContext fghCreateNewContext( SFG_Window* window )
GLXContext context; GLXContext context;
/* new context creation */ /* new context creation */
int attribs[7]; int attributes[9];
CreateContextAttribsProc createContextAttribs; CreateContextAttribsProc createContextAttribs;
/* If nothing fancy has been required, simply use the old context creation GLX API entry */ /* If nothing fancy has been required, simply use the old context creation GLX API entry */
if ( fgState.MajorVersion == 1 && fgState.MinorVersion == 0 && fgState.ContextFlags == 0) if ( fghIsLegacyContextRequested() )
{ {
context = glXCreateNewContext( dpy, config, render_type, share_list, direct ); context = glXCreateNewContext( dpy, config, render_type, share_list, direct );
if ( context == NULL ) { if ( context == NULL ) {
fgError( "could not create new OpenGL context" ); fghContextCreationError();
} }
return context; return context;
} }
@ -626,24 +722,16 @@ static GLXContext fghCreateNewContext( SFG_Window* window )
fgWarning( "color index mode is deprecated, using RGBA mode" ); fgWarning( "color index mode is deprecated, using RGBA mode" );
} }
attribs[0] = GLX_CONTEXT_MAJOR_VERSION_ARB; fghFillContextAttributes( attributes );
attribs[1] = fgState.MajorVersion;
attribs[2] = GLX_CONTEXT_MINOR_VERSION_ARB;
attribs[3] = fgState.MinorVersion;
attribs[4] = GLX_CONTEXT_FLAGS_ARB;
attribs[5] = ((fgState.ContextFlags & GLUT_DEBUG) ? GLX_CONTEXT_DEBUG_BIT_ARB : 0) |
((fgState.ContextFlags & GLUT_FORWARD_COMPATIBLE) ? GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB : 0);
attribs[6] = 0;
createContextAttribs = (CreateContextAttribsProc) fghGetProcAddress( "glXCreateContextAttribsARB" ); createContextAttribs = (CreateContextAttribsProc) fghGetProcAddress( "glXCreateContextAttribsARB" );
if ( createContextAttribs == NULL ) { if ( createContextAttribs == NULL ) {
fgError( "glXCreateContextAttribsARB not found" ); fgError( "glXCreateContextAttribsARB not found" );
} }
context = createContextAttribs( dpy, config, share_list, direct, attribs ); context = createContextAttribs( dpy, config, share_list, direct, attributes );
if ( context == NULL ) { if ( context == NULL ) {
fgError( "could not create new OpenGL %d.%d context (flags %x)", fghContextCreationError();
fgState.MajorVersion, fgState.MinorVersion, fgState.ContextFlags );
} }
return context; return context;
} }

1
freeglut/freeglut/src/freeglutdll.def
View File

@ -154,6 +154,7 @@ EXPORTS
glutGetModeValues glutGetModeValues
glutInitContextFlags glutInitContextFlags
glutInitContextVersion glutInitContextVersion
glutInitContextProfile
__glutInitWithExit __glutInitWithExit
__glutCreateWindowWithExit __glutCreateWindowWithExit
__glutCreateMenuWithExit __glutCreateMenuWithExit