Merge branch 'gallium-0.2' of git+ssh://marcheu@git.freedesktop.org/git/mesa/mesa into gallium-0.2

7 files changed, 14 insertions, 22 deletions

diff --git a/src/mesa/state_tracker/st_cb_fbo.c b/src/mesa/state_tracker/st_cb_fbo.c
index 0c69e16623..d18946de7d 100644
--- a/src/mesa/state_tracker/st_cb_fbo.c
+++ b/src/mesa/state_tracker/st_cb_fbo.c
@@ -42,7 +42,7 @@
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_inlines.h"
-#include "pipe/p_winsys.h"
+#include "pipe/p_screen.h"
 #include "st_context.h"
 #include "st_cb_fbo.h"
 #include "st_cb_texture.h"
diff --git a/src/mesa/state_tracker/st_cb_feedback.c b/src/mesa/state_tracker/st_cb_feedback.c
index 19021411cf..c7e8aa7cc5 100644
--- a/src/mesa/state_tracker/st_cb_feedback.c
+++ b/src/mesa/state_tracker/st_cb_feedback.c
@@ -52,7 +52,6 @@
 
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
-#include "pipe/p_winsys.h"
 #include "cso_cache/cso_cache.h"
 
 #include "draw/draw_context.h"
diff --git a/src/mesa/state_tracker/st_cb_flush.c b/src/mesa/state_tracker/st_cb_flush.c
index 072f2e92ad..f8621ab125 100644
--- a/src/mesa/state_tracker/st_cb_flush.c
+++ b/src/mesa/state_tracker/st_cb_flush.c
@@ -42,7 +42,7 @@
 #include "st_public.h"
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
-#include "pipe/p_winsys.h"
+#include "pipe/p_screen.h"
 #include "util/u_gen_mipmap.h"
 #include "util/u_blit.h"
 
@@ -55,7 +55,7 @@ is_front_buffer_dirty(struct st_context *st)
 
 
 /**
- * Tell the winsys to display the front color buffer on-screen.
+ * Tell the screen to display the front color buffer on-screen.
  */
 static void
 display_front_buffer(struct st_context *st)
@@ -67,7 +67,7 @@ display_front_buffer(struct st_context *st)
 
    /* Hook for copying "fake" frontbuffer if necessary:
     */
