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

Fixing bug 3105058. There is a possibly substantial change on line 783, where the "window->Window.Device" is replaced with "hDC" rather than "current_hDC" which was assigned to its value earlier.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@889 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
fayjf 2011-01-25 05:43:37 +00:00
parent dc9123210d
commit ad3899e6a1
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -733,9 +733,16 @@ GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,
PIXELFORMATDESCRIPTOR pfd; PIXELFORMATDESCRIPTOR pfd;
PIXELFORMATDESCRIPTOR* ppfd = &pfd; PIXELFORMATDESCRIPTOR* ppfd = &pfd;
int pixelformat; int pixelformat;
HDC current_hDC;
GLboolean success;
fghFillPFD( ppfd, window->Window.Device, layer_type ); if (checkOnly)
pixelformat = ChoosePixelFormat( window->Window.Device, ppfd ); current_hDC = CreateDC(TEXT("DISPLAY"), NULL ,NULL ,NULL);
else
current_hDC = window->Window.Device;
fghFillPFD( ppfd, current_hDC, layer_type );
pixelformat = ChoosePixelFormat( current_hDC, ppfd );
/* windows hack for multismapling/sRGB */ /* windows hack for multismapling/sRGB */
if ( ( fgState.DisplayMode & GLUT_MULTISAMPLE ) || if ( ( fgState.DisplayMode & GLUT_MULTISAMPLE ) ||
@ -757,10 +764,10 @@ GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,
hWnd=CreateWindow(_T("FREEGLUT_dummy"), _T(""), WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_OVERLAPPEDWINDOW , 0,0,0,0, 0, 0, fgDisplay.Instance, 0 ); hWnd=CreateWindow(_T("FREEGLUT_dummy"), _T(""), WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_OVERLAPPEDWINDOW , 0,0,0,0, 0, 0, fgDisplay.Instance, 0 );
hDC=GetDC(hWnd); hDC=GetDC(hWnd);
SetPixelFormat( hDC, pixelformat, ppfd ); SetPixelFormat( hDC, pixelformat, ppfd );
rc = wglCreateContext( hDC ); rc = wglCreateContext( hDC );
wglMakeCurrent(hDC, rc); wglMakeCurrent(hDC, rc);
if ( fghIsExtensionSupported( hDC, "WGL_ARB_multisample" ) ) if ( fghIsExtensionSupported( hDC, "WGL_ARB_multisample" ) )
{ {
PFNWGLCHOOSEPIXELFORMATARBPROC wglChoosePixelFormatARBProc = PFNWGLCHOOSEPIXELFORMATARBPROC wglChoosePixelFormatARBProc =
@ -773,7 +780,7 @@ GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,
float fAttributes[] = { 0, 0 }; float fAttributes[] = { 0, 0 };
UINT numFormats; UINT numFormats;
fghFillPixelFormatAttributes( attributes, ppfd ); fghFillPixelFormatAttributes( attributes, ppfd );
bValid = wglChoosePixelFormatARBProc(window->Window.Device, attributes, fAttributes, 1, &iPixelFormat, &numFormats); bValid = wglChoosePixelFormatARBProc(hDC, attributes, fAttributes, 1, &iPixelFormat, &numFormats);
if ( bValid && numFormats > 0 ) if ( bValid && numFormats > 0 )
{ {
@ -789,7 +796,12 @@ GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,
UnregisterClass(_T("FREEGLUT_dummy"), fgDisplay.Instance); UnregisterClass(_T("FREEGLUT_dummy"), fgDisplay.Instance);
} }
return ( pixelformat != 0 ) && ( checkOnly || SetPixelFormat( window->Window.Device, pixelformat, ppfd ) ); success = ( pixelformat != 0 ) && ( checkOnly || SetPixelFormat( current_hDC, pixelformat, ppfd ) );
if (checkOnly)
DeleteDC(current_hDC);
return success;
#endif /* defined(_WIN32_WCE) */ #endif /* defined(_WIN32_WCE) */
} }