Ack series.
On 10/17/2013 03:27 AM, Alon Levy wrote: > Signed-off-by: Alon Levy <[email protected]> > --- > src/qxl.h | 2 +- > src/qxl_kms.c | 2 +- > src/qxl_surface.c | 5 +++-- > src/qxl_surface_ums.c | 2 +- > 4 files changed, 6 insertions(+), 5 deletions(-) > > diff --git a/src/qxl.h b/src/qxl.h > index 52e92e9..c699c58 100644 > --- a/src/qxl.h > +++ b/src/qxl.h > @@ -607,7 +607,7 @@ Bool qxl_enter_vt_kms (VT_FUNC_ARGS_DECL); > void qxl_leave_vt_kms (VT_FUNC_ARGS_DECL); > void qxl_set_screen_pixmap_header (ScreenPtr pScreen); > Bool qxl_resize_primary_to_virtual (qxl_screen_t *qxl); > -void qxl_get_formats (int bpp, SpiceBitmapFmt *format, pixman_format_code_t > *pformat); > +void qxl_get_formats (int bpp, SpiceSurfaceFmt *format, pixman_format_code_t > *pformat); > > #ifdef XF86DRM_MODE > Bool qxl_pre_init_kms(ScrnInfoPtr pScrn, int flags); > diff --git a/src/qxl_kms.c b/src/qxl_kms.c > index 6c5b427..d6dfcee 100644 > --- a/src/qxl_kms.c > +++ b/src/qxl_kms.c > @@ -593,7 +593,7 @@ qxl_kms_surface_create(qxl_screen_t *qxl, > int height, > int bpp) > { > - SpiceBitmapFmt format; > + SpiceSurfaceFmt format; > qxl_surface_t *surface; > int stride; > struct qxl_kms_bo *bo; > diff --git a/src/qxl_surface.c b/src/qxl_surface.c > index 685d09f..1075eae 100644 > --- a/src/qxl_surface.c > +++ b/src/qxl_surface.c > @@ -804,7 +804,7 @@ qxl_surface_put_image (qxl_surface_t *dest, > } > > void > -qxl_get_formats (int bpp, SpiceBitmapFmt *format, pixman_format_code_t > *pformat) > +qxl_get_formats (int bpp, SpiceSurfaceFmt *format, pixman_format_code_t > *pformat) > { > switch (bpp) > { > @@ -829,7 +829,8 @@ qxl_get_formats (int bpp, SpiceBitmapFmt *format, > pixman_format_code_t *pformat) > break; > > default: > - *format = *pformat = -1; > + *format = -1; > + *pformat = -1; > break; > } > } > diff --git a/src/qxl_surface_ums.c b/src/qxl_surface_ums.c > index 6839372..2c16ede 100644 > --- a/src/qxl_surface_ums.c > +++ b/src/qxl_surface_ums.c > @@ -430,7 +430,7 @@ surface_send_create (surface_cache_t *cache, > int height, > int bpp) > { > - SpiceBitmapFmt format; > + SpiceSurfaceFmt format; > pixman_format_code_t pformat; > struct QXLSurfaceCmd *cmd; > int stride; _______________________________________________ Spice-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/spice-devel
