mirror of
https://github.com/X11Libre/xf86-video-vmware.git
synced 2026-03-24 01:24:37 +00:00
replace PICT_TYPE_* by PIXMAN_TYPE_*
Try not to use old compat macros anymore, use the real ones instead. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
committed by
Enrico Weigelt
parent
8e79291b74
commit
58511e7e14
@@ -960,7 +960,7 @@ vmwgfx_copy_prepare(struct saa_driver *driver,
|
||||
if (!vmwgfx_hw_accel_stage(src_pixmap, 0, XA_FLAG_RENDER_TARGET, 0))
|
||||
return FALSE;
|
||||
} else {
|
||||
if (PIXMAN_FORMAT_TYPE(src_vpix->base.src_format) != PICT_TYPE_ARGB ||
|
||||
if (PIXMAN_FORMAT_TYPE(src_vpix->base.src_format) != PIXMAN_TYPE_ARGB ||
|
||||
!vmwgfx_hw_composite_src_stage(src_pixmap, src_vpix->base.src_format))
|
||||
return FALSE;
|
||||
}
|
||||
@@ -969,7 +969,7 @@ vmwgfx_copy_prepare(struct saa_driver *driver,
|
||||
if (!vmwgfx_hw_accel_stage(dst_pixmap, 0, XA_FLAG_RENDER_TARGET, 0))
|
||||
return FALSE;
|
||||
} else {
|
||||
if (PIXMAN_FORMAT_TYPE(dst_vpix->base.dst_format) != PICT_TYPE_ARGB ||
|
||||
if (PIXMAN_FORMAT_TYPE(dst_vpix->base.dst_format) != PIXMAN_TYPE_ARGB ||
|
||||
!vmwgfx_hw_composite_dst_stage(dst_pixmap, dst_vpix->base.dst_format))
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
@@ -33,11 +33,11 @@
|
||||
|
||||
|
||||
static const enum xa_surface_type vmwgfx_stype_map[] = {
|
||||
[PICT_TYPE_OTHER] = xa_type_other,
|
||||
[PICT_TYPE_A] = xa_type_a,
|
||||
[PICT_TYPE_ARGB] = xa_type_argb,
|
||||
[PICT_TYPE_ABGR] = xa_type_abgr,
|
||||
[PICT_TYPE_BGRA] = xa_type_bgra
|
||||
[PIXMAN_TYPE_OTHER] = xa_type_other,
|
||||
[PIXMAN_TYPE_A] = xa_type_a,
|
||||
[PIXMAN_TYPE_ARGB] = xa_type_argb,
|
||||
[PIXMAN_TYPE_ABGR] = xa_type_abgr,
|
||||
[PIXMAN_TYPE_BGRA] = xa_type_bgra
|
||||
};
|
||||
|
||||
static const unsigned int vmwgfx_stype_map_size =
|
||||
|
||||
Reference in New Issue
Block a user