surface_alloc() is now a winsys function.

This allows surfaces to be allocated without a rendering context.
A few loose ends to resolve, but in working condition.

5 files changed, 135 insertions, 49 deletions

diff --git a/src/mesa/drivers/dri/intel_winsys/intel_winsys_pipe.c b/src/mesa/drivers/dri/intel_winsys/intel_winsys_pipe.c
index 6f244e11001..4569b1e3bf6 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_winsys_pipe.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_winsys_pipe.c
@@ -253,6 +253,18 @@ intel_i915_region_release(struct pipe_winsys *winsys,
 }
 
 
+static struct pipe_surface *
+intel_i915_surface_alloc(struct pipe_winsys *winsys, unsigned format)
+{
+   struct pipe_surface *surf = CALLOC_STRUCT(pipe_surface);
+   if (surf) {
+      surf->format = format;
+      surf->refcount = 1;
+   }
+   return surf;
+}
+
+
 static void
 intel_printf( struct pipe_winsys *sws, const char *fmtString, ... )
 {
@@ -298,5 +310,7 @@ intel_create_pipe_winsys( struct intel_context *intel )
    iws->winsys.region_alloc = intel_i915_region_alloc;
    iws->winsys.region_release = intel_i915_region_release;
 
+   iws->winsys.surface_alloc = intel_i915_surface_alloc;
+
    return &iws->winsys;
 }
diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c
index 187663e66ca..1d2b93d100b 100644
--- a/src/mesa/drivers/x11/xm_api.c
+++ b/src/mesa/drivers/x11/xm_api.c
@@ -1610,8 +1610,15 @@ XMesaContext XMesaCreateContext( XMesaVisual v, XMesaContext share_list )
    st_create_context( mesaCtx,
                       xmesa_create_softpipe( c ) );
 
+   /* override these functions, as if the xlib driver were derived from
+    * the softpipe driver.
+    */
+#if 0
    mesaCtx->st->pipe->surface_alloc = xmesa_surface_alloc;
+#endif
    mesaCtx->st->pipe->supported_formats = xmesa_supported_formats;
+   mesaCtx->st->pipe->get_tile_rgba = xmesa_get_tile_rgba;
+   mesaCtx->st->pipe->put_tile_rgba = xmesa_put_tile_rgba;
 
    mesaCtx->st->haveFramebufferRegions = GL_FALSE;
 
diff --git a/src/mesa/drivers/x11/xm_surface.c b/src/mesa/drivers/x11/xm_surface.c
index 337033f8ad6..3655a55e4ec 100644
--- a/src/mesa/drivers/x11/xm_surface.c
+++ b/src/mesa/drivers/x11/xm_surface.c
@@ -48,6 +48,7 @@
 #include "pipe/softpipe/sp_context.h"
 #include "pipe/softpipe/sp_clear.h"
 #include "pipe/softpipe/sp_tile_cache.h"
+#include "pipe/softpipe/sp_surface.h"
 #include "state_tracker/st_context.h"
 
 
@@ -67,6 +68,13 @@ xmesa_surf(struct softpipe_surface *sps)
 }
 
 
