[Spice-devel] [PATCH xf86-video-qxl 3/5] uxa: use PIXMAN consts instead of PICT in some places (silence clang warning)

[Alon Levy]

Signed-off-by: Alon Levy <alevy at redhat.com>
---
 src/uxa/uxa-glyphs.c | 2 +-
 src/uxa/uxa-render.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/uxa/uxa-glyphs.c b/src/uxa/uxa-glyphs.c
index 6dd8e58..fe3d6e8 100644
--- a/src/uxa/uxa-glyphs.c
+++ b/src/uxa/uxa-glyphs.c
@@ -715,7 +715,7 @@ uxa_glyphs_to_dst(CARD8 op,
 			src_y += localSrc->pDrawable->y + src_off_y;
 		} else {
 			localSrc = uxa_acquire_pattern(screen, pSrc,
-						       PICT_a8r8g8b8, x, y, width, height);
+						       PIXMAN_a8r8g8b8, 0, 0, width, height);
 			if (!localSrc)
 				return 1;
 
diff --git a/src/uxa/uxa-render.c b/src/uxa/uxa-render.c
index ac80c45..937ac2e 100644
--- a/src/uxa/uxa-render.c
+++ b/src/uxa/uxa-render.c
@@ -418,7 +418,7 @@ uxa_try_driver_solid_fill(PicturePtr pSrc,
 
 			if (!uxa_get_rgba_from_pixel(solid->color,
 						     &red, &green, &blue, &alpha,
-						     PICT_a8r8g8b8) ||
+						     PIXMAN_a8r8g8b8) ||
 			    !uxa_get_pixel_from_rgba(&pixel,
 						     red, green, blue, alpha,
 						     pDst->format)) {
@@ -880,7 +880,7 @@ uxa_acquire_source(ScreenPtr screen,
 		   INT16 * out_x, INT16 * out_y)
 {
 	return uxa_acquire_picture (screen, pict,
-				    PICT_a8r8g8b8,
+				    PIXMAN_a8r8g8b8,
 				    x, y,
 				    width, height,
 				    out_x, out_y);
@@ -894,7 +894,7 @@ uxa_acquire_mask(ScreenPtr screen,
 		 INT16 * out_x, INT16 * out_y)
 {
 	return uxa_acquire_picture (screen, pict,
-				    PICT_a8,
+				    PIXMAN_a8,
 				    x, y,
 				    width, height,
 				    out_x, out_y);
-- 
1.8.3.1