1 files changed, 252 insertions, 112 deletions

diff --git a/src/mesa/pipe/softpipe/sp_tile_cache.c b/src/mesa/pipe/softpipe/sp_tile_cache.c
index ea0c8b8f91..fadd169f5d 100644
--- a/src/mesa/pipe/softpipe/sp_tile_cache.c
+++ b/src/mesa/pipe/softpipe/sp_tile_cache.c
@@ -38,9 +38,7 @@
 #include "sp_surface.h"
 #include "sp_tile_cache.h"
 
-#define CLEAR_OPTIMIZATION 0
-
-#define NUM_ENTRIES 20
+#define NUM_ENTRIES 30
 
 
 /** XXX move these */
@@ -51,10 +49,15 @@
 struct softpipe_tile_cache
 {
    struct pipe_surface *surface;  /**< the surface we're caching */
-   struct pipe_mipmap_tree *texture;  /**< if caching a texture */
+   struct pipe_texture *texture;  /**< if caching a texture */
    struct softpipe_cached_tile entries[NUM_ENTRIES];
    uint clear_flags[(MAX_WIDTH / TILE_SIZE) * (MAX_HEIGHT / TILE_SIZE) / 32];
-   float clear_value[4];
+   float clear_color[4];
+   uint clear_val;
+   boolean depth_stencil; /** Is the surface a depth/stencil format? */
+
+   struct pipe_surface *tex_surf;
+   int tex_face, tex_level, tex_z;
 };
 
 
@@ -69,7 +72,10 @@ struct softpipe_tile_cache
 
 
 
-static uint
+/**
+ * Is the tile at (x,y) in cleared state?
+ */
+static INLINE uint
 is_clear_flag_set(const uint *bitvec, int x, int y)
 {
    int pos, bit;
@@ -82,7 +88,10 @@ is_clear_flag_set(const uint *bitvec, int x, int y)
 }
    
 
-static void
+/**
+ * Mark the tile at (x,y) as not cleared.
+ */
+static INLINE void
 clear_clear_flag(uint *bitvec, int x, int y)
 {
    int pos;
@@ -122,14 +131,37 @@ sp_destroy_tile_cache(struct softpipe_tile_cache *tc)
 }
 
 
+/**
+ * Specify the surface to cache.
+ */
 void
 sp_tile_cache_set_surface(struct softpipe_tile_cache *tc,
                           struct pipe_surface *ps)
 {
+   assert(!tc->texture);
+
+   if (tc->surface && tc->surface->map) {
+      assert(tc->surface != ps);
+      pipe_surface_unmap(tc->surface);
+   }
+
    pipe_surface_reference(&tc->surface, ps);
+
+   if (!ps->map)
+      pipe_surface_map(ps);
+
+   if (ps) {
+      tc->depth_stencil = (ps->format == PIPE_FORMAT_S8Z24_UNORM ||
+                           ps->format == PIPE_FORMAT_Z16_UNORM ||
+                           ps->format == PIPE_FORMAT_Z32_UNORM ||
+                           ps->format == PIPE_FORMAT_U_S8);
+   }
 }
 
 
+/**
+ * Return the surface being cached.
+ */
 struct pipe_surface *
 sp_tile_cache_get_surface(struct softpipe_tile_cache *tc)
 {
@@ -137,44 +169,165 @@ sp_tile_cache_get_surface(struct softpipe_tile_cache *tc)
 }
 
 