+static INLINE struct xmesa_surface *
+xmesa_surface(struct pipe_surface *ps)
+{
+   return (struct xmesa_surface *) ps;
+}
+
+
 static INLINE struct xmesa_renderbuffer *
 xmesa_rb(struct softpipe_surface *sps)
 {
@@ -78,53 +86,71 @@ xmesa_rb(struct softpipe_surface *sps)
 #define FLIP(Y) Y = xrb->St.Base.Height - (Y) - 1;
 
 
-static void
-get_tile(struct pipe_surface *ps,
-         uint x, uint y, uint w, uint h, float *p)
+void
+xmesa_get_tile_rgba(struct pipe_context *pipe, struct pipe_surface *ps,
+                    uint x, uint y, uint w, uint h, float *p)
 {
-   struct xmesa_renderbuffer *xrb = xmesa_rb((struct softpipe_surface *) ps);
-   GLubyte tmp[MAX_WIDTH * 4];
-   GLuint i, j;
-   uint w0 = w;
-   GET_CURRENT_CONTEXT(ctx);
-
-   CLIP_TILE;
-
-   FLIP(y);
-   for (i = 0; i < h; i++) {
-      xrb->St.Base.GetRow(ctx, &xrb->St.Base, w, x, y - i, tmp);
-      for (j = 0; j < w * 4; j++) {
-         p[j] = UBYTE_TO_FLOAT(tmp[j]);
+   struct xmesa_surface *xms = xmesa_surface(ps);
+   struct xmesa_renderbuffer *xrb = xms->xrb;
+
+   if (xrb) {
+      /* this is a front/back color buffer */
+      GLubyte tmp[MAX_WIDTH * 4];
+      GLuint i, j;
+      uint w0 = w;
+      GET_CURRENT_CONTEXT(ctx);
+
+      CLIP_TILE;
+
+      FLIP(y);
+      for (i = 0; i < h; i++) {
+         xrb->St.Base.GetRow(ctx, &xrb->St.Base, w, x, y - i, tmp);
+         for (j = 0; j < w * 4; j++) {
+            p[j] = UBYTE_TO_FLOAT(tmp[j]);
+         }
+         p += w0 * 4;
       }
-      p += w0 * 4;
+   }
+   else {
+      /* other softpipe surface */
+      softpipe_get_tile_rgba(pipe, ps, x, y, w, h, p);
    }
 }
 
 
-static void
-put_tile(struct pipe_surface *ps,
-         uint x, uint y, uint w, uint h, const float *p)
+void
+xmesa_put_tile_rgba(struct pipe_context *pipe, struct pipe_surface *ps,
+                    uint x, uint y, uint w, uint h, const float *p)
 {
-   struct xmesa_renderbuffer *xrb = xmesa_rb((struct softpipe_surface *) ps);
-   GLubyte tmp[MAX_WIDTH * 4];
-   GLuint i, j;
-   uint w0 = w;
-   GET_CURRENT_CONTEXT(ctx);
-   CLIP_TILE;
-   FLIP(y);
-   for (i = 0; i < h; i++) {
-      for (j = 0; j < w * 4; j++) {
-         UNCLAMPED_FLOAT_TO_UBYTE(tmp[j], p[j]);
+   struct xmesa_surface *xms = xmesa_surface(ps);
+   struct xmesa_renderbuffer *xrb = xms->xrb;
+
+   if (xrb) {
+      /* this is a front/back color buffer */
+      GLubyte tmp[MAX_WIDTH * 4];
+      GLuint i, j;
+      uint w0 = w;
+      GET_CURRENT_CONTEXT(ctx);
+      CLIP_TILE;
+      FLIP(y);
+      for (i = 0; i < h; i++) {
+         for (j = 0; j < w * 4; j++) {
+            UNCLAMPED_FLOAT_TO_UBYTE(tmp[j], p[j]);
+         }
+         xrb->St.Base.PutRow(ctx, &xrb->St.Base, w, x, y - i, tmp, NULL);
+         p += w0 * 4;
       }
-      xrb->St.Base.PutRow(ctx, &xrb->St.Base, w, x, y - i, tmp, NULL);
-      p += w0 * 4;
-   }
 #if 0 /* debug: flush */
-   {
-      XMesaContext xm = XMESA_CONTEXT(ctx);
-      XSync(xm->display, 0);
-   }
+      {
+         XMesaContext xm = XMESA_CONTEXT(ctx);
+         XSync(xm->display, 0);
+      }
 #endif
+   }
+   else {
+      /* other softpipe surface */
+      softpipe_put_tile_rgba(pipe, ps, x, y, w, h, p);
+   }
 }
 
 
@@ -141,12 +167,15 @@ xmesa_new_color_surface(struct pipe_context *pipe, GLuint pipeFormat)
 
    assert(pipeFormat);
 
-   xms->surface.surface.format = pipeFormat;
-   xms->surface.surface.refcount = 1;
+   xms->surface.format = pipeFormat;
+   xms->surface.refcount = 1;
 
+#if 0
    /* some of the functions plugged in by this call will get overridden */
    softpipe_init_surface_funcs(&xms->surface);
+#endif
 
+#if 0
    switch (pipeFormat) {
    case PIPE_FORMAT_U_A8_R8_G8_B8:
       xms->surface.get_tile = get_tile;
@@ -157,6 +186,7 @@ xmesa_new_color_surface(struct pipe_context *pipe, GLuint pipeFormat)
    default:
       abort();
    }
+#endif
 
    /* Note, the region we allocate doesn't actually have any storage
     * since we're drawing into an XImage or Pixmap.
@@ -164,10 +194,10 @@ xmesa_new_color_surface(struct pipe_context *pipe, GLuint pipeFormat)
     * functions.
     */
    if (pipe)
-      xms->surface.surface.region = pipe->winsys->region_alloc(pipe->winsys,
-                                                               1, 0, 0, 0x0);
+      xms->surface.region = pipe->winsys->region_alloc(pipe->winsys,
+                                                       1, 0, 0, 0x0);
 
-   return &xms->surface.surface;
+   return &xms->surface;
 }
 
 
@@ -183,14 +213,15 @@ xmesa_surface_alloc(struct pipe_context *pipe, GLuint pipeFormat)
    assert(pipe);
    assert(pipeFormat);
 
-   xms->surface.surface.format = pipeFormat;
-   xms->surface.surface.refcount = 1;
+   xms->surface.format = pipeFormat;
+   xms->surface.refcount = 1;
+#if 0
    /*
     * This is really just a softpipe surface, not an XImage/Pixmap surface.
     */
    softpipe_init_surface_funcs(&xms->surface);
-
-   return &xms->surface.surface;
+#endif
+   return &xms->surface;
 }
 
 
diff --git a/src/mesa/drivers/x11/xm_winsys.c b/src/mesa/drivers/x11/xm_winsys.c
index 624d28dd018..36805437f01 100644
--- a/src/mesa/drivers/x11/xm_winsys.c
+++ b/src/mesa/drivers/x11/xm_winsys.c
@@ -289,6 +289,31 @@ xm_region_release(struct pipe_winsys *winsys, struct pipe_region **region)
 }
 
 
+/**
+ * Called via pipe->surface_alloc() to create new surfaces (textures,
+ * renderbuffers, etc.
+ */
+static struct pipe_surface *
+xm_surface_alloc(struct pipe_winsys *ws, GLuint pipeFormat)
+{
+   struct xmesa_surface *xms = CALLOC_STRUCT(xmesa_surface);
+
+   assert(ws);
+   assert(pipeFormat);
+
+   xms->surface.format = pipeFormat;
+   xms->surface.refcount = 1;
+#if 0
+   /*
+    * This is really just a softpipe surface, not an XImage/Pixmap surface.
+    */
+   softpipe_init_surface_funcs(&xms->surface);
+#endif
+   return &xms->surface;
+}
+
+
+
 
 struct xmesa_pipe_winsys
 {
@@ -320,6 +345,8 @@ xmesa_create_pipe_winsys( XMesaContext xmesa )
    xws->winsys.region_alloc = xm_region_alloc;
    xws->winsys.region_release = xm_region_release;
 
+   xws->winsys.surface_alloc = xm_surface_alloc;
+
    xws->winsys.flush_frontbuffer = xm_flush_frontbuffer;
    xws->winsys.wait_idle = xm_wait_idle;
    xws->winsys.printf = xm_printf;
diff --git a/src/mesa/drivers/x11/xmesaP.h b/src/mesa/drivers/x11/xmesaP.h
index 9cbe8670f92..8af95504fb6 100644
--- a/src/mesa/drivers/x11/xmesaP.h
+++ b/src/mesa/drivers/x11/xmesaP.h
@@ -598,7 +598,7 @@ struct pipe_context;
 
 struct xmesa_surface
 {
-   struct softpipe_surface surface;
+   struct pipe_surface surface;
    struct xmesa_renderbuffer *xrb;
 };
 
@@ -618,8 +618,15 @@ xmesa_surface_alloc(struct pipe_context *pipe, GLuint format);
 extern struct pipe_surface *
 xmesa_new_color_surface(struct pipe_context *pipe, GLuint format);
 
-extern const GLuint *
-xmesa_supported_formats(struct pipe_context *pipe, GLuint *numFormats);
+extern const uint *
+xmesa_supported_formats(struct pipe_context *pipe, uint *numFormats);
 
+extern void
+xmesa_get_tile_rgba(struct pipe_context *pipe, struct pipe_surface *ps,
+                    uint x, uint y, uint w, uint h, float *p);
+
+extern void
+xmesa_put_tile_rgba(struct pipe_context *pipe, struct pipe_surface *ps,
+                    uint x, uint y, uint w, uint h, const float *p);
 
 #endif