Work around GTK pixmaps (e.g. GIMP icons, etc) showing up as black squares

ulab-next
Timothy Pearson 6 years ago
parent 521409e47d
commit 03c7ab9dba

@ -108,6 +108,9 @@ static int g_greenBits = 6;
static int g_blueBits = 5; static int g_blueBits = 5;
static int g_initOutputCalled = 0; static int g_initOutputCalled = 0;
/* Common pixmap formats */ /* Common pixmap formats */
#if 0
// FIXME
// This is disabled to work around 32bpp pixmaps showing up all black when rendered
static PixmapFormatRec g_formats[MAXFORMATS] = static PixmapFormatRec g_formats[MAXFORMATS] =
{ {
{ 1, 1, BITMAP_SCANLINE_PAD }, { 1, 1, BITMAP_SCANLINE_PAD },
@ -119,6 +122,18 @@ static PixmapFormatRec g_formats[MAXFORMATS] =
{ 32, 32, BITMAP_SCANLINE_PAD }, { 32, 32, BITMAP_SCANLINE_PAD },
}; };
static int g_numFormats = 7; static int g_numFormats = 7;
#else
static PixmapFormatRec g_formats[MAXFORMATS] =
{
{ 1, 1, BITMAP_SCANLINE_PAD },
{ 4, 8, BITMAP_SCANLINE_PAD },
{ 8, 8, BITMAP_SCANLINE_PAD },
{ 15, 16, BITMAP_SCANLINE_PAD },
{ 16, 16, BITMAP_SCANLINE_PAD },
{ 24, 32, BITMAP_SCANLINE_PAD },
};
static int g_numFormats = 6;
#endif
static miPointerSpriteFuncRec g_rdpSpritePointerFuncs = static miPointerSpriteFuncRec g_rdpSpritePointerFuncs =
{ {
/* these are in rdpinput.c */ /* these are in rdpinput.c */

Loading…
Cancel
Save