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.

1 files changed, 14 insertions, 1 deletions

diff --git a/src/mesa/pipe/softpipe/sp_surface.h b/src/mesa/pipe/softpipe/sp_surface.h
index af6533d4f0..359a438c86 100644
--- a/src/mesa/pipe/softpipe/sp_surface.h
+++ b/src/mesa/pipe/softpipe/sp_surface.h
@@ -46,14 +46,15 @@ struct softpipe_tile_cache;
 struct softpipe_surface {
    struct pipe_surface surface;
 
+#if 0
    /* XXX these are temporary here */
    void (*get_tile)(struct pipe_surface *ps,
                     uint x, uint y, uint w, uint h, float *p);
    void (*put_tile)(struct pipe_surface *ps,
                     uint x, uint y, uint w, uint h, const float *p);
+#endif
 };
 
-
 extern struct pipe_surface *
 softpipe_get_tex_surface(struct pipe_context *pipe,
                          struct pipe_mipmap_tree *mt,
@@ -61,6 +62,18 @@ softpipe_get_tex_surface(struct pipe_context *pipe,
 
 
 extern void
+softpipe_get_tile_rgba(struct pipe_context *pipe,
+                       struct pipe_surface *ps,
+                       uint x, uint y, uint w, uint h,
+                       float *p);
+
+extern void
+softpipe_put_tile_rgba(struct pipe_context *pipe,
+                       struct pipe_surface *ps,
+                       uint x, uint y, uint w, uint h,
+                       const float *p);
+
+extern void
 softpipe_init_surface_funcs(struct softpipe_surface *sps);