Skip to content

W
wine-cw
Commit 40957d02 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

winex11: Create a separate graphics driver for XRender.

parent faa23d2a
Hide whitespace changes
Inline Side-by-side
Showing with 195 additions and 9 deletions
dlls/winex11.drv/init.c
View file @ 40957d02
......@@ -52,6 +52,7 @@ static const WCHAR dpi_key_name[] = {'S','o','f','t','w','a','r','e','\\','F','o
static const WCHAR dpi_value_name[] = {'L','o','g','P','i','x','e','l','s','\0'};
static const struct gdi_dc_funcs x11drv_funcs;
static const struct gdi_dc_funcs *xrender_funcs;
/******************************************************************************
* get_dpi
......@@ -88,7 +89,7 @@ static void device_init(void)
device_init_done = TRUE;
/* Initialize XRender */
X11DRV_XRender_Init();
xrender_funcs = X11DRV_XRender_Init();
/* Init Xcursor */
X11DRV_Xcursor_Init();
......@@ -157,7 +158,8 @@ static BOOL X11DRV_CreateDC( PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device,
SetRect( &physDev->dc_rect, 0, 0, virtual_screen_rect.right - virtual_screen_rect.left,
virtual_screen_rect.bottom - virtual_screen_rect.top );
push_dc_driver( pdev, &physDev->dev, &x11drv_funcs );
return TRUE;
if (!xrender_funcs) return TRUE;
return xrender_funcs->pCreateDC( pdev, driver, device, output, initData );
}
......@@ -178,7 +180,9 @@ static BOOL X11DRV_CreateCompatibleDC( PHYSDEV orig, PHYSDEV *pdev )
SetRect( &physDev->drawable_rect, 0, 0, 1, 1 );
physDev->dc_rect = physDev->drawable_rect;
push_dc_driver( pdev, &physDev->dev, &x11drv_funcs );
return TRUE;
if (orig) return TRUE; /* we already went through Xrender if we have an orig device */
if (!xrender_funcs) return TRUE;
return xrender_funcs->pCreateCompatibleDC( NULL, pdev );
}
......
dlls/winex11.drv/x11drv.h
View file @ 40957d02
......@@ -301,7 +301,7 @@ extern int client_side_with_render DECLSPEC_HIDDEN;
extern int client_side_antialias_with_core DECLSPEC_HIDDEN;
extern int client_side_antialias_with_render DECLSPEC_HIDDEN;
extern int using_client_side_fonts DECLSPEC_HIDDEN;
extern void X11DRV_XRender_Init(void) DECLSPEC_HIDDEN;
extern const struct gdi_dc_funcs *X11DRV_XRender_Init(void) DECLSPEC_HIDDEN;
extern void X11DRV_XRender_Finalize(void) DECLSPEC_HIDDEN;
extern BOOL X11DRV_XRender_SelectFont(X11DRV_PDEVICE*, HFONT) DECLSPEC_HIDDEN;
extern void X11DRV_XRender_SetDeviceClipping(X11DRV_PDEVICE *physDev, const RGNDATA *data) DECLSPEC_HIDDEN;
......
dlls/winex11.drv/xrender.c
View file @ 40957d02
......@@ -152,6 +152,19 @@ struct xrender_info
const WineXRenderFormat *format;
};
struct xrender_physdev
{
struct gdi_physdev dev;
X11DRV_PDEVICE *x11dev;
};
static inline struct xrender_physdev *get_xrender_dev( PHYSDEV dev )
{
return (struct xrender_physdev *)dev;
}
static const struct gdi_dc_funcs xrender_funcs;
static gsCacheEntry *glyphsetCache = NULL;
static DWORD glyphsetCacheSize = 0;
static INT lastfree = -1;
......@@ -341,7 +354,7 @@ static int load_xrender_formats(void)
* Let's see if our XServer has the extension available
*
*/
void X11DRV_XRender_Init(void)
const struct gdi_dc_funcs *X11DRV_XRender_Init(void)
{
int event_base, i;
......@@ -385,7 +398,7 @@ LOAD_OPTIONAL_FUNCPTR(XRenderSetPictureTransform)
"of libXrender.so . Because of this client side font rendering\n"
"will be disabled. Please upgrade this library.\n");
X11DRV_XRender_Installed = FALSE;
return;
return NULL;
}
if (!visual->red_mask || !visual->green_mask || !visual->blue_mask) {
......@@ -439,8 +452,10 @@ sym_not_found:
if(screen_depth <= 8 || !client_side_antialias_with_render)
antialias = 0;
}
return &xrender_funcs;
}
else TRACE("Using X11 core fonts\n");
TRACE("Using X11 core fonts\n");
return NULL;
}
/* Helper function to convert from a color packed in a 32-bit integer to a XRenderColor */
......@@ -1097,6 +1112,50 @@ void X11DRV_XRender_SetDeviceClipping(X11DRV_PDEVICE *physDev, const RGNDATA *da
}
}
/**********************************************************************
* xrenderdrv_CreateDC
*/
static BOOL xrenderdrv_CreateDC( PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device,
LPCWSTR output, const DEVMODEW* initData )
{
struct xrender_physdev *physdev = HeapAlloc( GetProcessHeap(), 0, sizeof(*physdev) );
if (!physdev) return FALSE;
physdev->x11dev = get_x11drv_dev( *pdev );
push_dc_driver( pdev, &physdev->dev, &xrender_funcs );
return TRUE;
}
/**********************************************************************
* xrenderdrv_CreateCompatibleDC
*/
static BOOL xrenderdrv_CreateCompatibleDC( PHYSDEV orig, PHYSDEV *pdev )
{
struct xrender_physdev *physdev;
if (orig) /* chain to x11drv first */
{
orig = GET_NEXT_PHYSDEV( orig, pCreateCompatibleDC );
if (!orig->funcs->pCreateCompatibleDC( orig, pdev )) return FALSE;
}
/* otherwise we have been called by x11drv */
if (!(physdev = HeapAlloc( GetProcessHeap(), 0, sizeof(*physdev) ))) return FALSE;
physdev->x11dev = get_x11drv_dev( *pdev );
push_dc_driver( pdev, &physdev->dev, &xrender_funcs );
return TRUE;
}
/**********************************************************************
* xrenderdrv_DeleteDC
*/
static BOOL xrenderdrv_DeleteDC( PHYSDEV dev )
{
struct xrender_physdev *physdev = get_xrender_dev( dev );
HeapFree( GetProcessHeap(), 0, physdev );
return TRUE;
}
/***********************************************************************
* X11DRV_XRender_DeleteDC
*/
......@@ -2396,12 +2455,135 @@ BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE
return TRUE;
}
static const struct gdi_dc_funcs xrender_funcs =
{
NULL, /* pAbortDoc */
NULL, /* pAbortPath */
NULL, /* pAlphaBlend */
NULL, /* pAngleArc */
NULL, /* pArc */
NULL, /* pArcTo */
NULL, /* pBeginPath */
NULL, /* pChoosePixelFormat */
NULL, /* pChord */
NULL, /* pCloseFigure */
NULL, /* pCreateBitmap */
xrenderdrv_CreateCompatibleDC, /* pCreateCompatibleDC */
xrenderdrv_CreateDC, /* pCreateDC */
NULL, /* pCreateDIBSection */
NULL, /* pDeleteBitmap */
xrenderdrv_DeleteDC, /* pDeleteDC */
NULL, /* pDeleteObject */
NULL, /* pDescribePixelFormat */
NULL, /* pDeviceCapabilities */
NULL, /* pEllipse */
NULL, /* pEndDoc */
NULL, /* pEndPage */
NULL, /* pEndPath */
NULL, /* pEnumDeviceFonts */
NULL, /* pEnumICMProfiles */
NULL, /* pExcludeClipRect */
NULL, /* pExtDeviceMode */
NULL, /* pExtEscape */
NULL, /* pExtFloodFill */
NULL, /* pExtSelectClipRgn */
NULL, /* pExtTextOut */
NULL, /* pFillPath */
NULL, /* pFillRgn */
NULL, /* pFlattenPath */
NULL, /* pFrameRgn */
NULL, /* pGdiComment */
NULL, /* pGetCharWidth */
NULL, /* pGetDeviceCaps */
NULL, /* pGetDeviceGammaRamp */
NULL, /* pGetICMProfile */
NULL, /* pGetImage */
NULL, /* pGetNearestColor */
NULL, /* pGetPixel */
NULL, /* pGetPixelFormat */
NULL, /* pGetSystemPaletteEntries */
NULL, /* pGetTextExtentExPoint */
NULL, /* pGetTextMetrics */
NULL, /* pIntersectClipRect */
NULL, /* pInvertRgn */
NULL, /* pLineTo */
NULL, /* pModifyWorldTransform */
NULL, /* pMoveTo */
NULL, /* pOffsetClipRgn */
NULL, /* pOffsetViewportOrg */
NULL, /* pOffsetWindowOrg */
NULL, /* pPaintRgn */
NULL, /* pPatBlt */
NULL, /* pPie */
NULL, /* pPolyBezier */
NULL, /* pPolyBezierTo */
NULL, /* pPolyDraw */
NULL, /* pPolyPolygon */
NULL, /* pPolyPolyline */
NULL, /* pPolygon */
NULL, /* pPolyline */
NULL, /* pPolylineTo */
NULL, /* pPutImage */
NULL, /* pRealizeDefaultPalette */
NULL, /* pRealizePalette */
NULL, /* pRectangle */
NULL, /* pResetDC */
NULL, /* pRestoreDC */
NULL, /* pRoundRect */
NULL, /* pSaveDC */
NULL, /* pScaleViewportExt */
NULL, /* pScaleWindowExt */
NULL, /* pSelectBitmap */
NULL, /* pSelectBrush */
NULL, /* pSelectClipPath */
NULL, /* pSelectFont */
NULL, /* pSelectPalette */
NULL, /* pSelectPen */
NULL, /* pSetArcDirection */
NULL, /* pSetBkColor */
NULL, /* pSetBkMode */
NULL, /* pSetDCBrushColor */
NULL, /* pSetDCPenColor */
NULL, /* pSetDIBColorTable */
NULL, /* pSetDIBitsToDevice */
NULL, /* pSetDeviceClipping */
NULL, /* pSetDeviceGammaRamp */
NULL, /* pSetLayout */
NULL, /* pSetMapMode */
NULL, /* pSetMapperFlags */
NULL, /* pSetPixel */
NULL, /* pSetPixelFormat */
NULL, /* pSetPolyFillMode */
NULL, /* pSetROP2 */
NULL, /* pSetRelAbs */
NULL, /* pSetStretchBltMode */
NULL, /* pSetTextAlign */
NULL, /* pSetTextCharacterExtra */
NULL, /* pSetTextColor */
NULL, /* pSetTextJustification */
NULL, /* pSetViewportExt */
NULL, /* pSetViewportOrg */
NULL, /* pSetWindowExt */
NULL, /* pSetWindowOrg */
NULL, /* pSetWorldTransform */
NULL, /* pStartDoc */
NULL, /* pStartPage */
NULL, /* pStretchBlt */
NULL, /* pStretchDIBits */
NULL, /* pStrokeAndFillPath */
NULL, /* pStrokePath */
NULL, /* pSwapBuffers */
NULL, /* pUnrealizePalette */
NULL, /* pWidenPath */
/* OpenGL not supported */
};
#else /* SONAME_LIBXRENDER */
void X11DRV_XRender_Init(void)
const struct gdi_dc_funcs *X11DRV_XRender_Init(void)
{
TRACE("XRender support not compiled in.\n");
return;
return NULL;
}
void X11DRV_XRender_Finalize(void)
......
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