YaGL: Separated windowing system related stuff

Change-Id: I26b4dfbccd33e7c8ca89e5ef0bddb6d634220ad6

1 files changed, 13 insertions, 20 deletions

diff --git a/EGL/yagl_onscreen_surface.h b/EGL/yagl_onscreen_surface.h
index 7d92587..7fc7d03 100644
--- a/EGL/yagl_onscreen_surface.h
+++ b/EGL/yagl_onscreen_surface.h
@@ -4,8 +4,8 @@
 #include "yagl_export.h"
 #include "yagl_types.h"
 #include "yagl_surface.h"
-#include "yagl_dri2.h"
-#include "yagl_onscreen_display.h"
+
+struct yagl_onscreen_buffer;
 
 struct yagl_onscreen_surface
 {
@@ -14,27 +14,20 @@ struct yagl_onscreen_surface
     /*
      * Backing pixmap for PBuffer surfaces. NULL otherwise.
      */
-    Pixmap tmp_pixmap;
+    struct yagl_native_drawable *tmp_pixmap;
 
     /*
-     * For widow surfaces this is DRI2BufferBackLeft.
-     * For pixmap surfaces this is DRI2BufferFrontLeft.
-     * For pbuffer surfaces this is DRI2BufferFrontLeft of 'tmp_pixmap'.
+     * For widow surfaces this is yagl_native_attachment_back.
+     * For pixmap surfaces this is yagl_native_attachment_front.
+     * For pbuffer surfaces this is yagl_native_attachment_front of 'tmp_pixmap'.
      *
      * TODO: For window surfaces we also need to support
-     * DRI2BufferFrontLeft.
+     * yagl_native_attachment_front.
      */
     struct yagl_onscreen_buffer *buffer;
 
     /*
-     * This gets incremented in DRI2 invalidate handler, compare it to
-     * 'last_timestamp' in order to find out if an invalidate event
-     * had occurred.
-     */
-    uint32_t stamp;
-
-    /*
-     * Last value of 'stamp'.
+     * Last value of 'base.native_drawable->stamp'.
      */
     uint32_t last_stamp;
 };
@@ -42,18 +35,18 @@ struct yagl_onscreen_surface
 struct yagl_onscreen_surface
     *yagl_onscreen_surface_create_window(struct yagl_display *dpy,
                                          yagl_host_handle host_config,
-                                         Window x_win,
-                                         const EGLint* attrib_list);
+                                         struct yagl_native_drawable *native_window,
+                                         const EGLint *attrib_list);
 
 struct yagl_onscreen_surface
     *yagl_onscreen_surface_create_pixmap(struct yagl_display *dpy,
                                          yagl_host_handle host_config,
-                                         Pixmap x_pixmap,
-                                         const EGLint* attrib_list);
+                                         struct yagl_native_drawable *native_pixmap,
+                                         const EGLint *attrib_list);
 
 struct yagl_onscreen_surface
     *yagl_onscreen_surface_create_pbuffer(struct yagl_display *dpy,
                                           yagl_host_handle host_config,
-                                          const EGLint* attrib_list);
+                                          const EGLint *attrib_list);
 
 #endif