brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve pixel format detection for fallback OpenGL rendering

Browse Source 
The previous detection was based on bits per pixel only and would
consider bpp >= 24 as X888 or 8888 24-bit color depth formats.

This commit ensures we now use the newly added
_cogl_util_pixel_format_from_masks() api that returns a CoglPixelFormat
according to channel masks and color depth. This helps to add support
for more pixel formats.

https://bugzilla.gnome.org/show_bug.cgi?id=660188

Reviewed-by: Robert Bragg <robert@linux.intel.com>
Reviewed-by: Neil Roberts <neil@linux.intel.com>
This commit is contained in:
Damien Leone 2011-11-21 15:41:13 -08:00 committed by Robert Bragg
parent e3c4522a86
commit 8b70468598
1 changed files with 9 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
cogl/winsys/cogl-texture-pixmap-x11.c
View File

@ -477,12 +477,14 @@ static void
_cogl_texture_pixmap_x11_update_image_texture (CoglTexturePixmapX11 *tex_pixmap) _cogl_texture_pixmap_x11_update_image_texture (CoglTexturePixmapX11 *tex_pixmap)
{ {
Display *display; Display *display;
Visual *visual;
CoglPixelFormat image_format; CoglPixelFormat image_format;
XImage *image; XImage *image;
int src_x, src_y; int src_x, src_y;
int x, y, width, height; int x, y, width, height;
display = cogl_xlib_get_display (); display = cogl_xlib_get_display ();
visual = tex_pixmap->visual;
/* If the damage region is empty then there's nothing to do */ /* If the damage region is empty then there's nothing to do */
if (tex_pixmap->damage_rect.x2 == tex_pixmap->damage_rect.x1) if (tex_pixmap->damage_rect.x2 == tex_pixmap->damage_rect.x1)
@ -576,47 +578,13 @@ _cogl_texture_pixmap_x11_update_image_texture (CoglTexturePixmapX11 *tex_pixmap)
x, y); x, y);
} }
/* xlib doesn't appear to fill in image->{red,green,blue}_mask so image_format =
this just assumes that the image is stored as ARGB from most _cogl_util_pixel_format_from_masks (visual->red_mask,
significant byte to to least significant. If the format is little visual->green_mask,
endian that means the order will be BGRA in memory */ visual->blue_mask,
image->depth,
switch (image->bits_per_pixel) image->bits_per_pixel,
{ image->byte_order == LSBFirst);
default:
case 32:
{
/* If the pixmap is actually non-packed-pixel RGB format then
the texture would have been created in RGB_888 format so Cogl
will ignore the alpha channel and effectively pack it for
us */
image_format = COGL_PIXEL_FORMAT_RGBA_8888_PRE;
/* If the format is actually big endian then the alpha
component will come first */
if (image->byte_order == MSBFirst)
image_format |= COGL_AFIRST_BIT;
}
break;
case 24:
image_format = COGL_PIXEL_FORMAT_RGB_888;
break;
case 16:
/* FIXME: this should probably swap the orders around if the
endianness does not match */
image_format = COGL_PIXEL_FORMAT_RGB_565;
break;
}
if (image->bits_per_pixel != 16)
{
/* If the image is in little-endian then the order in memory is
reversed */
if (image->byte_order == LSBFirst)
image_format |= COGL_BGR_BIT;
}
cogl_texture_set_region (tex_pixmap->tex, cogl_texture_set_region (tex_pixmap->tex,
src_x, src_y, src_x, src_y,