Redesign pipe_surface in terms of pipe_region.

struct pipe_buffer goes away.
Added basic region functions to softpipe to allocate/release malloc'd regions.
Surface-related code is fairly coherent now.

1 files changed, 8 insertions, 5 deletions

diff --git a/src/mesa/drivers/x11/xm_buffer.c b/src/mesa/drivers/x11/xm_buffer.c
index 8fbd9a783b..5bba52da48 100644
--- a/src/mesa/drivers/x11/xm_buffer.c
+++ b/src/mesa/drivers/x11/xm_buffer.c
@@ -269,7 +269,10 @@ xmesa_alloc_front_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
    rb->Height = height;
    rb->InternalFormat = internalFormat;
 
-   rb->surface->resize(rb->surface, width, height);
+   if (!xrb->Base.surface)
+      xrb->Base.surface = xmesa_new_surface(ctx, xrb);
+   xrb->Base.surface->width = width;
+   xrb->Base.surface->height = height;
 
    return GL_TRUE;
 }
@@ -320,7 +323,10 @@ xmesa_alloc_back_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
       xrb->origin4 = NULL;
    }
 
-   rb->surface->resize(rb->surface, width, height);
+   if (!xrb->Base.surface)
+      xrb->Base.surface = xmesa_new_surface(ctx, xrb);
+   xrb->Base.surface->width = width;
+   xrb->Base.surface->height = height;
 
    return GL_TRUE;
 }
@@ -357,9 +363,6 @@ xmesa_new_renderbuffer(GLcontext *ctx, GLuint name, const GLvisual *visual,
          xrb->Base.IndexBits = visual->indexBits;
       }
       /* only need to set Red/Green/EtcBits fields for user-created RBs */
-
-      xrb->Base.surface = xmesa_new_surface(xrb);
-
    }
    return xrb;
 }