ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winex11: Get the current pixel format from the drawable structure for wglSetPixelFormat.

This commit is contained in:
Alexandre Julliard 2012-09-07 15:06:19 +02:00
parent 245308597f
commit ecc8559fe8
1 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
dlls/winex11.drv/opengl.c
View File

@ -1533,25 +1533,16 @@ static int glxdrv_wglGetPixelFormat( HDC hdc )
*/ */
static BOOL glxdrv_wglSetPixelFormat( HDC hdc, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd ) static BOOL glxdrv_wglSetPixelFormat( HDC hdc, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd )
{ {
struct x11drv_escape_get_drawable escape;
const struct wgl_pixel_format *fmt; const struct wgl_pixel_format *fmt;
int value; int value, prev = 0;
HWND hwnd; struct gl_drawable *gl;
HWND hwnd = WindowFromDC( hdc );
TRACE("(%p,%d,%p)\n", hdc, iPixelFormat, ppfd); TRACE("(%p,%d,%p)\n", hdc, iPixelFormat, ppfd);
escape.code = X11DRV_GET_DRAWABLE; if (!hwnd || hwnd == GetDesktopWindow())
if (!ExtEscape( hdc, X11DRV_ESCAPE, sizeof(escape.code), (LPCSTR)&escape.code,
sizeof(escape), (LPSTR)&escape ))
return 0;
if (escape.pixel_format) /* cannot change it if already set */
return (escape.pixel_format == iPixelFormat);
/* SetPixelFormat is not allowed on the X root_window e.g. GetDC(0) */
if (escape.drawable == root_window)
{ {
ERR("Invalid operation on root_window\n"); WARN( "not a proper window DC %p/%p\n", hdc, hwnd );
return FALSE; return FALSE;
} }
@ -1563,21 +1554,24 @@ static BOOL glxdrv_wglSetPixelFormat( HDC hdc, int iPixelFormat, const PIXELFORM
} }
pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DRAWABLE_TYPE, &value); pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DRAWABLE_TYPE, &value);
if (!(value & GLX_WINDOW_BIT))
hwnd = WindowFromDC( hdc ); {
if(hwnd) { WARN("Pixel format %d is not compatible for window rendering\n", iPixelFormat);
if(!(value&GLX_WINDOW_BIT)) { return FALSE;
WARN("Pixel format %d is not compatible for window rendering\n", iPixelFormat);
return FALSE;
}
if(!SendMessageW(hwnd, WM_X11DRV_SET_WIN_FORMAT, fmt->fmt_id, 0)) {
ERR("Couldn't set format of the window, returning failure\n");
return FALSE;
}
/* physDev->current_pf will be set by the DCE update */
} }
else FIXME("called on a non-window object?\n");
EnterCriticalSection( &context_section );
if (!XFindContext( gdi_display, (XID)hwnd, gl_drawable_context, (char **)&gl ))
prev = gl->pixel_format;
LeaveCriticalSection( &context_section );
if (prev) return prev == iPixelFormat; /* cannot change it if already set */
if(!SendMessageW(hwnd, WM_X11DRV_SET_WIN_FORMAT, fmt->fmt_id, 0)) {
ERR("Couldn't set format of the window, returning failure\n");
return FALSE;
}
/* physDev->current_pf will be set by the DCE update */
if (TRACE_ON(wgl)) { if (TRACE_ON(wgl)) {
int gl_test = 0; int gl_test = 0;