i965g: fix some reloc counts

[mesa.git] / src / gallium / drivers / llvmpipe / lp_tile_cache.h

diff --git a/src/gallium/drivers/llvmpipe/lp_tile_cache.h b/src/gallium/drivers/llvmpipe/lp_tile_cache.h
index e82b4b856a35ec4173d6702a8b695ac532703f29..161bab37991b8a56350dee5e428065b6546a1b67 100644 (file)
--- a/src/gallium/drivers/llvmpipe/lp_tile_cache.h
+++ b/src/gallium/drivers/llvmpipe/lp_tile_cache.h
@@ -28,36 +28,12 @@
 #ifndef LP_TILE_CACHE_H
 #define LP_TILE_CACHE_H
 
-#define TILE_CLEAR_OPTIMIZATION 1
-
 
 #include "pipe/p_compiler.h"
+#include "lp_tile_soa.h"
 
 
-struct llvmpipe_context;
-struct llvmpipe_tile_cache;
-
-
-/**
- * Cache tile size (width and height). This needs to be a power of two.
- */
-#define TILE_SIZE 64
-
-
-
-struct llvmpipe_cached_tile
-{
-   int x, y;           /**< pos of tile in window coords */
-   int z, face, level; /**< Extra texture indexes */
-   union {
-      float color[TILE_SIZE][TILE_SIZE][4];
-      uint color32[TILE_SIZE][TILE_SIZE];
-      uint depth32[TILE_SIZE][TILE_SIZE];
-      ushort depth16[TILE_SIZE][TILE_SIZE];
-      ubyte stencil8[TILE_SIZE][TILE_SIZE];
-      ubyte any[1];
-   } data;
-};
+struct llvmpipe_tile_cache;  /* opaque */
 
 
 extern struct llvmpipe_tile_cache *
@@ -79,10 +55,6 @@ lp_tile_cache_map_transfers(struct llvmpipe_tile_cache *tc);
 extern void
 lp_tile_cache_unmap_transfers(struct llvmpipe_tile_cache *tc);
 
-extern void
-lp_tile_cache_set_texture(struct llvmpipe_tile_cache *tc,
-                          struct pipe_texture *texture);
-
 extern void
 lp_flush_tile_cache(struct llvmpipe_tile_cache *tc);
 
@@ -90,12 +62,9 @@ extern void
 lp_tile_cache_clear(struct llvmpipe_tile_cache *tc, const float *rgba,
                     uint clearValue);
 
-extern struct llvmpipe_cached_tile *
-lp_get_cached_tile(struct llvmpipe_tile_cache *tc, int x, int y);
-
-extern const struct llvmpipe_cached_tile *
-lp_get_cached_tile_tex(struct llvmpipe_tile_cache *tc, int x, int y, int z,
-                       int face, int level);
+extern void *
+lp_get_cached_tile(struct llvmpipe_tile_cache *tc,
+                   unsigned x, unsigned y );
 
 
 #endif /* LP_TILE_CACHE_H */