mirror of
https://github.com/X11Libre/xf86-video-vmware.git
synced 2026-03-24 01:24:37 +00:00
replace PictFormatShort by pixman_format_code_t
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
58511e7e14
commit
4dd3f86ca1
@@ -76,8 +76,8 @@ struct saa_pixmap {
|
||||
void *addr;
|
||||
void *override;
|
||||
enum saa_pixmap_loc auth_loc;
|
||||
PictFormatShort src_format;
|
||||
PictFormatShort dst_format;
|
||||
pixman_format_code_t src_format;
|
||||
pixman_format_code_t dst_format;
|
||||
uint32_t pad[16];
|
||||
};
|
||||
|
||||
|
||||
@@ -85,7 +85,7 @@ vmwgfx_create_hw(struct vmwgfx_saa *vsaa,
|
||||
* vmwgfx_xa_surface.c
|
||||
*/
|
||||
|
||||
enum xa_formats vmwgfx_xa_format(PictFormatShort format);
|
||||
enum xa_formats vmwgfx_xa_format(pixman_format_code_t format);
|
||||
Bool
|
||||
vmwgfx_hw_validate(PixmapPtr pixmap, RegionPtr region);
|
||||
Bool
|
||||
@@ -93,8 +93,8 @@ vmwgfx_hw_dri2_stage(PixmapPtr pixmap, unsigned int depth);
|
||||
Bool
|
||||
vmwgfx_hw_accel_stage(PixmapPtr pixmap, unsigned int depth,
|
||||
uint32_t add_flags, uint32_t remove_flags);
|
||||
Bool vmwgfx_hw_composite_src_stage(PixmapPtr pixmap, PictFormatShort pict_format);
|
||||
Bool vmwgfx_hw_composite_dst_stage(PixmapPtr pixmap, PictFormatShort pict_format);
|
||||
Bool vmwgfx_hw_composite_src_stage(PixmapPtr pixmap, pixman_format_code_t pict_format);
|
||||
Bool vmwgfx_hw_composite_dst_stage(PixmapPtr pixmap, pixman_format_code_t pict_format);
|
||||
Bool
|
||||
vmwgfx_hw_commit(PixmapPtr pixmap);
|
||||
|
||||
|
||||
@@ -93,7 +93,7 @@ vmwgfx_xa_surface_redefine(struct vmwgfx_saa_pixmap *vpix,
|
||||
/*
|
||||
* Create an xa format from a PICT format.
|
||||
*/
|
||||
enum xa_formats vmwgfx_xa_format(PictFormatShort format)
|
||||
enum xa_formats vmwgfx_xa_format(pixman_format_code_t format)
|
||||
{
|
||||
uint32_t ptype = PIXMAN_FORMAT_TYPE(format);
|
||||
|
||||
@@ -166,7 +166,7 @@ vmwgfx_old_format_compatible(enum xa_formats format,
|
||||
/*
|
||||
* Choose format and flags for a composite dst surface.
|
||||
*/
|
||||
Bool vmwgfx_hw_composite_dst_stage(PixmapPtr pixmap, PictFormatShort pict_format)
|
||||
Bool vmwgfx_hw_composite_dst_stage(PixmapPtr pixmap, pixman_format_code_t pict_format)
|
||||
{
|
||||
struct vmwgfx_saa *vsaa =
|
||||
to_vmwgfx_saa(saa_get_driver(pixmap->drawable.pScreen));
|
||||
@@ -199,7 +199,7 @@ Bool vmwgfx_hw_composite_dst_stage(PixmapPtr pixmap, PictFormatShort pict_format
|
||||
/*
|
||||
* Choose format and flags for a composite src surface.
|
||||
*/
|
||||
Bool vmwgfx_hw_composite_src_stage(PixmapPtr pixmap, PictFormatShort pict_format)
|
||||
Bool vmwgfx_hw_composite_src_stage(PixmapPtr pixmap, pixman_format_code_t pict_format)
|
||||
{
|
||||
struct vmwgfx_saa *vsaa =
|
||||
to_vmwgfx_saa(saa_get_driver(pixmap->drawable.pScreen));
|
||||
|
||||
Reference in New Issue
Block a user