[Spice-devel] [PATCH spice-common 2/2] Add GL scanout structures

[Marc-André Lureau]

See related protocol changes.

Signed-off-by: Marc-André Lureau <marcandre.lureau at gmail.com>
---
 common/client_marshallers.h |  3 ++-
 common/messages.h           | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/common/client_marshallers.h b/common/client_marshallers.h
index 522f620..f36fc3a 100644
--- a/common/client_marshallers.h
+++ b/common/client_marshallers.h
@@ -45,6 +45,8 @@ typedef struct {
     void (*msgc_main_migrate_dst_do_seamless)(SpiceMarshaller *m, SpiceMsgcMainMigrateDstDoSeamless *msg);
     void (*msgc_display_init)(SpiceMarshaller *m, SpiceMsgcDisplayInit *msg);
     void (*msgc_display_stream_report)(SpiceMarshaller *m, SpiceMsgcDisplayStreamReport *msg);
+    void (*msgc_display_preferred_compression)(SpiceMarshaller *m, SpiceMsgcDisplayPreferredCompression *msg);
+    void (*msgc_display_gl_draw_done)(SpiceMarshaller *m, SpiceMsgcDisplayGlDrawDone *msg);
     void (*msgc_inputs_key_down)(SpiceMarshaller *m, SpiceMsgcKeyDown *msg);
     void (*msgc_inputs_key_up)(SpiceMarshaller *m, SpiceMsgcKeyUp *msg);
     void (*msgc_inputs_key_modifiers)(SpiceMarshaller *m, SpiceMsgcKeyModifiers *msg);
@@ -72,7 +74,6 @@ typedef struct {
     void (*msgc_smartcard_reader_add)(SpiceMarshaller *m, VSCMsgReaderAdd *msg);
 #endif
     void (*msgc_port_event)(SpiceMarshaller *m, SpiceMsgcPortEvent *msg);
-    void (*msgc_display_preferred_compression)(SpiceMarshaller *m, SpiceMsgcDisplayPreferredCompression *msg);
 } SpiceMessageMarshallers;
 
 SpiceMessageMarshallers *spice_message_marshallers_get(void);
diff --git a/common/messages.h b/common/messages.h
index 12b1943..1c9f01f 100644
--- a/common/messages.h
+++ b/common/messages.h
@@ -379,6 +379,9 @@ typedef struct SpiceMsgcDisplayStreamReport {
     uint32_t audio_delay;
 } SpiceMsgcDisplayStreamReport;
 
+typedef struct SpiceMsgcDisplayGlDrawDone {
+} SpiceMsgcDisplayGlDrawDone;
+
 typedef struct SpiceMsgCursorInit {
     SpicePoint16 position;
     uint16_t trail_length;
@@ -638,6 +641,22 @@ typedef struct SpiceMsgcDisplayPreferredCompression {
     uint8_t image_compression;
 } SpiceMsgcDisplayPreferredCompression;
 
+typedef struct SpiceMsgDisplayGlScanoutUnix {
+    int fd;
+    uint32_t width;
+    uint32_t height;
+    uint32_t stride;
+    uint32_t format;
+    uint8_t flags;
+} SpiceMsgDisplayGlScanoutUnix;
+
+typedef struct SpiceMsgDisplayGlDraw {
+    uint32_t x;
+    uint32_t y;
+    uint32_t w;
+    uint32_t h;
+} SpiceMsgDisplayGlDraw;
+
 SPICE_END_DECLS
 
 #endif /* _H_SPICE_PROTOCOL */
-- 
2.5.0