Skip to content

W
wine-winehq
Commit f83b299b authored by Roderick Colenbrander's avatar Roderick Colenbrander Committed by Alexandre Julliard
Browse files
Options

wgl: Use local pixel format data for WGL_ACCELERATION_ARB.

parent 4fd3d633
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 10 deletions
dlls/winex11.drv/opengl.c
View file @ f83b299b
...@@ -717,6 +717,11 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, Wine_GLPBuf ...@@ -717,6 +717,11 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, Wine_GLPBuf
break; break;
case WGL_ACCELERATION_ARB: case WGL_ACCELERATION_ARB:
/* This flag is set in a WineGLPixelFormat */
pop = iWGLAttr[++cur];
TRACE("pAttr[%d] = WGL_ACCELERATION_ARB: %d\n", cur, pop);
break;
case WGL_SUPPORT_OPENGL_ARB: case WGL_SUPPORT_OPENGL_ARB:
pop = iWGLAttr[++cur]; pop = iWGLAttr[++cur];
/** nothing to do, if we are here, supposing support Accelerated OpenGL */ /** nothing to do, if we are here, supposing support Accelerated OpenGL */
...@@ -2694,6 +2699,20 @@ static GLboolean WINAPI X11DRV_wglChoosePixelFormatARB(HDC hdc, const int *piAtt ...@@ -2694,6 +2699,20 @@ static GLboolean WINAPI X11DRV_wglChoosePixelFormatARB(HDC hdc, const int *piAtt
if(piAttribIList[i+1]) if(piAttribIList[i+1])
dwFlags |= PFD_DRAW_TO_BITMAP; dwFlags |= PFD_DRAW_TO_BITMAP;
break; break;
case WGL_ACCELERATION_ARB:
switch(piAttribIList[i+1])
{
case WGL_NO_ACCELERATION_ARB:
dwFlags |= PFD_GENERIC_FORMAT;
break;
case WGL_GENERIC_ACCELERATION_ARB:
dwFlags |= PFD_GENERIC_ACCELERATED;
break;
case WGL_FULL_ACCELERATION_ARB:
/* Nothing to do */
break;
}
break;
case WGL_SUPPORT_GDI_ARB: case WGL_SUPPORT_GDI_ARB:
if(piAttribIList[i+1]) if(piAttribIList[i+1])
dwFlags |= PFD_SUPPORT_GDI; dwFlags |= PFD_SUPPORT_GDI;
...@@ -2791,16 +2810,12 @@ static GLboolean WINAPI X11DRV_wglGetPixelFormatAttribivARB(HDC hdc, int iPixelF ...@@ -2791,16 +2810,12 @@ static GLboolean WINAPI X11DRV_wglGetPixelFormatAttribivARB(HDC hdc, int iPixelF
case WGL_ACCELERATION_ARB: case WGL_ACCELERATION_ARB:
curGLXAttr = GLX_CONFIG_CAVEAT; curGLXAttr = GLX_CONFIG_CAVEAT;
if (!fmt) goto pix_error; if (!fmt) goto pix_error;
hTest = pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, curGLXAttr, &tmp); if(fmt->dwFlags & PFD_GENERIC_FORMAT)
if (hTest) goto get_error; piValues[i] = WGL_NO_ACCELERATION_ARB;
switch (tmp) { else if(fmt->dwFlags & PFD_GENERIC_ACCELERATED)
case GLX_NONE: piValues[i] = WGL_FULL_ACCELERATION_ARB; break; piValues[i] = WGL_GENERIC_ACCELERATION_ARB;
case GLX_SLOW_CONFIG: piValues[i] = WGL_GENERIC_ACCELERATION_ARB; break; else
case GLX_NON_CONFORMANT_CONFIG: piValues[i] = WGL_FULL_ACCELERATION_ARB; break; piValues[i] = WGL_FULL_ACCELERATION_ARB;
default:
ERR("unexpected Config Caveat(%x)\n", tmp);
piValues[i] = WGL_NO_ACCELERATION_ARB;
}
continue; continue;
case WGL_TRANSPARENT_ARB: case WGL_TRANSPARENT_ARB:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment