Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-04 08:25:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

[OPENGL32]

Browse source 
* Track pixel format with window handle for device contexts
 * Fix SetPixelFormat in case pixel format were already set

svn path=/trunk/; revision=56873
This commit is contained in:
Jérôme Gardou 2012-07-12 14:06:34 +00:00
parent 66340bca60
commit dc476b6bf5
2 changed files with 26 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/win32/opengl32/opengl32.h
View file

@ -158,7 +158,7 @@ typedef struct tagGLRC
/* OpenGL private device context data */
typedef struct tagGLDCDATA
{
HDC hdc; /*!< Device context handle for which this data is */
HANDLE handle; /*!< Handle for which this data is (HWND for device, HDC for memory context) */
GLDRIVERDATA *icd; /*!< Driver used for this DC */
int pixel_format; /*!< Selected pixel format */

45
reactos/dll/win32/opengl32/wgl.c
View file

@ -250,6 +250,7 @@ GLDCDATA *
ROSGL_GetPrivateDCData( HDC hdc )
{
GLDCDATA *data;
HANDLE handle;
/* check hdc */
if (GetObjectType( hdc ) != OBJ_DC && GetObjectType( hdc ) != OBJ_MEMDC)
@ -267,11 +268,17 @@ ROSGL_GetPrivateDCData( HDC hdc )
return NULL; /* FIXME: do we have to expect such an error and handle it? */
}
/* We must use the window to identify our data, as pixel format is
* specific to a window for device context */
handle = WindowFromDC(hdc);
if(!handle)
handle = hdc;
/* look for data in list */
data = OPENGL32_processdata.dcdata_list;
while (data != NULL)
{
if (data->hdc == hdc) /* found */
if (data->handle == handle) /* found */
break;
data = data->next;
}
@ -288,7 +295,7 @@ ROSGL_GetPrivateDCData( HDC hdc )
}
else
{
data->hdc = hdc;
data->handle = handle;
/* append data to list */
if (OPENGL32_processdata.dcdata_list == NULL)
@ -1111,34 +1118,32 @@ BOOL
WINAPI
rosglSetPixelFormat( HDC hdc, int iFormat, CONST PIXELFORMATDESCRIPTOR *pfd )
{
GLDRIVERDATA *icd;
GLDCDATA *dcdata;
GLDRIVERDATA* icd;
DBGTRACE( "Called!" );
/* load ICD */
icd = ROSGL_ICDForHDC( hdc );
if (icd == NULL)
{
DBGPRINT( "Warning: ICDForHDC() failed" );
return FALSE;
}
/* call ICD */
if (!icd->DrvSetPixelFormat( hdc, iFormat, pfd ))
{
DBGPRINT( "Warning: DrvSetPixelFormat(format=%d) failed (%d)",
iFormat, GetLastError() );
return FALSE;
}
/* store format in private DC data */
/* Get private DC data */
dcdata = ROSGL_GetPrivateDCData( hdc );
if (dcdata == NULL)
{
DBGPRINT( "Error: ROSGL_GetPrivateDCData() failed!" );
return FALSE;
}
/* you can set the same pixel format twice, but you can't modify it */
if(dcdata->pixel_format) return dcdata->pixel_format == iFormat;
icd = ROSGL_ICDForHDC(hdc);
if(icd == NULL)
return 0;
/* Call ICD function */
if (!icd->DrvSetPixelFormat( hdc, iFormat, pfd ))
{
DBGPRINT( "Warning: DrvSetPixelFormat(format=%d) failed (%d)",
iFormat, GetLastError() );
return FALSE;
}
dcdata->pixel_format = iFormat;
return TRUE;