Refactor virtio-gpu and virgl code

Author: shengwen-tw

Makefile

@@ -75,6 +75,10 @@ ifeq ($(ENABLE_VIRGL),1)
     CFLAGS += $(shell pkg-config virglrenderer gl egl epoxy --cflags)
     LDFLAGS += $(shell pkg-config virglrenderer gl egl epoxy --libs)
     OBJS_EXTRA += virgl.o
+    OBJS_EXTRA += window-gl.o
+else
+    OBJS_EXTRA += virtio-gpu-sw.o
+    OBJS_EXTRA += window-sw.o
 endif
 
 $(call set-feature, VIRGL)
@@ -94,7 +98,7 @@ else
 endif
 
 ifeq ($(ENABLE_VIRTIOGPU),1)
-    OBJS_EXTRA += window.o
+    OBJS_EXTRA += window-events.o
     OBJS_EXTRA += virtio-gpu.o
 endif
 

common.h

@@ -34,12 +34,6 @@ static inline void bitmap_set_bit(unsigned long *map, unsigned long bit)
     set_bit(bit % BITS_PER_LONG, &map[bit / BITS_PER_LONG]);
 }
 
-size_t copy_iov_to_buf(const struct iovec *iov,
-                       const unsigned int iov_cnt,
-                       size_t offset,
-                       void *buf,
-                       size_t bytes);
-
 /* Range check
  * For any variable range checking:
  *     if (x >= minx && x <= maxx) ...

main.c

@@ -16,6 +16,8 @@
 
 #define PRIV(x) ((emu_state_t *) x->priv)
 
+extern const struct window_backend g_window;
+
 /* Define fetch separately since it is simpler (fixed width, already checked
  * alignment, only main RAM is executable).
  */
@@ -735,7 +737,7 @@ static int semu_start(int argc, char **argv)
     virtio_gpu_init(&(emu.vgpu));
     virtio_gpu_add_scanout(&(emu.vgpu), 1024, 768);
 
-    window_init();
+    g_window.window_init();
 #endif
 #if SEMU_HAS(VIRGL)
     semu_virgl_init(&(emu.vgpu));