Eliminate struct pipe_region.

Directly use struct pipe_buffer_handle for storage and struct pipe_surface for
(un)mapping.

1 files changed, 15 insertions, 13 deletions

diff --git a/src/mesa/pipe/softpipe/sp_state_surface.c b/src/mesa/pipe/softpipe/sp_state_surface.c
index d4e0bd1e15..9470ef485f 100644
--- a/src/mesa/pipe/softpipe/sp_state_surface.c
+++ b/src/mesa/pipe/softpipe/sp_state_surface.c
@@ -27,6 +27,8 @@
 
 /* Authors:  Keith Whitwell <keith@tungstengraphics.com>
  */
+#include "p_inlines.h"
+
 #include "sp_context.h"
 #include "sp_state.h"
 #include "sp_surface.h"
@@ -54,17 +56,17 @@ softpipe_set_framebuffer_state(struct pipe_context *pipe,
          sp_flush_tile_cache(sp, sp->cbuf_cache[i]);
          /* unmap old */
          ps = sp->framebuffer.cbufs[i];
-         if (ps && ps->region)
-            pipe->region_unmap(pipe, ps->region);
+         if (ps && ps->map)
+            pipe_surface_unmap(ps);
          /* map new */
          ps = fb->cbufs[i];
          if (ps)
-            pipe->region_map(pipe, ps->region);
+            pipe_surface_map(ps);
          /* assign new */
          sp->framebuffer.cbufs[i] = fb->cbufs[i];
 
          /* update cache */
-         sp_tile_cache_set_surface(sp->cbuf_cache[i], ps);
+         sp_tile_cache_set_surface(sp, sp->cbuf_cache[i], ps);
       }
    }
 
@@ -76,8 +78,8 @@ softpipe_set_framebuffer_state(struct pipe_context *pipe,
       sp_flush_tile_cache(sp, sp->zbuf_cache);
       /* unmap old */
       ps = sp->framebuffer.zbuf;
-      if (ps && ps->region)
-         pipe->region_unmap(pipe, ps->region);
+      if (ps && ps->map)
+         pipe_surface_unmap(ps);
       if (sp->framebuffer.sbuf == sp->framebuffer.zbuf) {
          /* combined z/stencil */
          sp->framebuffer.sbuf = NULL;
@@ -85,12 +87,12 @@ softpipe_set_framebuffer_state(struct pipe_context *pipe,
       /* map new */
       ps = fb->zbuf;
       if (ps)
-         pipe->region_map(pipe, ps->region);
+         pipe_surface_map(ps);
       /* assign new */
       sp->framebuffer.zbuf = fb->zbuf;
 
       /* update cache */
-      sp_tile_cache_set_surface(sp->zbuf_cache, ps);
+      sp_tile_cache_set_surface(sp, sp->zbuf_cache, ps);
    }
 
    /* XXX combined depth/stencil here */
@@ -101,12 +103,12 @@ softpipe_set_framebuffer_state(struct pipe_context *pipe,
       sp_flush_tile_cache(sp, sp->sbuf_cache_sep);
       /* unmap old */
       ps = sp->framebuffer.sbuf;
-      if (ps && ps->region)
-         pipe->region_unmap(pipe, ps->region);
+      if (ps && ps->map)
+         pipe_surface_unmap(ps);
       /* map new */
       ps = fb->sbuf;
       if (ps && fb->sbuf != fb->zbuf)
-         pipe->region_map(pipe, ps->region);
+         pipe_surface_map(ps);
       /* assign new */
       sp->framebuffer.sbuf = fb->sbuf;
 
@@ -114,12 +116,12 @@ softpipe_set_framebuffer_state(struct pipe_context *pipe,
       if (fb->sbuf != fb->zbuf) {
          /* separate stencil buf */
          sp->sbuf_cache = sp->sbuf_cache_sep;
-         sp_tile_cache_set_surface(sp->sbuf_cache, ps);
+         sp_tile_cache_set_surface(sp, sp->sbuf_cache, ps);
       }
       else {
          /* combined depth/stencil */
          sp->sbuf_cache = sp->zbuf_cache;
-         sp_tile_cache_set_surface(sp->sbuf_cache, ps);
+         sp_tile_cache_set_surface(sp, sp->sbuf_cache, ps);
       }
    }