andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

glamor: Maybe fix up the format/type for setspans.

Browse Source
This commit is contained in:
Eric Anholt 2009-08-20 14:45:47 -07:00 committed by Zhigang Gong
parent 4f139db92f
commit f92d1478e9
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
glamor/glamor_core.c
View File

@ -198,8 +198,20 @@ glamor_set_spans(DrawablePtr drawable, GCPtr gc, char *src,
if (screen_pixmap != dest_pixmap) {
fbSetSpans(drawable, gc, src, points, widths, n, sorted);
} else {
GLenum format, type;
int i;
switch (drawable->depth) {
case 24:
case 32:
format = GL_BGRA;
type = GL_UNSIGNED_INT_8_8_8_8_REV;
break;
default:
ErrorF("Unknown setspans depth %d\n", drawable->depth);
return;
}
if (!glamor_set_destination_pixmap(dest_pixmap))
return;
for (i = 0; i < n; i++) {
@ -207,7 +219,7 @@ glamor_set_spans(DrawablePtr drawable, GCPtr gc, char *src,
points[i].y - dest_pixmap->screen_y);
glDrawPixels(widths[i],
1,
GL_RGBA, GL_UNSIGNED_BYTE,
format, type,
src);
src += PixmapBytePad(widths[i], drawable->depth);
}