[Spice-commits] qemu/hw

[Alexander Larsson]

 qemu/hw/draw.h          |    1 +
 qemu/hw/qxl.c           |    4 ++--
 qemu/hw/qxl_dev.h       |    2 +-
 qemu/hw/qxl_interface.h |    2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 80b6a92c717ec30f74253705149f9af1e9779bca
Author: Alexander Larsson <alexl at redhat.com>
Date:   Fri Apr 23 16:54:15 2010 +0200

    Update for the surface format work

diff --git a/qemu/hw/draw.h b/qemu/hw/draw.h
index be12fa5..24776d7 100644
--- a/qemu/hw/draw.h
+++ b/qemu/hw/draw.h
@@ -270,6 +270,7 @@ typedef struct ATTR_PACKED Transparent {
 } Transparent;
 
 typedef struct ATTR_PACKED AlphaBlnd {
+    UINT16 alpha_flags;
     UINT8 alpha;
     ADDRESS src_bitmap;
     Rect src_area;
diff --git a/qemu/hw/qxl.c b/qemu/hw/qxl.c
index 509f685..092afc4 100644
--- a/qemu/hw/qxl.c
+++ b/qemu/hw/qxl.c
@@ -621,7 +621,7 @@ static void qxl_create_primary_surface(PCIQXLDevice *d)
 
     printf("%s\n", __FUNCTION__);
 
-    surface.depth = 32;
+    surface.format = 32 /* == SPICE_SURFACE_FMT_32_xRGB */;
     surface.width = qxl_vga.ds->width;
     surface.height = qxl_vga.ds->height;
     surface.stride = -qxl_vga.ds->width * 4;
@@ -674,7 +674,7 @@ static void qxl_create_primary(PCIQXLDevice *d)
     qxl_exit_vga_mode(d);
     d->state.mode = QXL_MODE_NATIVE;
 
-    surface.depth = d->state.ram->create_surface.depth;
+    surface.format = d->state.ram->create_surface.format;
     surface.height = d->state.ram->create_surface.height;
     surface.mem = d->state.ram->create_surface.mem;
     surface.mouse_mode = TRUE;
diff --git a/qemu/hw/qxl_dev.h b/qemu/hw/qxl_dev.h
index 9d72306..aa27172 100644
--- a/qemu/hw/qxl_dev.h
+++ b/qemu/hw/qxl_dev.h
@@ -125,7 +125,7 @@ typedef struct ATTR_PACKED QXLSurfaceCreate {
     UINT32 width;
     UINT32 height;
     INT32 stride;
-    UINT32 depth;
+    UINT32 format;
     UINT32 position;
     UINT32 mouse_mode;
     UINT32 flags;
diff --git a/qemu/hw/qxl_interface.h b/qemu/hw/qxl_interface.h
index a270275..e376b30 100644
--- a/qemu/hw/qxl_interface.h
+++ b/qemu/hw/qxl_interface.h
@@ -55,7 +55,7 @@ typedef struct QXLDevSurfaceCreate {
     uint32_t width;
     uint32_t height;
     int32_t stride;
-    uint32_t depth;
+    uint32_t format;
     uint32_t position;
     uint32_t mouse_mode;
     uint32_t flags;