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
 

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));

virgl.c

@@ -6,82 +6,5 @@ typedef struct {
     struct list_head fence_queue;
 } virgl_data_t;
 
-void virgl_cmd_resource_create_2d_handler(virtio_gpu_state_t *vgpu,
-                                          struct virtq_desc *vq_desc,
-                                          uint32_t *plen);
-
-void virgl_cmd_resource_unref_handler(virtio_gpu_state_t *vgpu,
-                                      struct virtq_desc *vq_desc,
-                                      uint32_t *plen);
-
-void virgl_cmd_set_scanout_handler(virtio_gpu_state_t *vgpu,
-                                   struct virtq_desc *vq_desc,
-                                   uint32_t *plen);
-
-void virgl_cmd_resource_flush_handler(virtio_gpu_state_t *vgpu,
-                                      struct virtq_desc *vq_desc,
-                                      uint32_t *plen);
-
-void virgl_cmd_transfer_to_host_2d_handler(virtio_gpu_state_t *vgpu,
-                                           struct virtq_desc *vq_desc,
-                                           uint32_t *plen);
-
-void virgl_cmd_resource_attach_backing_handler(virtio_gpu_state_t *vgpu,
-                                               struct virtq_desc *vq_desc,
-                                               uint32_t *plen);
-
-void virgl_cmd_resource_detach_backing_handler(virtio_gpu_state_t *vgpu,
-                                               struct virtq_desc *vq_desc,
-                                               uint32_t *plen);
-
-void virgl_cmd_get_capset_info_handler(virtio_gpu_state_t *vgpu,
-                                       struct virtq_desc *vq_desc,
-                                       uint32_t *plen);
-
-void virgl_get_capset_handler(virtio_gpu_state_t *vgpu,
-                              struct virtq_desc *vq_desc,
-                              uint32_t *plen);
-
-void virgl_cmd_ctx_create_handler(virtio_gpu_state_t *vgpu,
-                                  struct virtq_desc *vq_desc,
-                                  uint32_t *plen);
-
-void virgl_cmd_ctx_destroy_handler(virtio_gpu_state_t *vgpu,
-                                   struct virtq_desc *vq_desc,
-                                   uint32_t *plen);
-
-void virgl_cmd_attach_resource_handler(virtio_gpu_state_t *vgpu,
-                                       struct virtq_desc *vq_desc,
-                                       uint32_t *plen);
-
-void virgl_cmd_detach_resource_handler(virtio_gpu_state_t *vgpu,
-                                       struct virtq_desc *vq_desc,
-                                       uint32_t *plen);
-
-void virgl_cmd_resource_create_3d_handler(virtio_gpu_state_t *vgpu,
-                                          struct virtq_desc *vq_desc,
-                                          uint32_t *plen);
-
-void virgl_cmd_transfer_to_host_3d_handler(virtio_gpu_state_t *vgpu,
-                                           struct virtq_desc *vq_desc,
-                                           uint32_t *plen);
-
-void virgl_cmd_transfer_from_host_3d_handler(virtio_gpu_state_t *vgpu,
-                                             struct virtq_desc *vq_desc,
-                                             uint32_t *plen);
-
-void virgl_cmd_submit_3d_handler(virtio_gpu_state_t *vgpu,
-                                 struct virtq_desc *vq_desc,
-                                 uint32_t *plen);
-
-void virgl_cmd_update_cursor_handler(virtio_gpu_state_t *vgpu,
-                                     struct virtq_desc *vq_desc,
-                                     uint32_t *plen);
-
-void virgl_cmd_move_cursor_handler(virtio_gpu_state_t *vgpu,
-                                   struct virtq_desc *vq_desc,
-                                   uint32_t *plen);
-
 void semu_virgl_init(virtio_gpu_state_t *vgpu);
-
 void semu_virgl_fence_poll(void);