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

winex11: Check for WGL drawing caps.

This commit is contained in:
Chris Robinson 2007-08-01 04:37:03 -07:00 committed by Alexandre Julliard
parent 2777a94d4e
commit c37b95bbaa
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -687,12 +687,7 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, Wine_GLPBuf
case WGL_SUPPORT_GDI_ARB: case WGL_SUPPORT_GDI_ARB:
pop = iWGLAttr[++cur]; pop = iWGLAttr[++cur];
/* We only support a limited number of formats which are all renderable by X (similar to GDI). PUSH2(oGLXAttr, GLX_X_RENDERABLE, pop);
* Ignore this attribute to prevent us from not finding a match due to the limited
* amount of formats supported right now. This option could be matched to GLX_X_RENDERABLE
* but the issue is that when a program asks for no GDI support, there's no format we can return
* as all our supported formats are renderable by X.
*/
TRACE("pAttr[%d] = WGL_SUPPORT_GDI_ARB: %d\n", cur, pop); TRACE("pAttr[%d] = WGL_SUPPORT_GDI_ARB: %d\n", cur, pop);
break; break;
@ -2655,16 +2650,23 @@ static GLboolean WINAPI X11DRV_wglGetPixelFormatAttribivARB(HDC hdc, int iPixelF
case WGL_AUX_BUFFERS_ARB: case WGL_AUX_BUFFERS_ARB:
curGLXAttr = GLX_AUX_BUFFERS; curGLXAttr = GLX_AUX_BUFFERS;
break; break;
case WGL_SUPPORT_GDI_ARB: case WGL_SUPPORT_GDI_ARB:
curGLXAttr = GLX_X_RENDERABLE;
break;
case WGL_DRAW_TO_WINDOW_ARB: case WGL_DRAW_TO_WINDOW_ARB:
case WGL_DRAW_TO_BITMAP_ARB: case WGL_DRAW_TO_BITMAP_ARB:
/* We only supported a limited number of formats right now which are all renderable by X 'GLX_X_RENDERABLE' */
piValues[i] = GL_TRUE;
continue;
case WGL_DRAW_TO_PBUFFER_ARB: case WGL_DRAW_TO_PBUFFER_ARB:
if (!fmt) goto pix_error;
hTest = pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DRAWABLE_TYPE, &tmp); hTest = pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DRAWABLE_TYPE, &tmp);
if (hTest) goto get_error; if (hTest) goto get_error;
piValues[i] = (tmp & GLX_PBUFFER_BIT) ? GL_TRUE : GL_FALSE; if((curWGLAttr == WGL_DRAW_TO_WINDOW_ARB && (tmp&GLX_WINDOW_BIT)) ||
(curWGLAttr == WGL_DRAW_TO_BITMAP_ARB && (tmp&GLX_PIXMAP_BIT)) ||
(curWGLAttr == WGL_DRAW_TO_PBUFFER_ARB && (tmp&GLX_PBUFFER_BIT)))
piValues[i] = GL_TRUE;
else
piValues[i] = GL_FALSE;
continue; continue;
case WGL_PBUFFER_LARGEST_ARB: case WGL_PBUFFER_LARGEST_ARB: