frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glamor: Ignore picture formats when choosing color for core rendering. 

Attaching a picture to a pixmap doesn't change its GL format, so it
doesn't change how core rendering should be assigning colors to it.

(Imagine XCreatePixmap(), optional XCreatePicture(pixmap) with various
formats, XFillRectangle, XGetImage().  If the XGetImage results
changed, this would be wrong).

Fixes all failures in "rendercheck -t fill" and, as a result, the
remaining failures in "rendercheck -t blend -o src -f
a8r8g8b8,x2r10g10b10"

Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Eric Anholt 2015-07-02 12:21:41 -07:00
parent 5a81de8284
commit 1bd966d16d
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
glamor/glamor_utils.h
View File

@ -805,16 +805,7 @@ gl_iformat_for_pixmap(PixmapPtr pixmap)
static inline CARD32 static inline CARD32
format_for_pixmap(PixmapPtr pixmap) format_for_pixmap(PixmapPtr pixmap)
{ {
glamor_pixmap_private *pixmap_priv; return format_for_depth((pixmap)->drawable.depth);
PictFormatShort pict_format;
pixmap_priv = glamor_get_pixmap_private(pixmap);
if (GLAMOR_PIXMAP_PRIV_IS_PICTURE(pixmap_priv))
pict_format = pixmap_priv->picture->format;
else
pict_format = format_for_depth((pixmap)->drawable.depth);
return pict_format;
} }
#define REVERT_NONE 0 #define REVERT_NONE 0