199 files changed, 112 insertions, 0 deletions
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 0243d6aa0e..b1e422e497 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -27,6 +27,8 @@ devices-dirs-$(CONFIG_SOFTMMU) += usb/
 devices-dirs-$(CONFIG_VIRTIO) += virtio/
 devices-dirs-$(CONFIG_SOFTMMU) += watchdog/
 devices-dirs-$(CONFIG_SOFTMMU) += xen/
+devices-dirs-$(CONFIG_BUILD_VIGS) += yagl/
+devices-dirs-$(CONFIG_BUILD_VIGS) += vigs/
 devices-dirs-y += core/
 common-obj-y += $(devices-dirs-y)
 obj-y += $(devices-dirs-y)
diff --git a/hw/vigs/Makefile.objs b/hw/vigs/Makefile.objs
new file mode 100644
index 0000000000..c434eed71c
--- /dev/null
+++ b/hw/vigs/Makefile.objs
@@ -0,0 +1,26 @@
+# VIGS
+QEMU_CFLAGS += -I$(SRC_PATH)/hw/vigs/vigs_inc
+
+obj-y += vigs_log.o
+obj-y += vigs_device.o
+obj-y += vigs_comm.o
+obj-y += vigs_server.o
+obj-y += vigs_backend.o
+obj-y += vigs_surface.o
+obj-y += vigs_utils.o
+obj-y += vigs_vector.o
+obj-y += vigs_ref.o
+obj-y += vigs_gl_backend.o
+obj-y += vigs_sw_backend.o
+# GL GLX backend
+ifdef CONFIG_LINUX
+obj-y += vigs_gl_backend_glx.o
+endif
+# GL WGL backend
+ifdef CONFIG_WIN32
+obj-y += vigs_gl_backend_wgl.o
+endif
+# GL AGL backend
+ifdef CONFIG_DARWIN
+obj-y += vigs_gl_backend_agl.o
+endif
diff --git a/hw/vigs_backend.c b/hw/vigs/vigs_backend.c
index cad9a820a5..cad9a820a5 100644
--- a/hw/vigs_backend.c
+++ b/hw/vigs/vigs_backend.c
diff --git a/hw/vigs_backend.h b/hw/vigs/vigs_backend.h
index 1eb7bfaf63..1eb7bfaf63 100644
--- a/hw/vigs_backend.h
+++ b/hw/vigs/vigs_backend.h
diff --git a/hw/vigs_comm.c b/hw/vigs/vigs_comm.c
index 06f1a70607..06f1a70607 100644
--- a/hw/vigs_comm.c
+++ b/hw/vigs/vigs_comm.c
diff --git a/hw/vigs_comm.h b/hw/vigs/vigs_comm.h
index 4524740aa6..4524740aa6 100644
--- a/hw/vigs_comm.h
+++ b/hw/vigs/vigs_comm.h
diff --git a/hw/vigs_device.c b/hw/vigs/vigs_device.c
index ef8e2d4cfc..ef8e2d4cfc 100644
--- a/hw/vigs_device.c
+++ b/hw/vigs/vigs_device.c
diff --git a/hw/vigs_device.h b/hw/vigs/vigs_device.h
index c40cb39938..c40cb39938 100644
--- a/hw/vigs_device.h
+++ b/hw/vigs/vigs_device.h
diff --git a/hw/vigs_gl_backend.c b/hw/vigs/vigs_gl_backend.c
index f0f94bf841..f0f94bf841 100644
--- a/hw/vigs_gl_backend.c
+++ b/hw/vigs/vigs_gl_backend.c
diff --git a/hw/vigs_gl_backend.h b/hw/vigs/vigs_gl_backend.h
index 5b6a8eb277..5b6a8eb277 100644
--- a/hw/vigs_gl_backend.h
+++ b/hw/vigs/vigs_gl_backend.h
diff --git a/hw/vigs_gl_backend_agl.c b/hw/vigs/vigs_gl_backend_agl.c
index c92f946a19..c92f946a19 100644
--- a/hw/vigs_gl_backend_agl.c
+++ b/hw/vigs/vigs_gl_backend_agl.c
diff --git a/hw/vigs_gl_backend_glx.c b/hw/vigs/vigs_gl_backend_glx.c
index 6b913b0d00..6b913b0d00 100644
--- a/hw/vigs_gl_backend_glx.c
+++ b/hw/vigs/vigs_gl_backend_glx.c
diff --git a/hw/vigs_gl_backend_wgl.c b/hw/vigs/vigs_gl_backend_wgl.c
index 12fced5755..12fced5755 100644
--- a/hw/vigs_gl_backend_wgl.c
+++ b/hw/vigs/vigs_gl_backend_wgl.c
diff --git a/hw/vigs_inc/GL/gl.h b/hw/vigs/vigs_inc/GL/gl.h
index e65e1bc8a8..e65e1bc8a8 100644
--- a/hw/vigs_inc/GL/gl.h
+++ b/hw/vigs/vigs_inc/GL/gl.h
diff --git a/hw/vigs_inc/GL/gl_mangle.h b/hw/vigs/vigs_inc/GL/gl_mangle.h
index 3684803381..3684803381 100644
--- a/hw/vigs_inc/GL/gl_mangle.h
+++ b/hw/vigs/vigs_inc/GL/gl_mangle.h
diff --git a/hw/vigs_inc/GL/glext.h b/hw/vigs/vigs_inc/GL/glext.h
index 09400215ba..09400215ba 100644
--- a/hw/vigs_inc/GL/glext.h
+++ b/hw/vigs/vigs_inc/GL/glext.h
diff --git a/hw/vigs_inc/GL/glu.h b/hw/vigs/vigs_inc/GL/glu.h
index ba2228d8d8..ba2228d8d8 100644
--- a/hw/vigs_inc/GL/glu.h
+++ b/hw/vigs/vigs_inc/GL/glu.h
diff --git a/hw/vigs_inc/GL/glu_mangle.h b/hw/vigs/vigs_inc/GL/glu_mangle.h
index 9c25aa864c..9c25aa864c 100644
--- a/hw/vigs_inc/GL/glu_mangle.h
+++ b/hw/vigs/vigs_inc/GL/glu_mangle.h
diff --git a/hw/vigs_inc/GL/glx.h b/hw/vigs/vigs_inc/GL/glx.h
index a3a7d97c93..a3a7d97c93 100644
--- a/hw/vigs_inc/GL/glx.h
+++ b/hw/vigs/vigs_inc/GL/glx.h
diff --git a/hw/vigs_inc/GL/glx_mangle.h b/hw/vigs/vigs_inc/GL/glx_mangle.h
index fa664a7f59..fa664a7f59 100644
--- a/hw/vigs_inc/GL/glx_mangle.h
+++ b/hw/vigs/vigs_inc/GL/glx_mangle.h
diff --git a/hw/vigs_inc/GL/glxext.h b/hw/vigs/vigs_inc/GL/glxext.h
index 3c47dc363e..3c47dc363e 100644
--- a/hw/vigs_inc/GL/glxext.h
+++ b/hw/vigs/vigs_inc/GL/glxext.h
diff --git a/hw/vigs_inc/GL/internal/dri_interface.h b/hw/vigs/vigs_inc/GL/internal/dri_interface.h
index b21445f104..b21445f104 100644
--- a/hw/vigs_inc/GL/internal/dri_interface.h
+++ b/hw/vigs/vigs_inc/GL/internal/dri_interface.h
diff --git a/hw/vigs_inc/GL/internal/sarea.h b/hw/vigs/vigs_inc/GL/internal/sarea.h
index a0d6084f31..a0d6084f31 100644
--- a/hw/vigs_inc/GL/internal/sarea.h
+++ b/hw/vigs/vigs_inc/GL/internal/sarea.h
diff --git a/hw/vigs_inc/GL/osmesa.h b/hw/vigs/vigs_inc/GL/osmesa.h
index 304655e7c4..304655e7c4 100644
--- a/hw/vigs_inc/GL/osmesa.h
+++ b/hw/vigs/vigs_inc/GL/osmesa.h
diff --git a/hw/vigs_inc/GL/vms_x_fix.h b/hw/vigs/vigs_inc/GL/vms_x_fix.h
index 24cba473d8..24cba473d8 100644
--- a/hw/vigs_inc/GL/vms_x_fix.h
+++ b/hw/vigs/vigs_inc/GL/vms_x_fix.h
diff --git a/hw/vigs_inc/GL/wglext.h b/hw/vigs/vigs_inc/GL/wglext.h
index e60c6527d2..e60c6527d2 100644
--- a/hw/vigs_inc/GL/wglext.h
+++ b/hw/vigs/vigs_inc/GL/wglext.h
diff --git a/hw/vigs_inc/GL/wmesa.h b/hw/vigs/vigs_inc/GL/wmesa.h
index f5f4f273ba..f5f4f273ba 100644
--- a/hw/vigs_inc/GL/wmesa.h
+++ b/hw/vigs/vigs_inc/GL/wmesa.h
diff --git a/hw/vigs_log.c b/hw/vigs/vigs_log.c
index 8efc5a6d69..8efc5a6d69 100644
--- a/hw/vigs_log.c
+++ b/hw/vigs/vigs_log.c
diff --git a/hw/vigs_log.h b/hw/vigs/vigs_log.h
index 2aa6e3af0a..2aa6e3af0a 100644
--- a/hw/vigs_log.h
+++ b/hw/vigs/vigs_log.h
diff --git a/hw/vigs_protocol.h b/hw/vigs/vigs_protocol.h
index c24257ecbc..c24257ecbc 100644
--- a/hw/vigs_protocol.h
+++ b/hw/vigs/vigs_protocol.h
diff --git a/hw/vigs_ref.c b/hw/vigs/vigs_ref.c
index c8dab36c50..c8dab36c50 100644
--- a/hw/vigs_ref.c
+++ b/hw/vigs/vigs_ref.c
diff --git a/hw/vigs_ref.h b/hw/vigs/vigs_ref.h
index dbbd08b376..dbbd08b376 100644
--- a/hw/vigs_ref.h
+++ b/hw/vigs/vigs_ref.h
diff --git a/hw/vigs_regs.h b/hw/vigs/vigs_regs.h
index 35a6066529..35a6066529 100644
--- a/hw/vigs_regs.h
+++ b/hw/vigs/vigs_regs.h
diff --git a/hw/vigs_server.c b/hw/vigs/vigs_server.c
index ca38d8d7a4..ca38d8d7a4 100644
--- a/hw/vigs_server.c
+++ b/hw/vigs/vigs_server.c
diff --git a/hw/vigs_server.h b/hw/vigs/vigs_server.h
index 29c8b326b6..29c8b326b6 100644
--- a/hw/vigs_server.h
+++ b/hw/vigs/vigs_server.h
diff --git a/hw/vigs_surface.c b/hw/vigs/vigs_surface.c
index cc3969bd1d..cc3969bd1d 100644
--- a/hw/vigs_surface.c
+++ b/hw/vigs/vigs_surface.c
diff --git a/hw/vigs_surface.h b/hw/vigs/vigs_surface.h
index 06af7d3b70..06af7d3b70 100644
--- a/hw/vigs_surface.h
+++ b/hw/vigs/vigs_surface.h
diff --git a/hw/vigs_sw_backend.c b/hw/vigs/vigs_sw_backend.c
index b1e96c49b6..b1e96c49b6 100644
--- a/hw/vigs_sw_backend.c
+++ b/hw/vigs/vigs_sw_backend.c
diff --git a/hw/vigs_types.h b/hw/vigs/vigs_types.h
index 594daae168..594daae168 100644
--- a/hw/vigs_types.h
+++ b/hw/vigs/vigs_types.h
diff --git a/hw/vigs_utils.c b/hw/vigs/vigs_utils.c
index 0a2dab864e..0a2dab864e 100644
--- a/hw/vigs_utils.c
+++ b/hw/vigs/vigs_utils.c
diff --git a/hw/vigs_utils.h b/hw/vigs/vigs_utils.h
index 7e046fcfc7..7e046fcfc7 100644
--- a/hw/vigs_utils.h
+++ b/hw/vigs/vigs_utils.h
diff --git a/hw/vigs_vector.c b/hw/vigs/vigs_vector.c
index 9057d5e640..9057d5e640 100644
--- a/hw/vigs_vector.c
+++ b/hw/vigs/vigs_vector.c
diff --git a/hw/vigs_vector.h b/hw/vigs/vigs_vector.h
index 25f2fe8aea..25f2fe8aea 100644
--- a/hw/vigs_vector.h
+++ b/hw/vigs/vigs_vector.h
diff --git a/hw/yagl/Makefile.objs b/hw/yagl/Makefile.objs
new file mode 100644
index 0000000000..39434fc1cc
--- /dev/null
+++ b/hw/yagl/Makefile.objs
@@ -0,0 +1,32 @@
+QEMU_CFLAGS += -I$(SRC_PATH)/hw/yagl -I$(SRC_PATH)/hw/yagl/yagl_inc
+
+obj-y += yagl_device.o
+obj-y += yagl_log.o
+obj-y += yagl_process.o
+obj-y += yagl_thread.o
+obj-y += yagl_server.o
+obj-y += yagl_ref.o
+obj-y += yagl_mem.o
+obj-y += yagl_event.o
+obj-y += yagl_handle_gen.o
+obj-y += yagl_dyn_lib.o
+obj-y += yagl_api.o
+obj-y += yagl_vector.o
+obj-y += yagl_avl.o
+obj-y += yagl_transport.o
+obj-y += yagl_egl_backend.o
+obj-y += yagl_eglb_display.o
+obj-y += yagl_eglb_context.o
+obj-y += yagl_eglb_surface.o
+obj-y += yagl_egl_driver.o
+obj-y += yagl_gles_driver.o
+obj-y += yagl_resource.o
+obj-y += yagl_resource_list.o
+obj-y += yagl_object_map.o
+obj-y += yagl_stats.o
+obj-y += yagl_compiled_transfer.o
+obj-y += yagl_egl_native_config.o
+obj-y += yagl_egl_surface_attribs.o
+obj-y += yagl_apis/
+obj-y += yagl_backends/
+obj-y += yagl_drivers/
diff --git a/hw/yagl_api.c b/hw/yagl/yagl_api.c
index 64be0220a9..64be0220a9 100644
--- a/hw/yagl_api.c
+++ b/hw/yagl/yagl_api.c
diff --git a/hw/yagl_api.h b/hw/yagl/yagl_api.h
index bf11c0a159..bf11c0a159 100644
--- a/hw/yagl_api.h
+++ b/hw/yagl/yagl_api.h
diff --git a/hw/yagl/yagl_apis/Makefile.objs b/hw/yagl/yagl_apis/Makefile.objs
new file mode 100644
index 0000000000..9e6fc3fd17
--- /dev/null
+++ b/hw/yagl/yagl_apis/Makefile.objs
@@ -0,0 +1,2 @@
+obj-y += egl/
+obj-y += gles/
diff --git a/hw/yagl/yagl_apis/egl/Makefile.objs b/hw/yagl/yagl_apis/egl/Makefile.objs
new file mode 100644
index 0000000000..570a379379
--- /dev/null
+++ b/hw/yagl/yagl_apis/egl/Makefile.objs
@@ -0,0 +1,11 @@
+# EGL api
+obj-y += yagl_egl_api.o
+obj-y += yagl_egl_api_ps.o
+obj-y += yagl_egl_api_ts.o
+obj-y += yagl_egl_calls.o
+obj-y += yagl_egl_display.o
+obj-y += yagl_egl_config.o
+obj-y += yagl_egl_surface.o
+obj-y += yagl_egl_context.o
+obj-y += yagl_egl_validate.o
+obj-y += yagl_host_egl_calls.o
diff --git a/hw/yagl_apis/egl/yagl_egl_api.c b/hw/yagl/yagl_apis/egl/yagl_egl_api.c
index 3587685150..3587685150 100644
--- a/hw/yagl_apis/egl/yagl_egl_api.c
+++ b/hw/yagl/yagl_apis/egl/yagl_egl_api.c
diff --git a/hw/yagl_apis/egl/yagl_egl_api.h b/hw/yagl/yagl_apis/egl/yagl_egl_api.h
index e7051760f0..e7051760f0 100644
--- a/hw/yagl_apis/egl/yagl_egl_api.h
+++ b/hw/yagl/yagl_apis/egl/yagl_egl_api.h
diff --git a/hw/yagl_apis/egl/yagl_egl_api_ps.c b/hw/yagl/yagl_apis/egl/yagl_egl_api_ps.c
index ab10cae325..ab10cae325 100644
--- a/hw/yagl_apis/egl/yagl_egl_api_ps.c
+++ b/hw/yagl/yagl_apis/egl/yagl_egl_api_ps.c
diff --git a/hw/yagl_apis/egl/yagl_egl_api_ps.h b/hw/yagl/yagl_apis/egl/yagl_egl_api_ps.h
index f963540bd2..f963540bd2 100644
--- a/hw/yagl_apis/egl/yagl_egl_api_ps.h
+++ b/hw/yagl/yagl_apis/egl/yagl_egl_api_ps.h
diff --git a/hw/yagl_apis/egl/yagl_egl_api_ts.c b/hw/yagl/yagl_apis/egl/yagl_egl_api_ts.c
index 0b938d0fd0..0b938d0fd0 100644
--- a/hw/yagl_apis/egl/yagl_egl_api_ts.c
+++ b/hw/yagl/yagl_apis/egl/yagl_egl_api_ts.c
diff --git a/hw/yagl_apis/egl/yagl_egl_api_ts.h b/hw/yagl/yagl_apis/egl/yagl_egl_api_ts.h
index 86b6bc0e03..86b6bc0e03 100644
--- a/hw/yagl_apis/egl/yagl_egl_api_ts.h
+++ b/hw/yagl/yagl_apis/egl/yagl_egl_api_ts.h
diff --git a/hw/yagl_apis/egl/yagl_egl_calls.c b/hw/yagl/yagl_apis/egl/yagl_egl_calls.c
index 66c19574ed..66c19574ed 100644
--- a/hw/yagl_apis/egl/yagl_egl_calls.c
+++ b/hw/yagl/yagl_apis/egl/yagl_egl_calls.c
diff --git a/hw/yagl_apis/egl/yagl_egl_calls.h b/hw/yagl/yagl_apis/egl/yagl_egl_calls.h
index fae9af5bb7..fae9af5bb7 100644
--- a/hw/yagl_apis/egl/yagl_egl_calls.h
+++ b/hw/yagl/yagl_apis/egl/yagl_egl_calls.h
diff --git a/hw/yagl_apis/egl/yagl_egl_config.c b/hw/yagl/yagl_apis/egl/yagl_egl_config.c
index 30a9922699..30a9922699 100644
--- a/hw/yagl_apis/egl/yagl_egl_config.c
+++ b/hw/yagl/yagl_apis/egl/yagl_egl_config.c
diff --git a/hw/yagl_apis/egl/yagl_egl_config.h b/hw/yagl/yagl_apis/egl/yagl_egl_config.h
index c58548566c..c58548566c 100644
--- a/hw/yagl_apis/egl/yagl_egl_config.h
+++ b/hw/yagl/yagl_apis/egl/yagl_egl_config.h
diff --git a/hw/yagl_apis/egl/yagl_egl_context.c b/hw/yagl/yagl_apis/egl/yagl_egl_context.c
index f9e3bf7f14..f9e3bf7f14 100644
--- a/hw/yagl_apis/egl/yagl_egl_context.c
+++ b/hw/yagl/yagl_apis/egl/yagl_egl_context.c
diff --git a/hw/yagl_apis/egl/yagl_egl_context.h b/hw/yagl/yagl_apis/egl/yagl_egl_context.h
index 7271442bbe..7271442bbe 100644
--- a/hw/yagl_apis/egl/yagl_egl_context.h
+++ b/hw/yagl/yagl_apis/egl/yagl_egl_context.h
diff --git a/hw/yagl_apis/egl/yagl_egl_display.c b/hw/yagl/yagl_apis/egl/yagl_egl_display.c
index 11fed5278a..11fed5278a 100644
--- a/hw/yagl_apis/egl/yagl_egl_display.c
+++ b/hw/yagl/yagl_apis/egl/yagl_egl_display.c
diff --git a/hw/yagl_apis/egl/yagl_egl_display.h b/hw/yagl/yagl_apis/egl/yagl_egl_display.h
index 182af02b0d..182af02b0d 100644
--- a/hw/yagl_apis/egl/yagl_egl_display.h
+++ b/hw/yagl/yagl_apis/egl/yagl_egl_display.h
diff --git a/hw/yagl_apis/egl/yagl_egl_surface.c b/hw/yagl/yagl_apis/egl/yagl_egl_surface.c
index 386dc903db..386dc903db 100644
--- a/hw/yagl_apis/egl/yagl_egl_surface.c
+++ b/hw/yagl/yagl_apis/egl/yagl_egl_surface.c
diff --git a/hw/yagl_apis/egl/yagl_egl_surface.h b/hw/yagl/yagl_apis/egl/yagl_egl_surface.h
index c16fb04194..c16fb04194 100644
--- a/hw/yagl_apis/egl/yagl_egl_surface.h
+++ b/hw/yagl/yagl_apis/egl/yagl_egl_surface.h
diff --git a/hw/yagl_apis/egl/yagl_egl_validate.c b/hw/yagl/yagl_apis/egl/yagl_egl_validate.c
index 2d74fc502a..2d74fc502a 100644
--- a/hw/yagl_apis/egl/yagl_egl_validate.c
+++ b/hw/yagl/yagl_apis/egl/yagl_egl_validate.c
diff --git a/hw/yagl_apis/egl/yagl_egl_validate.h b/hw/yagl/yagl_apis/egl/yagl_egl_validate.h
index 55dbdaa39c..55dbdaa39c 100644
--- a/hw/yagl_apis/egl/yagl_egl_validate.h
+++ b/hw/yagl/yagl_apis/egl/yagl_egl_validate.h
diff --git a/hw/yagl_apis/egl/yagl_host_egl_calls.c b/hw/yagl/yagl_apis/egl/yagl_host_egl_calls.c
index 23c18b5429..23c18b5429 100644
--- a/hw/yagl_apis/egl/yagl_host_egl_calls.c
+++ b/hw/yagl/yagl_apis/egl/yagl_host_egl_calls.c
diff --git a/hw/yagl_apis/egl/yagl_host_egl_calls.h b/hw/yagl/yagl_apis/egl/yagl_host_egl_calls.h
index 306c117ccd..306c117ccd 100644
--- a/hw/yagl_apis/egl/yagl_host_egl_calls.h
+++ b/hw/yagl/yagl_apis/egl/yagl_host_egl_calls.h
diff --git a/hw/yagl/yagl_apis/gles/Makefile.objs b/hw/yagl/yagl_apis/gles/Makefile.objs
new file mode 100644
index 0000000000..1147c7f063
--- /dev/null
+++ b/hw/yagl/yagl_apis/gles/Makefile.objs
@@ -0,0 +1,6 @@
+# GLES api
+obj-y += yagl_gles_api.o
+obj-y += yagl_gles_api_ps.o
+obj-y += yagl_gles_api_ts.o
+obj-y += yagl_gles_calls.o
+obj-y += yagl_host_gles_calls.o
diff --git a/hw/yagl_apis/gles/yagl_gles_api.c b/hw/yagl/yagl_apis/gles/yagl_gles_api.c
index af0eb99c2e..af0eb99c2e 100644
--- a/hw/yagl_apis/gles/yagl_gles_api.c
+++ b/hw/yagl/yagl_apis/gles/yagl_gles_api.c
diff --git a/hw/yagl_apis/gles/yagl_gles_api.h b/hw/yagl/yagl_apis/gles/yagl_gles_api.h
index 5f196a8e84..5f196a8e84 100644
--- a/hw/yagl_apis/gles/yagl_gles_api.h
+++ b/hw/yagl/yagl_apis/gles/yagl_gles_api.h
diff --git a/hw/yagl_apis/gles/yagl_gles_api_ps.c b/hw/yagl/yagl_apis/gles/yagl_gles_api_ps.c
index 7af362253f..7af362253f 100644
--- a/hw/yagl_apis/gles/yagl_gles_api_ps.c
+++ b/hw/yagl/yagl_apis/gles/yagl_gles_api_ps.c
diff --git a/hw/yagl_apis/gles/yagl_gles_api_ps.h b/hw/yagl/yagl_apis/gles/yagl_gles_api_ps.h
index 50ac2bbe4a..50ac2bbe4a 100644
--- a/hw/yagl_apis/gles/yagl_gles_api_ps.h
+++ b/hw/yagl/yagl_apis/gles/yagl_gles_api_ps.h
diff --git a/hw/yagl_apis/gles/yagl_gles_api_ts.c b/hw/yagl/yagl_apis/gles/yagl_gles_api_ts.c
index 0e404008c8..0e404008c8 100644
--- a/hw/yagl_apis/gles/yagl_gles_api_ts.c
+++ b/hw/yagl/yagl_apis/gles/yagl_gles_api_ts.c
diff --git a/hw/yagl_apis/gles/yagl_gles_api_ts.h b/hw/yagl/yagl_apis/gles/yagl_gles_api_ts.h
index 73906645a3..73906645a3 100644
--- a/hw/yagl_apis/gles/yagl_gles_api_ts.h
+++ b/hw/yagl/yagl_apis/gles/yagl_gles_api_ts.h
diff --git a/hw/yagl_apis/gles/yagl_gles_calls.c b/hw/yagl/yagl_apis/gles/yagl_gles_calls.c
index b9ad65671b..b9ad65671b 100644
--- a/hw/yagl_apis/gles/yagl_gles_calls.c
+++ b/hw/yagl/yagl_apis/gles/yagl_gles_calls.c
diff --git a/hw/yagl_apis/gles/yagl_gles_calls.h b/hw/yagl/yagl_apis/gles/yagl_gles_calls.h
index 453b1743b9..453b1743b9 100644
--- a/hw/yagl_apis/gles/yagl_gles_calls.h
+++ b/hw/yagl/yagl_apis/gles/yagl_gles_calls.h
diff --git a/hw/yagl_apis/gles/yagl_host_gles_calls.c b/hw/yagl/yagl_apis/gles/yagl_host_gles_calls.c
index 1dfb18fe3f..1dfb18fe3f 100644
--- a/hw/yagl_apis/gles/yagl_host_gles_calls.c
+++ b/hw/yagl/yagl_apis/gles/yagl_host_gles_calls.c
diff --git a/hw/yagl_apis/gles/yagl_host_gles_calls.h b/hw/yagl/yagl_apis/gles/yagl_host_gles_calls.h
index 655aa0e99a..655aa0e99a 100644
--- a/hw/yagl_apis/gles/yagl_host_gles_calls.h
+++ b/hw/yagl/yagl_apis/gles/yagl_host_gles_calls.h
diff --git a/hw/yagl_avl.c b/hw/yagl/yagl_avl.c
index 0c19a3a974..0c19a3a974 100644
--- a/hw/yagl_avl.c
+++ b/hw/yagl/yagl_avl.c
diff --git a/hw/yagl_avl.h b/hw/yagl/yagl_avl.h
index bb605fd4af..bb605fd4af 100644
--- a/hw/yagl_avl.h
+++ b/hw/yagl/yagl_avl.h
diff --git a/hw/yagl/yagl_backends/Makefile.objs b/hw/yagl/yagl_backends/Makefile.objs
new file mode 100644
index 0000000000..db6d768ec2
--- /dev/null
+++ b/hw/yagl/yagl_backends/Makefile.objs
@@ -0,0 +1,2 @@
+obj-y += egl_offscreen/
+obj-y += egl_onscreen/
diff --git a/hw/yagl/yagl_backends/egl_offscreen/Makefile.objs b/hw/yagl/yagl_backends/egl_offscreen/Makefile.objs
new file mode 100644
index 0000000000..5121b9f67b
--- /dev/null
+++ b/hw/yagl/yagl_backends/egl_offscreen/Makefile.objs
@@ -0,0 +1,6 @@
+# EGL offscreen backend
+obj-y += yagl_egl_offscreen.o
+obj-y += yagl_egl_offscreen_ts.o
+obj-y += yagl_egl_offscreen_display.o
+obj-y += yagl_egl_offscreen_context.o
+obj-y += yagl_egl_offscreen_surface.o
diff --git a/hw/yagl_backends/egl_offscreen/yagl_egl_offscreen.c b/hw/yagl/yagl_backends/egl_offscreen/yagl_egl_offscreen.c
index 2045945799..2045945799 100644
--- a/hw/yagl_backends/egl_offscreen/yagl_egl_offscreen.c
+++ b/hw/yagl/yagl_backends/egl_offscreen/yagl_egl_offscreen.c
diff --git a/hw/yagl_backends/egl_offscreen/yagl_egl_offscreen.h b/hw/yagl/yagl_backends/egl_offscreen/yagl_egl_offscreen.h
index 1b443cf000..1b443cf000 100644
--- a/hw/yagl_backends/egl_offscreen/yagl_egl_offscreen.h
+++ b/hw/yagl/yagl_backends/egl_offscreen/yagl_egl_offscreen.h
diff --git a/hw/yagl_backends/egl_offscreen/yagl_egl_offscreen_context.c b/hw/yagl/yagl_backends/egl_offscreen/yagl_egl_offscreen_context.c
index dc9fb3d1bb..dc9fb3d1bb 100644
--- a/hw/yagl_backends/egl_offscreen/yagl_egl_offscreen_context.c
+++ b/hw/yagl/yagl_backends/egl_offscreen/yagl_egl_offscreen_context.c
diff --git a/hw/yagl_backends/egl_offscreen/yagl_egl_offscreen_context.h b/hw/yagl/yagl_backends/egl_offscreen/yagl_egl_offscreen_context.h
index 2736f2b533..2736f2b533 100644
--- a/hw/yagl_backends/egl_offscreen/yagl_egl_offscreen_context.h
+++ b/hw/yagl/yagl_backends/egl_offscreen/yagl_egl_offscreen_context.h
diff --git a/hw/yagl_backends/egl_offscreen/yagl_egl_offscreen_display.c b/hw/yagl/yagl_backends/egl_offscreen/yagl_egl_offscreen_display.c
index d4ddfd20de..d4ddfd20de 100644
--- a/hw/yagl_backends/egl_offscreen/yagl_egl_offscreen_display.c
+++ b/hw/yagl/yagl_backends/egl_offscreen/yagl_egl_offscreen_display.c
diff --git a/hw/yagl_backends/egl_offscreen/yagl_egl_offscreen_display.h b/hw/yagl/yagl_backends/egl_offscreen/yagl_egl_offscreen_display.h
index f2895ea305..f2895ea305 100644
--- a/hw/yagl_backends/egl_offscreen/yagl_egl_offscreen_display.h
+++ b/hw/yagl/yagl_backends/egl_offscreen/yagl_egl_offscreen_display.h
diff --git a/hw/yagl_backends/egl_offscreen/yagl_egl_offscreen_surface.c b/hw/yagl/yagl_backends/egl_offscreen/yagl_egl_offscreen_surface.c
index d02fadba6d..d02fadba6d 100644
--- a/hw/yagl_backends/egl_offscreen/yagl_egl_offscreen_surface.c
+++ b/hw/yagl/yagl_backends/egl_offscreen/yagl_egl_offscreen_surface.c
diff --git a/hw/yagl_backends/egl_offscreen/yagl_egl_offscreen_surface.h b/hw/yagl/yagl_backends/egl_offscreen/yagl_egl_offscreen_surface.h
index 789b56c5b6..789b56c5b6 100644
--- a/hw/yagl_backends/egl_offscreen/yagl_egl_offscreen_surface.h
+++ b/hw/yagl/yagl_backends/egl_offscreen/yagl_egl_offscreen_surface.h
diff --git a/hw/yagl_backends/egl_offscreen/yagl_egl_offscreen_ts.c b/hw/yagl/yagl_backends/egl_offscreen/yagl_egl_offscreen_ts.c
index 4547e8e4fd..4547e8e4fd 100644
--- a/hw/yagl_backends/egl_offscreen/yagl_egl_offscreen_ts.c
+++ b/hw/yagl/yagl_backends/egl_offscreen/yagl_egl_offscreen_ts.c
diff --git a/hw/yagl_backends/egl_offscreen/yagl_egl_offscreen_ts.h b/hw/yagl/yagl_backends/egl_offscreen/yagl_egl_offscreen_ts.h
index 7c3f34118b..7c3f34118b 100644
--- a/hw/yagl_backends/egl_offscreen/yagl_egl_offscreen_ts.h
+++ b/hw/yagl/yagl_backends/egl_offscreen/yagl_egl_offscreen_ts.h
diff --git a/hw/yagl/yagl_backends/egl_onscreen/Makefile.objs b/hw/yagl/yagl_backends/egl_onscreen/Makefile.objs
new file mode 100644
index 0000000000..922fc679ad
--- /dev/null
+++ b/hw/yagl/yagl_backends/egl_onscreen/Makefile.objs
@@ -0,0 +1,7 @@
+# EGL onscreen backend
+obj-y += yagl_egl_onscreen.o
+obj-y += yagl_egl_onscreen_ts.o
+obj-y += yagl_egl_onscreen_display.o
+obj-y += yagl_egl_onscreen_context.o
+obj-y += yagl_egl_onscreen_surface.o
+
diff --git a/hw/yagl_backends/egl_onscreen/yagl_egl_onscreen.c b/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen.c
index c700f13abe..c700f13abe 100644
--- a/hw/yagl_backends/egl_onscreen/yagl_egl_onscreen.c
+++ b/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen.c
diff --git a/hw/yagl_backends/egl_onscreen/yagl_egl_onscreen.h b/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen.h
index 83c68f2269..83c68f2269 100644
--- a/hw/yagl_backends/egl_onscreen/yagl_egl_onscreen.h
+++ b/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen.h
diff --git a/hw/yagl_backends/egl_onscreen/yagl_egl_onscreen_context.c b/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_context.c
index 99c1fba3a0..99c1fba3a0 100644
--- a/hw/yagl_backends/egl_onscreen/yagl_egl_onscreen_context.c
+++ b/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_context.c
diff --git a/hw/yagl_backends/egl_onscreen/yagl_egl_onscreen_context.h b/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_context.h
index 0097240bee..0097240bee 100644
--- a/hw/yagl_backends/egl_onscreen/yagl_egl_onscreen_context.h
+++ b/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_context.h
diff --git a/hw/yagl_backends/egl_onscreen/yagl_egl_onscreen_display.c b/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_display.c
index dacbedeeb2..dacbedeeb2 100644
--- a/hw/yagl_backends/egl_onscreen/yagl_egl_onscreen_display.c
+++ b/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_display.c
diff --git a/hw/yagl_backends/egl_onscreen/yagl_egl_onscreen_display.h b/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_display.h
index 23e3853d65..23e3853d65 100644
--- a/hw/yagl_backends/egl_onscreen/yagl_egl_onscreen_display.h
+++ b/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_display.h
diff --git a/hw/yagl_backends/egl_onscreen/yagl_egl_onscreen_surface.c b/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_surface.c
index 428f7857c5..428f7857c5 100644
--- a/hw/yagl_backends/egl_onscreen/yagl_egl_onscreen_surface.c
+++ b/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_surface.c
diff --git a/hw/yagl_backends/egl_onscreen/yagl_egl_onscreen_surface.h b/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_surface.h
index 92875a513c..92875a513c 100644
--- a/hw/yagl_backends/egl_onscreen/yagl_egl_onscreen_surface.h
+++ b/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_surface.h
diff --git a/hw/yagl_backends/egl_onscreen/yagl_egl_onscreen_ts.c b/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_ts.c
index 41fd02f584..41fd02f584 100644
--- a/hw/yagl_backends/egl_onscreen/yagl_egl_onscreen_ts.c
+++ b/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_ts.c
diff --git a/hw/yagl_backends/egl_onscreen/yagl_egl_onscreen_ts.h b/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_ts.h
index 9b1ce8bd50..9b1ce8bd50 100644
--- a/hw/yagl_backends/egl_onscreen/yagl_egl_onscreen_ts.h
+++ b/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_ts.h
diff --git a/hw/yagl_compiled_transfer.c b/hw/yagl/yagl_compiled_transfer.c
index 32d08b20a7..32d08b20a7 100644
--- a/hw/yagl_compiled_transfer.c
+++ b/hw/yagl/yagl_compiled_transfer.c
diff --git a/hw/yagl_compiled_transfer.h b/hw/yagl/yagl_compiled_transfer.h
index adfe537a1b..adfe537a1b 100644
--- a/hw/yagl_compiled_transfer.h
+++ b/hw/yagl/yagl_compiled_transfer.h
diff --git a/hw/yagl_device.c b/hw/yagl/yagl_device.c
index f7a5dab723..f7a5dab723 100644
--- a/hw/yagl_device.c
+++ b/hw/yagl/yagl_device.c
diff --git a/hw/yagl/yagl_drivers/Makefile.objs b/hw/yagl/yagl_drivers/Makefile.objs
new file mode 100644
index 0000000000..f3544e70aa
--- /dev/null
+++ b/hw/yagl/yagl_drivers/Makefile.objs
@@ -0,0 +1,6 @@
+obj-$(CONFIG_LINUX) += egl_glx/
+obj-$(CONFIG_WIN32) += egl_wgl/
+obj-$(CONFIG_DARWIN) += egl_agl/
+obj-y += gles_ogl/
+obj-y += gles_onscreen/
+
diff --git a/hw/yagl/yagl_drivers/egl_agl/Makefile.objs b/hw/yagl/yagl_drivers/egl_agl/Makefile.objs
new file mode 100644
index 0000000000..61fc900f32
--- /dev/null
+++ b/hw/yagl/yagl_drivers/egl_agl/Makefile.objs
@@ -0,0 +1,3 @@
+# EGL AGL driver
+QEMU_CFLAGS += -Wno-comment
+obj-y += yagl_egl_agl.o
diff --git a/hw/yagl_drivers/egl_agl/yagl_egl_agl.c b/hw/yagl/yagl_drivers/egl_agl/yagl_egl_agl.c
index f3593a360e..f3593a360e 100644
--- a/hw/yagl_drivers/egl_agl/yagl_egl_agl.c
+++ b/hw/yagl/yagl_drivers/egl_agl/yagl_egl_agl.c
diff --git a/hw/yagl/yagl_drivers/egl_glx/Makefile.objs b/hw/yagl/yagl_drivers/egl_glx/Makefile.objs
new file mode 100644
index 0000000000..15df65cd51
--- /dev/null
+++ b/hw/yagl/yagl_drivers/egl_glx/Makefile.objs
@@ -0,0 +1,2 @@
+# EGL GLX driver
+obj-y += yagl_egl_glx.o
diff --git a/hw/yagl_drivers/egl_glx/yagl_egl_glx.c b/hw/yagl/yagl_drivers/egl_glx/yagl_egl_glx.c
index 8b29c8286b..8b29c8286b 100644
--- a/hw/yagl_drivers/egl_glx/yagl_egl_glx.c
+++ b/hw/yagl/yagl_drivers/egl_glx/yagl_egl_glx.c
diff --git a/hw/yagl/yagl_drivers/egl_wgl/Makefile.objs b/hw/yagl/yagl_drivers/egl_wgl/Makefile.objs
new file mode 100644
index 0000000000..811e319a3a
--- /dev/null
+++ b/hw/yagl/yagl_drivers/egl_wgl/Makefile.objs
@@ -0,0 +1,2 @@
+# EGL WGL driver
+obj-y += yagl_egl_wgl.o
diff --git a/hw/yagl_drivers/egl_wgl/yagl_egl_wgl.c b/hw/yagl/yagl_drivers/egl_wgl/yagl_egl_wgl.c
index ae9abb0180..ae9abb0180 100644
--- a/hw/yagl_drivers/egl_wgl/yagl_egl_wgl.c
+++ b/hw/yagl/yagl_drivers/egl_wgl/yagl_egl_wgl.c
diff --git a/hw/yagl/yagl_drivers/gles_ogl/Makefile.objs b/hw/yagl/yagl_drivers/gles_ogl/Makefile.objs
new file mode 100644
index 0000000000..a4391feb00
--- /dev/null
+++ b/hw/yagl/yagl_drivers/gles_ogl/Makefile.objs
@@ -0,0 +1,2 @@
+# GLES OpenGL driver
+obj-y += yagl_gles_ogl.o
diff --git a/hw/yagl_drivers/gles_ogl/yagl_gles_ogl.c b/hw/yagl/yagl_drivers/gles_ogl/yagl_gles_ogl.c
index dd46369ed7..dd46369ed7 100644
--- a/hw/yagl_drivers/gles_ogl/yagl_gles_ogl.c
+++ b/hw/yagl/yagl_drivers/gles_ogl/yagl_gles_ogl.c
diff --git a/hw/yagl_drivers/gles_ogl/yagl_gles_ogl.h b/hw/yagl/yagl_drivers/gles_ogl/yagl_gles_ogl.h
index 3fcec518a0..3fcec518a0 100644
--- a/hw/yagl_drivers/gles_ogl/yagl_gles_ogl.h
+++ b/hw/yagl/yagl_drivers/gles_ogl/yagl_gles_ogl.h
diff --git a/hw/yagl_drivers/gles_ogl/yagl_gles_ogl_macros.h b/hw/yagl/yagl_drivers/gles_ogl/yagl_gles_ogl_macros.h
index e6e187864a..e6e187864a 100644
--- a/hw/yagl_drivers/gles_ogl/yagl_gles_ogl_macros.h
+++ b/hw/yagl/yagl_drivers/gles_ogl/yagl_gles_ogl_macros.h
diff --git a/hw/yagl/yagl_drivers/gles_onscreen/Makefile.objs b/hw/yagl/yagl_drivers/gles_onscreen/Makefile.objs
new file mode 100644
index 0000000000..5878ee9a7b
--- /dev/null
+++ b/hw/yagl/yagl_drivers/gles_onscreen/Makefile.objs
@@ -0,0 +1,3 @@
+# GLES onscreen driver
+obj-y += yagl_gles_onscreen.o
+
diff --git a/hw/yagl_drivers/gles_onscreen/yagl_gles_onscreen.c b/hw/yagl/yagl_drivers/gles_onscreen/yagl_gles_onscreen.c
index 67e48c0e46..67e48c0e46 100644
--- a/hw/yagl_drivers/gles_onscreen/yagl_gles_onscreen.c
+++ b/hw/yagl/yagl_drivers/gles_onscreen/yagl_gles_onscreen.c
diff --git a/hw/yagl_drivers/gles_onscreen/yagl_gles_onscreen.h b/hw/yagl/yagl_drivers/gles_onscreen/yagl_gles_onscreen.h
index 8560d5e205..8560d5e205 100644
--- a/hw/yagl_drivers/gles_onscreen/yagl_gles_onscreen.h
+++ b/hw/yagl/yagl_drivers/gles_onscreen/yagl_gles_onscreen.h
diff --git a/hw/yagl_dyn_lib.c b/hw/yagl/yagl_dyn_lib.c
index caa118dc08..caa118dc08 100644
--- a/hw/yagl_dyn_lib.c
+++ b/hw/yagl/yagl_dyn_lib.c
diff --git a/hw/yagl_dyn_lib.h b/hw/yagl/yagl_dyn_lib.h
index e89b072b91..e89b072b91 100644
--- a/hw/yagl_dyn_lib.h
+++ b/hw/yagl/yagl_dyn_lib.h
diff --git a/hw/yagl_egl_backend.c b/hw/yagl/yagl_egl_backend.c
index f849ba4095..f849ba4095 100644
--- a/hw/yagl_egl_backend.c
+++ b/hw/yagl/yagl_egl_backend.c
diff --git a/hw/yagl_egl_backend.h b/hw/yagl/yagl_egl_backend.h
index 677735d9be..677735d9be 100644
--- a/hw/yagl_egl_backend.h
+++ b/hw/yagl/yagl_egl_backend.h
diff --git a/hw/yagl_egl_driver.c b/hw/yagl/yagl_egl_driver.c
index 7bb295b7e2..7bb295b7e2 100644
--- a/hw/yagl_egl_driver.c
+++ b/hw/yagl/yagl_egl_driver.c
diff --git a/hw/yagl_egl_driver.h b/hw/yagl/yagl_egl_driver.h
index 0deed4081a..0deed4081a 100644
--- a/hw/yagl_egl_driver.h
+++ b/hw/yagl/yagl_egl_driver.h
diff --git a/hw/yagl_egl_interface.h b/hw/yagl/yagl_egl_interface.h
index bd70110c96..bd70110c96 100644
--- a/hw/yagl_egl_interface.h
+++ b/hw/yagl/yagl_egl_interface.h
diff --git a/hw/yagl_egl_native_config.c b/hw/yagl/yagl_egl_native_config.c
index 83c407acfa..83c407acfa 100644
--- a/hw/yagl_egl_native_config.c
+++ b/hw/yagl/yagl_egl_native_config.c
diff --git a/hw/yagl_egl_native_config.h b/hw/yagl/yagl_egl_native_config.h
index 3dd356cbb5..3dd356cbb5 100644
--- a/hw/yagl_egl_native_config.h
+++ b/hw/yagl/yagl_egl_native_config.h
diff --git a/hw/yagl_egl_surface_attribs.c b/hw/yagl/yagl_egl_surface_attribs.c
index 762aaa8492..762aaa8492 100644
--- a/hw/yagl_egl_surface_attribs.c
+++ b/hw/yagl/yagl_egl_surface_attribs.c
diff --git a/hw/yagl_egl_surface_attribs.h b/hw/yagl/yagl_egl_surface_attribs.h
index 900e4a4aba..900e4a4aba 100644
--- a/hw/yagl_egl_surface_attribs.h
+++ b/hw/yagl/yagl_egl_surface_attribs.h
diff --git a/hw/yagl_eglb_context.c b/hw/yagl/yagl_eglb_context.c
index d773ea1931..d773ea1931 100644
--- a/hw/yagl_eglb_context.c
+++ b/hw/yagl/yagl_eglb_context.c
diff --git a/hw/yagl_eglb_context.h b/hw/yagl/yagl_eglb_context.h
index 75131c0a28..75131c0a28 100644
--- a/hw/yagl_eglb_context.h
+++ b/hw/yagl/yagl_eglb_context.h
diff --git a/hw/yagl_eglb_display.c b/hw/yagl/yagl_eglb_display.c
index 21bf5abe53..21bf5abe53 100644
--- a/hw/yagl_eglb_display.c
+++ b/hw/yagl/yagl_eglb_display.c
diff --git a/hw/yagl_eglb_display.h b/hw/yagl/yagl_eglb_display.h
index e73afee369..e73afee369 100644
--- a/hw/yagl_eglb_display.h
+++ b/hw/yagl/yagl_eglb_display.h
diff --git a/hw/yagl_eglb_surface.c b/hw/yagl/yagl_eglb_surface.c
index bdecdcec0d..bdecdcec0d 100644
--- a/hw/yagl_eglb_surface.c
+++ b/hw/yagl/yagl_eglb_surface.c
diff --git a/hw/yagl_eglb_surface.h b/hw/yagl/yagl_eglb_surface.h
index fa9de86677..fa9de86677 100644
--- a/hw/yagl_eglb_surface.h
+++ b/hw/yagl/yagl_eglb_surface.h
diff --git a/hw/yagl_event.c b/hw/yagl/yagl_event.c
index 546bddfa58..546bddfa58 100644
--- a/hw/yagl_event.c
+++ b/hw/yagl/yagl_event.c
diff --git a/hw/yagl_event.h b/hw/yagl/yagl_event.h
index ac85d28364..ac85d28364 100644
--- a/hw/yagl_event.h
+++ b/hw/yagl/yagl_event.h
diff --git a/hw/yagl_gles_driver.c b/hw/yagl/yagl_gles_driver.c
index 049c648642..049c648642 100644
--- a/hw/yagl_gles_driver.c
+++ b/hw/yagl/yagl_gles_driver.c
diff --git a/hw/yagl_gles_driver.h b/hw/yagl/yagl_gles_driver.h
index 434ac19d20..434ac19d20 100644
--- a/hw/yagl_gles_driver.h
+++ b/hw/yagl/yagl_gles_driver.h
diff --git a/hw/yagl_handle_gen.c b/hw/yagl/yagl_handle_gen.c
index c37bf78ea3..c37bf78ea3 100644
--- a/hw/yagl_handle_gen.c
+++ b/hw/yagl/yagl_handle_gen.c
diff --git a/hw/yagl_handle_gen.h b/hw/yagl/yagl_handle_gen.h
index 151a04a590..151a04a590 100644
--- a/hw/yagl_handle_gen.h
+++ b/hw/yagl/yagl_handle_gen.h
diff --git a/hw/yagl_inc/EGL/egl.h b/hw/yagl/yagl_inc/EGL/egl.h
index 99ea342a47..99ea342a47 100644
--- a/hw/yagl_inc/EGL/egl.h
+++ b/hw/yagl/yagl_inc/EGL/egl.h
diff --git a/hw/yagl_inc/EGL/eglext.h b/hw/yagl/yagl_inc/EGL/eglext.h
index a7ea2ea2fd..a7ea2ea2fd 100644
--- a/hw/yagl_inc/EGL/eglext.h
+++ b/hw/yagl/yagl_inc/EGL/eglext.h
diff --git a/hw/yagl_inc/EGL/eglmesaext.h b/hw/yagl/yagl_inc/EGL/eglmesaext.h
index 52dd5b108f..52dd5b108f 100644
--- a/hw/yagl_inc/EGL/eglmesaext.h
+++ b/hw/yagl/yagl_inc/EGL/eglmesaext.h
diff --git a/hw/yagl_inc/EGL/eglplatform.h b/hw/yagl/yagl_inc/EGL/eglplatform.h
index 19d38d9a53..19d38d9a53 100644
--- a/hw/yagl_inc/EGL/eglplatform.h
+++ b/hw/yagl/yagl_inc/EGL/eglplatform.h
diff --git a/hw/yagl_inc/GL/gl.h b/hw/yagl/yagl_inc/GL/gl.h
index e65e1bc8a8..e65e1bc8a8 100644
--- a/hw/yagl_inc/GL/gl.h
+++ b/hw/yagl/yagl_inc/GL/gl.h
diff --git a/hw/yagl_inc/GL/gl_mangle.h b/hw/yagl/yagl_inc/GL/gl_mangle.h
index 3684803381..3684803381 100644
--- a/hw/yagl_inc/GL/gl_mangle.h
+++ b/hw/yagl/yagl_inc/GL/gl_mangle.h
diff --git a/hw/yagl_inc/GL/glext.h b/hw/yagl/yagl_inc/GL/glext.h
index 09400215ba..09400215ba 100644
--- a/hw/yagl_inc/GL/glext.h
+++ b/hw/yagl/yagl_inc/GL/glext.h
diff --git a/hw/yagl_inc/GL/glu.h b/hw/yagl/yagl_inc/GL/glu.h
index ba2228d8d8..ba2228d8d8 100644
--- a/hw/yagl_inc/GL/glu.h
+++ b/hw/yagl/yagl_inc/GL/glu.h
diff --git a/hw/yagl_inc/GL/glu_mangle.h b/hw/yagl/yagl_inc/GL/glu_mangle.h
index 9c25aa864c..9c25aa864c 100644
--- a/hw/yagl_inc/GL/glu_mangle.h
+++ b/hw/yagl/yagl_inc/GL/glu_mangle.h
diff --git a/hw/yagl_inc/GL/glx.h b/hw/yagl/yagl_inc/GL/glx.h
index a3a7d97c93..a3a7d97c93 100644
--- a/hw/yagl_inc/GL/glx.h
+++ b/hw/yagl/yagl_inc/GL/glx.h
diff --git a/hw/yagl_inc/GL/glx_mangle.h b/hw/yagl/yagl_inc/GL/glx_mangle.h
index fa664a7f59..fa664a7f59 100644
--- a/hw/yagl_inc/GL/glx_mangle.h
+++ b/hw/yagl/yagl_inc/GL/glx_mangle.h
diff --git a/hw/yagl_inc/GL/glxext.h b/hw/yagl/yagl_inc/GL/glxext.h
index 3c47dc363e..3c47dc363e 100644
--- a/hw/yagl_inc/GL/glxext.h
+++ b/hw/yagl/yagl_inc/GL/glxext.h
diff --git a/hw/yagl_inc/GL/internal/dri_interface.h b/hw/yagl/yagl_inc/GL/internal/dri_interface.h
index b21445f104..b21445f104 100644
--- a/hw/yagl_inc/GL/internal/dri_interface.h
+++ b/hw/yagl/yagl_inc/GL/internal/dri_interface.h
diff --git a/hw/yagl_inc/GL/internal/sarea.h b/hw/yagl/yagl_inc/GL/internal/sarea.h
index a0d6084f31..a0d6084f31 100644
--- a/hw/yagl_inc/GL/internal/sarea.h
+++ b/hw/yagl/yagl_inc/GL/internal/sarea.h
diff --git a/hw/yagl_inc/GL/osmesa.h b/hw/yagl/yagl_inc/GL/osmesa.h
index 304655e7c4..304655e7c4 100644
--- a/hw/yagl_inc/GL/osmesa.h
+++ b/hw/yagl/yagl_inc/GL/osmesa.h
diff --git a/hw/yagl_inc/GL/vms_x_fix.h b/hw/yagl/yagl_inc/GL/vms_x_fix.h
index 24cba473d8..24cba473d8 100644
--- a/hw/yagl_inc/GL/vms_x_fix.h
+++ b/hw/yagl/yagl_inc/GL/vms_x_fix.h
diff --git a/hw/yagl_inc/GL/wglext.h b/hw/yagl/yagl_inc/GL/wglext.h
index e60c6527d2..e60c6527d2 100644
--- a/hw/yagl_inc/GL/wglext.h
+++ b/hw/yagl/yagl_inc/GL/wglext.h
diff --git a/hw/yagl_inc/GL/wmesa.h b/hw/yagl/yagl_inc/GL/wmesa.h
index f5f4f273ba..f5f4f273ba 100644
--- a/hw/yagl_inc/GL/wmesa.h
+++ b/hw/yagl/yagl_inc/GL/wmesa.h
diff --git a/hw/yagl_inc/GLES/egl.h b/hw/yagl/yagl_inc/GLES/egl.h
index 5778e00509..5778e00509 100644
--- a/hw/yagl_inc/GLES/egl.h
+++ b/hw/yagl/yagl_inc/GLES/egl.h
diff --git a/hw/yagl_inc/GLES/gl.h b/hw/yagl/yagl_inc/GLES/gl.h
index 5b8d85a920..5b8d85a920 100644
--- a/hw/yagl_inc/GLES/gl.h
+++ b/hw/yagl/yagl_inc/GLES/gl.h
diff --git a/hw/yagl_inc/GLES/glext.h b/hw/yagl/yagl_inc/GLES/glext.h
index 130e4b063c..130e4b063c 100644
--- a/hw/yagl_inc/GLES/glext.h
+++ b/hw/yagl/yagl_inc/GLES/glext.h
diff --git a/hw/yagl_inc/GLES/glplatform.h b/hw/yagl/yagl_inc/GLES/glplatform.h
index 2db6ee2ca6..2db6ee2ca6 100644
--- a/hw/yagl_inc/GLES/glplatform.h
+++ b/hw/yagl/yagl_inc/GLES/glplatform.h
diff --git a/hw/yagl_inc/GLES2/gl2.h b/hw/yagl/yagl_inc/GLES2/gl2.h
index e1d3b87cc5..e1d3b87cc5 100644
--- a/hw/yagl_inc/GLES2/gl2.h
+++ b/hw/yagl/yagl_inc/GLES2/gl2.h
diff --git a/hw/yagl_inc/GLES2/gl2ext.h b/hw/yagl/yagl_inc/GLES2/gl2ext.h
index 4eae246352..4eae246352 100644
--- a/hw/yagl_inc/GLES2/gl2ext.h
+++ b/hw/yagl/yagl_inc/GLES2/gl2ext.h
diff --git a/hw/yagl_inc/GLES2/gl2platform.h b/hw/yagl/yagl_inc/GLES2/gl2platform.h
index c9fa3c4d64..c9fa3c4d64 100644
--- a/hw/yagl_inc/GLES2/gl2platform.h
+++ b/hw/yagl/yagl_inc/GLES2/gl2platform.h
diff --git a/hw/yagl_inc/KHR/khrplatform.h b/hw/yagl/yagl_inc/KHR/khrplatform.h
index 447953940e..447953940e 100644
--- a/hw/yagl_inc/KHR/khrplatform.h
+++ b/hw/yagl/yagl_inc/KHR/khrplatform.h
diff --git a/hw/yagl_log.c b/hw/yagl/yagl_log.c
index ae39b9a811..ae39b9a811 100644
--- a/hw/yagl_log.c
+++ b/hw/yagl/yagl_log.c
diff --git a/hw/yagl_log.h b/hw/yagl/yagl_log.h
index 81be9c59e4..81be9c59e4 100644
--- a/hw/yagl_log.h
+++ b/hw/yagl/yagl_log.h
diff --git a/hw/yagl_mem.c b/hw/yagl/yagl_mem.c
index 8534581a54..8534581a54 100644
--- a/hw/yagl_mem.c
+++ b/hw/yagl/yagl_mem.c
diff --git a/hw/yagl_mem.h b/hw/yagl/yagl_mem.h
index 75b8fc7db3..75b8fc7db3 100644
--- a/hw/yagl_mem.h
+++ b/hw/yagl/yagl_mem.h
diff --git a/hw/yagl_object_map.c b/hw/yagl/yagl_object_map.c
index 40fd897da7..40fd897da7 100644
--- a/hw/yagl_object_map.c
+++ b/hw/yagl/yagl_object_map.c
diff --git a/hw/yagl_object_map.h b/hw/yagl/yagl_object_map.h
index cd8ee4aa99..cd8ee4aa99 100644
--- a/hw/yagl_object_map.h
+++ b/hw/yagl/yagl_object_map.h
diff --git a/hw/yagl_process.c b/hw/yagl/yagl_process.c
index 9ff1f4b2e4..9ff1f4b2e4 100644
--- a/hw/yagl_process.c
+++ b/hw/yagl/yagl_process.c
diff --git a/hw/yagl_process.h b/hw/yagl/yagl_process.h
index 6dc996a4f5..6dc996a4f5 100644
--- a/hw/yagl_process.h
+++ b/hw/yagl/yagl_process.h
diff --git a/hw/yagl_ref.c b/hw/yagl/yagl_ref.c
index e01ea4fce8..e01ea4fce8 100644
--- a/hw/yagl_ref.c
+++ b/hw/yagl/yagl_ref.c
diff --git a/hw/yagl_ref.h b/hw/yagl/yagl_ref.h
index 902296ec66..902296ec66 100644
--- a/hw/yagl_ref.h
+++ b/hw/yagl/yagl_ref.h
diff --git a/hw/yagl_resource.c b/hw/yagl/yagl_resource.c
index d70dca9926..d70dca9926 100644
--- a/hw/yagl_resource.c
+++ b/hw/yagl/yagl_resource.c
diff --git a/hw/yagl_resource.h b/hw/yagl/yagl_resource.h
index 68e91e6013..68e91e6013 100644
--- a/hw/yagl_resource.h
+++ b/hw/yagl/yagl_resource.h
diff --git a/hw/yagl_resource_list.c b/hw/yagl/yagl_resource_list.c
index ad7cee6d44..ad7cee6d44 100644
--- a/hw/yagl_resource_list.c
+++ b/hw/yagl/yagl_resource_list.c
diff --git a/hw/yagl_resource_list.h b/hw/yagl/yagl_resource_list.h
index 5ef3ae8324..5ef3ae8324 100644
--- a/hw/yagl_resource_list.h
+++ b/hw/yagl/yagl_resource_list.h
diff --git a/hw/yagl_server.c b/hw/yagl/yagl_server.c
index ea24759ab6..ea24759ab6 100644
--- a/hw/yagl_server.c
+++ b/hw/yagl/yagl_server.c
diff --git a/hw/yagl_server.h b/hw/yagl/yagl_server.h
index 09aacb1043..09aacb1043 100644
--- a/hw/yagl_server.h
+++ b/hw/yagl/yagl_server.h
diff --git a/hw/yagl_stats.c b/hw/yagl/yagl_stats.c
index 8c2cc952f6..8c2cc952f6 100644
--- a/hw/yagl_stats.c
+++ b/hw/yagl/yagl_stats.c
diff --git a/hw/yagl_stats.h b/hw/yagl/yagl_stats.h
index 532ba94d04..532ba94d04 100644
--- a/hw/yagl_stats.h
+++ b/hw/yagl/yagl_stats.h
diff --git a/hw/yagl_thread.c b/hw/yagl/yagl_thread.c
index f92a8e716f..f92a8e716f 100644
--- a/hw/yagl_thread.c
+++ b/hw/yagl/yagl_thread.c
diff --git a/hw/yagl_thread.h b/hw/yagl/yagl_thread.h
index 05330670eb..05330670eb 100644
--- a/hw/yagl_thread.h
+++ b/hw/yagl/yagl_thread.h
diff --git a/hw/yagl_tls.h b/hw/yagl/yagl_tls.h
index 19c638852d..19c638852d 100644
--- a/hw/yagl_tls.h
+++ b/hw/yagl/yagl_tls.h
diff --git a/hw/yagl_transport.c b/hw/yagl/yagl_transport.c
index 6287d84bce..6287d84bce 100644
--- a/hw/yagl_transport.c
+++ b/hw/yagl/yagl_transport.c
diff --git a/hw/yagl_transport.h b/hw/yagl/yagl_transport.h
index 07cc5027af..07cc5027af 100644
--- a/hw/yagl_transport.h
+++ b/hw/yagl/yagl_transport.h
diff --git a/hw/yagl_transport_egl.h b/hw/yagl/yagl_transport_egl.h
index 38869df906..38869df906 100644
--- a/hw/yagl_transport_egl.h
+++ b/hw/yagl/yagl_transport_egl.h
diff --git a/hw/yagl_transport_gl.h b/hw/yagl/yagl_transport_gl.h
index bd5af3423f..bd5af3423f 100644
--- a/hw/yagl_transport_gl.h
+++ b/hw/yagl/yagl_transport_gl.h
diff --git a/hw/yagl_types.h b/hw/yagl/yagl_types.h
index e5d01093be..e5d01093be 100644
--- a/hw/yagl_types.h
+++ b/hw/yagl/yagl_types.h
diff --git a/hw/yagl_vector.c b/hw/yagl/yagl_vector.c
index 9beef4ab51..9beef4ab51 100644
--- a/hw/yagl_vector.c
+++ b/hw/yagl/yagl_vector.c
diff --git a/hw/yagl_vector.h b/hw/yagl/yagl_vector.h
index a09b2f723d..a09b2f723d 100644
--- a/hw/yagl_vector.h
+++ b/hw/yagl/yagl_vector.h
diff --git a/hw/yagl_version.h b/hw/yagl/yagl_version.h
index 638149e64a..638149e64a 100644
--- a/hw/yagl_version.h
+++ b/hw/yagl/yagl_version.h