+/**
+ * Specify the texture to cache.
+ */
 void
 sp_tile_cache_set_texture(struct softpipe_tile_cache *tc,
-                          struct pipe_mipmap_tree *texture)
+                          struct pipe_texture *texture)
 {
    uint i;
 
+   assert(!tc->surface);
+
    tc->texture = texture;
 
+   if (tc->tex_surf && tc->tex_surf->map)
+      pipe_surface_unmap(tc->tex_surf);
+   pipe_surface_reference(&tc->tex_surf, NULL);
+
    /* mark as entries as invalid/empty */
    /* XXX we should try to avoid this when the teximage hasn't changed */
    for (i = 0; i < NUM_ENTRIES; i++) {
       tc->entries[i].x = -1;
    }
+
+   tc->tex_face = -1; /* any invalid value here */
+}
+
+
+/**
+ * Set pixels in a tile to the given clear color/value, float.
+ */
+static void
+clear_tile_rgba(struct softpipe_cached_tile *tile,
+                enum pipe_format format,
+                const float clear_value[4])
+{
+   if (clear_value[0] == 0.0 &&
+       clear_value[1] == 0.0 &&
+       clear_value[2] == 0.0 &&
+       clear_value[3] == 0.0) {
+      memset(tile->data.color, 0, sizeof(tile->data.color));
+   }
+   else {
+      uint i, j;
+      for (i = 0; i < TILE_SIZE; i++) {
+         for (j = 0; j < TILE_SIZE; j++) {
+            tile->data.color[i][j][0] = clear_value[0];
+            tile->data.color[i][j][1] = clear_value[1];
+            tile->data.color[i][j][2] = clear_value[2];
+            tile->data.color[i][j][3] = clear_value[3];
+         }
+      }
+   }
+}
+
+
+/**
+ * Set a tile to a solid value/color.
+ */
+static void
+clear_tile(struct softpipe_cached_tile *tile,
+           enum pipe_format format,
+           uint clear_value)
+{
+   uint i, j;
+
+   switch (format) {
+   case PIPE_FORMAT_U_S8:
+      /* 8 bpp */
+      memset(tile->data.any, 0, TILE_SIZE * TILE_SIZE);
+      break;
+   case PIPE_FORMAT_Z16_UNORM:
+      /* 16 bpp */
+      if (clear_value == 0) {
+         memset(tile->data.any, 0, 2 * TILE_SIZE * TILE_SIZE);
+      }
+      else {
+         for (i = 0; i < TILE_SIZE; i++) {
+            for (j = 0; j < TILE_SIZE; j++) {
+               tile->data.depth16[i][j] = clear_value;
+            }
+         }
+      }
+      break;
+   default:
+      /* 32 bpp */
+      if (clear_value == 0) {
+         memset(tile->data.any, 0, 4 * TILE_SIZE * TILE_SIZE);
+      }
+      else {
+         for (i = 0; i < TILE_SIZE; i++) {
+            for (j = 0; j < TILE_SIZE; j++) {
+               tile->data.color32[i][j] = clear_value;
+            }
+         }
+      }
+   }
+}
+
+
+/**
+ * Actually clear the tiles which were flagged as being in a clear state.
+ */
+static void
+sp_tile_cache_flush_clear(struct pipe_context *pipe,
+                          struct softpipe_tile_cache *tc)
+{
+   struct pipe_surface *ps = tc->surface;
+   const uint w = tc->surface->width;
+   const uint h = tc->surface->height;
+   uint x, y;
+   struct softpipe_cached_tile tile;
+   uint numCleared = 0;
+
+   /* clear one tile to the clear value */
+   clear_tile(&tile, ps->format, tc->clear_val);
+
+   /* push the tile to all positions marked as clear */
+   for (y = 0; y < h; y += TILE_SIZE) {
+      for (x = 0; x < w; x += TILE_SIZE) {
+         if (is_clear_flag_set(tc->clear_flags, x, y)) {
+            pipe->put_tile(pipe, ps,
+                           x, y, TILE_SIZE, TILE_SIZE,
+                           tile.data.color32, 0/*STRIDE*/);
+
+            /* do this? */
+            clear_clear_flag(tc->clear_flags, x, y);
+
+            numCleared++;
+         }
+      }
+   }
+#if 0
+   printf("num cleared: %u\n", numCleared);
+#endif
 }
 
 
+/**
+ * Flush the tile cache: write all dirty tiles back to the surface.
+ * any tiles "flagged" as cleared will be "really" cleared.
+ */
 void
 sp_flush_tile_cache(struct softpipe_context *softpipe,
                     struct softpipe_tile_cache *tc)
 {
    struct pipe_context *pipe = &softpipe->pipe;
    struct pipe_surface *ps = tc->surface;
-   boolean is_depth_stencil;
    int inuse = 0, pos;
 
-   if (!ps || !ps->region || !ps->region->map)
+   if (!ps || !ps->buffer)
       return;
 
-   is_depth_stencil = (ps->format == PIPE_FORMAT_S8_Z24 ||
-                       ps->format == PIPE_FORMAT_Z24_S8 ||
-                       ps->format == PIPE_FORMAT_U_Z16 ||
-                       ps->format == PIPE_FORMAT_U_Z32 ||
-                       ps->format == PIPE_FORMAT_U_S8);
+   if (!ps->map)
+      pipe_surface_map(ps);
 
    for (pos = 0; pos < NUM_ENTRIES; pos++) {
       struct softpipe_cached_tile *tile = tc->entries + pos;
       if (tile->x >= 0) {
-         if (is_depth_stencil) {
+         if (tc->depth_stencil) {
             pipe->put_tile(pipe, ps,
                            tile->x, tile->y, TILE_SIZE, TILE_SIZE,
                            tile->data.depth32, 0/*STRIDE*/);
@@ -184,30 +337,31 @@ sp_flush_tile_cache(struct softpipe_context *softpipe,
                                 tile->x, tile->y, TILE_SIZE, TILE_SIZE,
                                 (float *) tile->data.color);
          }
-
          tile->x = tile->y = -1;  /* mark as empty */
          inuse++;
       }
    }
 
-   /*
+#if TILE_CLEAR_OPTIMIZATION
+   sp_tile_cache_flush_clear(&softpipe->pipe, tc);
+#endif
+
+#if 0
    printf("flushed tiles in use: %d\n", inuse);
-   */
+#endif
 }
 
 
+/**
+ * Get a tile from the cache.
+ * \param x, y  position of tile, in pixels
+ */
 struct softpipe_cached_tile *
 sp_get_cached_tile(struct softpipe_context *softpipe,
                    struct softpipe_tile_cache *tc, int x, int y)
 {
    struct pipe_context *pipe = &softpipe->pipe;
    struct pipe_surface *ps = tc->surface;
-   boolean is_depth_stencil
-      = (ps->format == PIPE_FORMAT_S8_Z24 ||
-         ps->format == PIPE_FORMAT_Z24_S8 ||
-         ps->format == PIPE_FORMAT_U_Z16 ||
-         ps->format == PIPE_FORMAT_U_Z32 ||
-         ps->format == PIPE_FORMAT_U_S8);
 
    /* tile pos in framebuffer: */
    const int tile_x = x & ~(TILE_SIZE - 1);
@@ -222,10 +376,10 @@ sp_get_cached_tile(struct softpipe_context *softpipe,
 
       if (tile->x != -1) {
          /* put dirty tile back in framebuffer */
-         if (is_depth_stencil) {
+         if (tc->depth_stencil) {
             pipe->put_tile(pipe, ps,
                            tile->x, tile->y, TILE_SIZE, TILE_SIZE,
-                           tile->data.depth32, 0 /*STRIDE*/);
+                           tile->data.depth32, 0/*STRIDE*/);
          }
          else {
             pipe->put_tile_rgba(pipe, ps,
@@ -234,92 +388,32 @@ sp_get_cached_tile(struct softpipe_context *softpipe,
          }
       }
 
+      tile->x = tile_x;
+      tile->y = tile_y;
+
       if (is_clear_flag_set(tc->clear_flags, x, y)) {
          /* don't get tile from framebuffer, just clear it */
-         uint i, j;
-         /* XXX these loops could be optimized */
-         switch (ps->format) {
-         case PIPE_FORMAT_U_Z16:
-            {
-               ushort clear_val = (ushort) (tc->clear_value[0] * 0xffff);
-               for (i = 0; i < TILE_SIZE; i++) {
-                  for (j = 0; j < TILE_SIZE; j++) {
-                     tile->data.depth16[i][j] = clear_val;
-                  }
-               }
-            }
-            break;
-         case PIPE_FORMAT_U_Z32:
-            {
-               uint clear_val = (uint) (tc->clear_value[0] * 0xffffffff);
-               for (i = 0; i < TILE_SIZE; i++) {
-                  for (j = 0; j < TILE_SIZE; j++) {
-                     tile->data.depth32[i][j] = clear_val;
-                  }
-               }
-            }
-            break;
-         case PIPE_FORMAT_S8_Z24:
-            {
-               uint clear_val = (uint) (tc->clear_value[0] * 0xffffff);
-               clear_val |= ((uint) tc->clear_value[1]) << 24;
-               for (i = 0; i < TILE_SIZE; i++) {
-                  for (j = 0; j < TILE_SIZE; j++) {
-                     tile->data.depth32[i][j] = clear_val;
-                  }
-               }
-            }
-            break;
-         case PIPE_FORMAT_Z24_S8:
-            {
-               uint clear_val = ((uint) (tc->clear_value[0] * 0xffffff)) << 8;
-               clear_val |= ((uint) tc->clear_value[1]) & 0xff;
-               for (i = 0; i < TILE_SIZE; i++) {
-                  for (j = 0; j < TILE_SIZE; j++) {
-                     tile->data.depth32[i][j] = clear_val;
-                  }
-               }
-            }
-            break;
-         case PIPE_FORMAT_U_S8:
-            {
-               ubyte clear_val = (uint) tc->clear_value[0];
-               for (i = 0; i < TILE_SIZE; i++) {
-                  for (j = 0; j < TILE_SIZE; j++) {
-                     tile->data.stencil8[i][j] = clear_val;
-                  }
-               }
-            }
-            break;
-         default:
-            /* color */
-            for (i = 0; i < TILE_SIZE; i++) {
-               for (j = 0; j < TILE_SIZE; j++) {
-                  tile->data.color[i][j][0] = tc->clear_value[0];
-                  tile->data.color[i][j][1] = tc->clear_value[1];
-                  tile->data.color[i][j][2] = tc->clear_value[2];
-                  tile->data.color[i][j][3] = tc->clear_value[3];
-               }
-            }
+         if (tc->depth_stencil) {
+            clear_tile(tile, ps->format, tc->clear_val);
+         }
+         else {
+            clear_tile_rgba(tile, ps->format, tc->clear_color);
          }
          clear_clear_flag(tc->clear_flags, x, y);
       }
       else {
-         /* get new tile from framebuffer */
-         if (is_depth_stencil) {
+         /* get new tile data from surface */
+         if (tc->depth_stencil) {
             pipe->get_tile(pipe, ps,
-                           tile_x, tile_y, TILE_SIZE, TILE_SIZE,
+                           tile->x, tile->y, TILE_SIZE, TILE_SIZE,
                            tile->data.depth32, 0/*STRIDE*/);
          }
          else {
             pipe->get_tile_rgba(pipe, ps,
-                                tile_x, tile_y, TILE_SIZE, TILE_SIZE,
+                                tile->x, tile->y, TILE_SIZE, TILE_SIZE,
                                 (float *) tile->data.color);
          }
       }
-
-      tile->x = tile_x;
-      tile->y = tile_y;
    }
 
    return tile;
@@ -363,16 +457,33 @@ sp_get_cached_tile_tex(struct pipe_context *pipe,
        z != tile->z ||
        face != tile->face ||
        level != tile->level) {
-      /* XXX this call is a bit heavier than we'd like: */
-      struct pipe_surface *ps
-         = pipe->get_tex_surface(pipe, tc->texture, face, level, z);
+      /* cache miss */
 
-      pipe->get_tile_rgba(pipe, ps,
-                          tile_x, tile_y, TILE_SIZE, TILE_SIZE,
-                          (float *) tile->data.color);
+      /* check if we need to get a new surface */
+      if (!tc->tex_surf ||
+          tc->tex_face != face ||
+          tc->tex_level != level ||
+          tc->tex_z != z) {
+         /* get new surface (view into texture) */
+         struct pipe_surface *ps;
+
+         if (tc->tex_surf && tc->tex_surf->map)
+            pipe_surface_unmap(tc->tex_surf);
+
+         ps = pipe->get_tex_surface(pipe, tc->texture, face, level, z);
+         pipe_surface_reference(&tc->tex_surf, ps);
 
-      pipe_surface_reference(&ps, NULL);
+         pipe_surface_map(ps);
 
+         tc->tex_face = face;
+         tc->tex_level = level;
+         tc->tex_z = z;
+      }
+
+      /* get tile from the surface (view into texture) */
+      pipe->get_tile_rgba(pipe, tc->tex_surf,
+                          tile_x, tile_y, TILE_SIZE, TILE_SIZE,
+                          (float *) tile->data.color);
       tile->x = tile_x;
       tile->y = tile_y;
       tile->z = z;
@@ -390,16 +501,45 @@ sp_get_cached_tile_tex(struct pipe_context *pipe,
  * Save the color and set a 'clearflag' for each tile of the screen.
  */
 void
-sp_tile_cache_clear(struct softpipe_tile_cache *tc, const float value[4])
+sp_tile_cache_clear(struct softpipe_tile_cache *tc, uint clearValue)
 {
-   tc->clear_value[0] = value[0];
-   tc->clear_value[1] = value[1];
-   tc->clear_value[2] = value[2];
-   tc->clear_value[3] = value[3];
+   uint r, g, b, a;
+
+   tc->clear_val = clearValue;
+
+   switch (tc->surface->format) {
+   case PIPE_FORMAT_R8G8B8A8_UNORM:
+      r = (clearValue >> 24) & 0xff;
+      g = (clearValue >> 16) & 0xff;
+      b = (clearValue >>  8) & 0xff;
+      a = (clearValue      ) & 0xff;
+      break;
+   case PIPE_FORMAT_A8R8G8B8_UNORM:
+      r = (clearValue >> 16) & 0xff;
+      g = (clearValue >>  8) & 0xff;
+      b = (clearValue      ) & 0xff;
+      a = (clearValue >> 24) & 0xff;
+      break;
+   case PIPE_FORMAT_B8G8R8A8_UNORM:
+      r = (clearValue >>  8) & 0xff;
+      g = (clearValue >> 16) & 0xff;
+      b = (clearValue >> 24) & 0xff;
+      a = (clearValue      ) & 0xff;
+      break;
+   default:
+      r = g = b = a = 0;
+   }
+
+   tc->clear_color[0] = r / 255.0;
+   tc->clear_color[1] = g / 255.0;
+   tc->clear_color[2] = b / 255.0;
+   tc->clear_color[3] = a / 255.0;
 
-#if CLEAR_OPTIMIZATION
+#if TILE_CLEAR_OPTIMIZATION
+   /* set flags to indicate all the tiles are cleared */
    memset(tc->clear_flags, 255, sizeof(tc->clear_flags));
 #else
+   /* disable the optimization */
    memset(tc->clear_flags, 0, sizeof(tc->clear_flags));
 #endif
 }