VIGS: move winsys headers

Change-Id: I86df47eb3d88038c373b44e450ef1174b39dc782
Signed-off-by: Stanislav Vorobiov <s.vorobiov@samsung.com>

diff --git a/hw/vigs/winsys.h b/hw/vigs/winsys.h
new file mode 100644 (file)
index 0000000..95bdea0
--- /dev/null
+++ b/hw/vigs/winsys.h
@@ -0,0 +1,39 @@
+#ifndef _QEMU_WINSYS_H
+#define _QEMU_WINSYS_H
+
+#include "qemu-common.h"
+
+typedef uint32_t winsys_id;
+
+struct winsys_surface
+{
+    uint32_t width;
+    uint32_t height;
+
+    void (*acquire)(struct winsys_surface */*sfc*/);
+    void (*release)(struct winsys_surface */*sfc*/);
+
+    void (*set_dirty)(struct winsys_surface */*sfc*/);
+
+    void (*draw_pixels)(struct winsys_surface */*sfc*/, uint8_t */*pixels*/);
+};
+
+struct winsys_info
+{
+};
+
+struct winsys_interface
+{
+    struct winsys_info *ws_info;
+
+    /*
+     * Acquires surface corresponding to winsys id. NULL if no such surface.
+     */
+    struct winsys_surface *(*acquire_surface)(struct winsys_interface */*wsi*/,
+                                              winsys_id /*id*/);
+
+    void (*fence_ack)(struct winsys_interface */*wsi*/,
+                      uint32_t /*fence_seq*/);
+};
+
+#endif

diff --git a/hw/vigs/winsys_gl.h b/hw/vigs/winsys_gl.h
new file mode 100644 (file)
index 0000000..8428b26
--- /dev/null
+++ b/hw/vigs/winsys_gl.h
@@ -0,0 +1,23 @@
+#ifndef _QEMU_WINSYS_GL_H
+#define _QEMU_WINSYS_GL_H
+
+#include "winsys.h"
+
+struct winsys_gl_surface
+{
+    struct winsys_surface base;
+
+    GLuint (*get_texture)(struct winsys_gl_surface */*sfc*/);
+};
+
+struct winsys_gl_info
+{
+    struct winsys_info base;
+
+    /*
+     * OpenGL context that holds all winsys texture objects.
+     */
+    void *context;
+};
+
+#endif

diff --git a/hw/winsys.h b/hw/winsys.h
deleted file mode 100644 (file)
index 95bdea0..0000000
--- a/hw/winsys.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef _QEMU_WINSYS_H
-#define _QEMU_WINSYS_H
-
-#include "qemu-common.h"
-
-typedef uint32_t winsys_id;
-
-struct winsys_surface
-{
-    uint32_t width;
-    uint32_t height;
-
-    void (*acquire)(struct winsys_surface */*sfc*/);
-    void (*release)(struct winsys_surface */*sfc*/);
-
-    void (*set_dirty)(struct winsys_surface */*sfc*/);
-
-    void (*draw_pixels)(struct winsys_surface */*sfc*/, uint8_t */*pixels*/);
-};
-
-struct winsys_info
-{
-};
-
-struct winsys_interface
-{
-    struct winsys_info *ws_info;
-
-    /*
-     * Acquires surface corresponding to winsys id. NULL if no such surface.
-     */
-    struct winsys_surface *(*acquire_surface)(struct winsys_interface */*wsi*/,
-                                              winsys_id /*id*/);
-
-    void (*fence_ack)(struct winsys_interface */*wsi*/,
-                      uint32_t /*fence_seq*/);
-};
-
-#endif

diff --git a/hw/winsys_gl.h b/hw/winsys_gl.h
deleted file mode 100644 (file)
index 8428b26..0000000
--- a/hw/winsys_gl.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef _QEMU_WINSYS_GL_H
-#define _QEMU_WINSYS_GL_H
-
-#include "winsys.h"
-
-struct winsys_gl_surface
-{
-    struct winsys_surface base;
-
-    GLuint (*get_texture)(struct winsys_gl_surface */*sfc*/);
-};
-
-struct winsys_gl_info
-{
-    struct winsys_info base;
-
-    /*
-     * OpenGL context that holds all winsys texture objects.
-     */
-    void *context;
-};
-
-#endif

diff --git a/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen.c b/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen.c
index 3ddec226326fe79b0aa83f9c198e8c95c46d0b66..7c550fa9fce58fec785b256e081e8c2d29273370 100644 (file)
--- a/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen.c
+++ b/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen.c
@@ -38,7 +38,7 @@
 #include "yagl_process.h"
 #include "yagl_thread.h"
 #include "yagl_gles_driver.h"
-#include "winsys_gl.h"
+#include "vigs/winsys_gl.h"
 
 YAGL_DEFINE_TLS(struct yagl_egl_onscreen_ts*, egl_onscreen_ts);
 

diff --git a/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_display.c b/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_display.c
index 380061936dead7206d01eedc2cab5bc8d198f621..563772a4e4b456a49aad09efea6f5537e31a0353 100644 (file)
--- a/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_display.c
+++ b/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_display.c
@@ -38,7 +38,7 @@
 #include "yagl_process.h"
 #include "yagl_thread.h"
 #include "yagl_object_map.h"
-#include "winsys_gl.h"
+#include "vigs/winsys_gl.h"
 
 struct yagl_egl_onscreen_image
 {

diff --git a/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_surface.c b/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_surface.c
index 648063913ba917248e811f27d8db90735bae4468..9f53cf98192551855993fd277246f7e02fe5c1ec 100644 (file)
--- a/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_surface.c
+++ b/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_surface.c
@@ -37,7 +37,7 @@
 #include "yagl_process.h"
 #include "yagl_thread.h"
 #include "yagl_gles_driver.h"
-#include "winsys_gl.h"
+#include "vigs/winsys_gl.h"
 
 YAGL_DECLARE_TLS(struct yagl_egl_onscreen_ts*, egl_onscreen_ts);
 

diff --git a/hw/yagl/yagl_device.c b/hw/yagl/yagl_device.c
index 383f0d53bdc44c54deffe884f3d41514c0df3538..733ed40e8929181a02675c81c0e96034964b15b9 100644 (file)
--- a/hw/yagl/yagl_device.c
+++ b/hw/yagl/yagl_device.c
@@ -42,7 +42,7 @@
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include <GL/gl.h>
-#include "winsys.h"
+#include "vigs/winsys.h"
 #include "yagl_gles_driver.h"
 
 #define PCI_VENDOR_ID_YAGL 0x19B1

diff --git a/hw/yagl/yagl_thread.c b/hw/yagl/yagl_thread.c
index 729e019d955aafe79bf85100385c651bfc3f6857..8d82dbe463f1c2afd5e0ebe0c12f9a48ef5dcfb3 100644 (file)
--- a/hw/yagl/yagl_thread.c
+++ b/hw/yagl/yagl_thread.c
@@ -35,7 +35,7 @@
 #include "yagl_stats.h"
 #include "yagl_transport.h"
 #include "yagl_object_map.h"
-#include "winsys.h"
+#include "vigs/winsys.h"
 #include "sysemu/kvm.h"
 #include "sysemu/hax.h"