-   st->pipe->winsys->flush_frontbuffer( st->pipe->winsys, front_surf,
+   st->pipe->screen->flush_frontbuffer( st->pipe->screen, front_surf,
                                         st->pipe->priv );
 
    /*
@@ -103,8 +103,8 @@ void st_finish( struct st_context *st )
    st_flush(st, PIPE_FLUSH_RENDER_CACHE | PIPE_FLUSH_FRAME, &fence);
 
    if(fence) {
-      st->pipe->winsys->fence_finish(st->pipe->winsys, fence, 0);
-      st->pipe->winsys->fence_reference(st->pipe->winsys, &fence, NULL);
+      st->pipe->screen->fence_finish(st->pipe->screen, fence, 0);
+      st->pipe->screen->fence_reference(st->pipe->screen, &fence, NULL);
    }
 }
 
diff --git a/src/mesa/state_tracker/st_cb_strings.c b/src/mesa/state_tracker/st_cb_strings.c
index 09545aa8fb..2036ccafbf 100644
--- a/src/mesa/state_tracker/st_cb_strings.c
+++ b/src/mesa/state_tracker/st_cb_strings.c
@@ -36,7 +36,6 @@
 #include "main/version.h"
 #include "pipe/p_context.h"
 #include "pipe/p_screen.h"
-#include "pipe/p_winsys.h"
 #include "st_context.h"
 #include "st_cb_strings.h"
 
@@ -67,10 +66,9 @@ st_get_string(GLcontext * ctx, GLenum name)
    }
 
    case GL_RENDERER:
-      util_snprintf(st->renderer, sizeof(st->renderer), "Gallium %s, %s on %s", 
+      util_snprintf(st->renderer, sizeof(st->renderer), "Gallium %s on %s", 
                ST_VERSION_STRING,
-	       screen->get_name( screen ),
-	       screen->winsys->get_name( screen->winsys ));
+	       screen->get_name( screen ));
 
       return (GLubyte *) st->renderer;
 
diff --git a/src/mesa/state_tracker/wgl/stw_device.c b/src/mesa/state_tracker/wgl/stw_device.c
index 129b24ce77..4c2fb5c61b 100644
--- a/src/mesa/state_tracker/wgl/stw_device.c
+++ b/src/mesa/state_tracker/wgl/stw_device.c
@@ -28,7 +28,6 @@
 #include <windows.h>
 
 #include "pipe/p_debug.h"
-#include "pipe/p_winsys.h"
 #include "pipe/p_screen.h"
 
 #include "stw_device.h"
@@ -40,19 +39,18 @@ struct stw_device *stw_dev = NULL;
 
 
 /**
- * XXX: Dispatch pipe_winsys::flush_front_buffer to our 
+ * XXX: Dispatch pipe_screen::flush_front_buffer to our 
  * stw_winsys::flush_front_buffer.
  */
 static void 
-st_flush_frontbuffer(struct pipe_winsys *ws,
+st_flush_frontbuffer(struct pipe_screen *screen,
                      struct pipe_surface *surf,
                      void *context_private )
 {
    const struct stw_winsys *stw_winsys = stw_dev->stw_winsys;
-   struct pipe_winsys *winsys = stw_dev->screen->winsys;
    HDC hdc = (HDC)context_private;
    
-   stw_winsys->flush_frontbuffer(winsys, surf, hdc);
+   stw_winsys->flush_frontbuffer(screen, surf, hdc);
 }
 
 
@@ -72,8 +70,7 @@ st_init(const struct stw_winsys *stw_winsys)
    if(!stw_dev->screen)
       goto error1;
 
-   /* XXX: pipe_winsys::flush_frontbuffer should go away */
-   stw_dev->screen->winsys->flush_frontbuffer = st_flush_frontbuffer;
+   stw_dev->screen->flush_frontbuffer = st_flush_frontbuffer;
    
    pixelformat_init();
 
diff --git a/src/mesa/state_tracker/wgl/stw_wgl_swapbuffers.c b/src/mesa/state_tracker/wgl/stw_wgl_swapbuffers.c
index 002bcc64e7..41bfeadfb1 100644
--- a/src/mesa/state_tracker/wgl/stw_wgl_swapbuffers.c
+++ b/src/mesa/state_tracker/wgl/stw_wgl_swapbuffers.c
@@ -27,7 +27,6 @@
 
 #include <windows.h>
 
-#include "pipe/p_winsys.h"
 #include "pipe/p_screen.h"
 #include "pipe/p_context.h"
 #include "state_tracker/st_context.h"
@@ -55,7 +54,7 @@ wglSwapBuffers(
 
    st_get_framebuffer_surface( fb->stfb, ST_SURFACE_BACK_LEFT, &surf );
 
-   stw_dev->stw_winsys->flush_frontbuffer(stw_dev->screen->winsys,
+   stw_dev->stw_winsys->flush_frontbuffer(stw_dev->screen,
                                           surf,
                                           hdc );
 
diff --git a/src/mesa/state_tracker/wgl/stw_winsys.h b/src/mesa/state_tracker/wgl/stw_winsys.h
index 8557327ccd..a85a9a2257 100644
--- a/src/mesa/state_tracker/wgl/stw_winsys.h
+++ b/src/mesa/state_tracker/wgl/stw_winsys.h
@@ -34,7 +34,6 @@
 
 struct pipe_screen;
 struct pipe_context;
-struct pipe_winsys;
 struct pipe_surface;
 
 struct stw_winsys
@@ -46,7 +45,7 @@ struct stw_winsys
    (*create_context)( struct pipe_screen *screen );
 
    void
-   (*flush_frontbuffer)( struct pipe_winsys *winsys,
+   (*flush_frontbuffer)( struct pipe_screen *screen,
                          struct pipe_surface *surf,
                          HDC hDC );
 };