Commit 5b11c96f authored by Alexandre Julliard's avatar Alexandre Julliard

winex11: Get rid of the DIB section support.

parent 978c42fe
......@@ -11,10 +11,6 @@ C_SRCS = \
clipboard.c \
codepage.c \
desktop.c \
dib.c \
dib_convert.c \
dib_dst_swap.c \
dib_src_swap.c \
event.c \
graphics.c \
ime.c \
......
......@@ -234,11 +234,6 @@ BOOL X11DRV_DeleteBitmap( HBITMAP hbitmap )
if (physBitmap)
{
DIBSECTION dib;
if (GetObjectW( hbitmap, sizeof(dib), &dib ) == sizeof(dib))
X11DRV_DIB_DeleteDIBSection( physBitmap, &dib );
if (physBitmap->glxpixmap)
destroy_glxpixmap( gdi_display, physBitmap->glxpixmap );
wine_tsx11_lock();
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -1366,45 +1366,6 @@ static void xrenderdrv_SetDeviceClipping( PHYSDEV dev, HRGN rgn )
}
BOOL X11DRV_XRender_SetPhysBitmapDepth(X_PHYSBITMAP *physBitmap, int bits_pixel, const DIBSECTION *dib)
{
XRenderPictFormat *pict_format;
ColorShifts shifts;
const DWORD *bitfields;
static const DWORD bitfields_32[3] = {0xff0000, 0x00ff00, 0x0000ff};
static const DWORD bitfields_16[3] = {0x7c00, 0x03e0, 0x001f};
/* When XRender is not around we can only use the screen_depth and when needed we perform depth conversion
* in software. Further we also return the screen depth for paletted formats or TrueColor formats with a low
* number of bits because XRender can't handle paletted formats and 8-bit TrueColor does not exist for XRender. */
if (!X11DRV_XRender_Installed || bits_pixel <= 8)
return FALSE;
if(dib->dsBmih.biCompression == BI_BITFIELDS)
bitfields = dib->dsBitfields;
else if(bits_pixel == 24 || bits_pixel == 32)
bitfields = bitfields_32;
else
bitfields = bitfields_16;
X11DRV_PALETTE_ComputeColorShifts(&shifts, bitfields[0], bitfields[1], bitfields[2]);
pict_format = pict_formats[get_xrender_format_from_color_shifts(dib->dsBm.bmBitsPixel, &shifts)];
/* Common formats should be in our picture format table. */
if (!pict_format)
{
TRACE("Unhandled dibsection format bpp=%d, redMask=%x, greenMask=%x, blueMask=%x\n",
dib->dsBm.bmBitsPixel, bitfields[0], bitfields[1], bitfields[2]);
return FALSE;
}
physBitmap->depth = pict_format->depth;
physBitmap->trueColor = TRUE;
physBitmap->color_shifts = shifts;
return TRUE;
}
/************************************************************************
* UploadGlyph
*
......@@ -2816,9 +2777,4 @@ void X11DRV_XRender_Finalize(void)
{
}
BOOL X11DRV_XRender_SetPhysBitmapDepth(X_PHYSBITMAP *physBitmap, int bits_pixel, const DIBSECTION *dib)
{
return FALSE;
}
#endif /* SONAME_LIBXRENDER */
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