#include "util/u_inlines.h"
#include "util/u_memory.h"
#include "util/u_tile.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
#include "util/u_math.h"
#include "sp_context.h"
#include "sp_texture.h"
uint pos;
/* make sure max texture size works */
- assert((TEX_TILE_SIZE << TEX_ADDR_BITS) >= (1 << (SP_MAX_TEXTURE_2D_LEVELS-1)));
+ assert((TEX_TILE_SIZE << TEX_Y_BITS) >= (1 << (SP_MAX_TEXTURE_2D_LEVELS-1)));
tc = CALLOC_STRUCT( softpipe_tex_tile_cache );
if (tc) {
tc->pipe = pipe;
- for (pos = 0; pos < Elements(tc->entries); pos++) {
+ for (pos = 0; pos < ARRAY_SIZE(tc->entries); pos++) {
tc->entries[pos].addr.bits.invalid = 1;
}
tc->last_tile = &tc->entries[0]; /* any tile */
if (tc) {
uint pos;
- for (pos = 0; pos < Elements(tc->entries); pos++) {
+ for (pos = 0; pos < ARRAY_SIZE(tc->entries); pos++) {
/*assert(tc->entries[pos].x < 0);*/
}
if (tc->transfer) {
assert(tc);
assert(tc->texture);
- for (i = 0; i < Elements(tc->entries); i++) {
+ for (i = 0; i < ARRAY_SIZE(tc->entries); i++) {
tc->entries[i].addr.bits.invalid = 1;
}
}
/* mark as entries as invalid/empty */
/* XXX we should try to avoid this when the teximage hasn't changed */
- for (i = 0; i < Elements(tc->entries); i++) {
+ for (i = 0; i < ARRAY_SIZE(tc->entries); i++) {
tc->entries[i].addr.bits.invalid = 1;
}
if (tc->texture) {
/* caching a texture, mark all entries as empty */
- for (pos = 0; pos < Elements(tc->entries); pos++) {
+ for (pos = 0; pos < ARRAY_SIZE(tc->entries); pos++) {
tc->entries[pos].addr.bits.invalid = 1;
}
tc->tex_z = -1;
* This is basically a direct-map cache.
* XXX There's probably lots of ways in which we can improve this.
*/
-static INLINE uint
+static inline uint
tex_cache_pos( union tex_tile_address addr )
{
uint entry = (addr.bits.x +
union tex_tile_address addr )
{
struct softpipe_tex_cached_tile *tile;
- boolean zs = util_format_is_depth_or_stencil(tc->format);
tile = tc->entries + tex_cache_pos( addr );
/* Get tile from the transfer (view into texture), explicitly passing
* the image format.
*/
- if (!zs && util_format_is_pure_uint(tc->format)) {
- pipe_get_tile_ui_format(tc->tex_trans, tc->tex_trans_map,
- addr.bits.x * TEX_TILE_SIZE,
- addr.bits.y * TEX_TILE_SIZE,
- TEX_TILE_SIZE,
- TEX_TILE_SIZE,
- tc->format,
- (unsigned *) tile->data.colorui);
- } else if (!zs && util_format_is_pure_sint(tc->format)) {
- pipe_get_tile_i_format(tc->tex_trans, tc->tex_trans_map,
- addr.bits.x * TEX_TILE_SIZE,
- addr.bits.y * TEX_TILE_SIZE,
- TEX_TILE_SIZE,
- TEX_TILE_SIZE,
- tc->format,
- (int *) tile->data.colori);
- } else {
- pipe_get_tile_rgba_format(tc->tex_trans, tc->tex_trans_map,
- addr.bits.x * TEX_TILE_SIZE,
- addr.bits.y * TEX_TILE_SIZE,
- TEX_TILE_SIZE,
- TEX_TILE_SIZE,
- tc->format,
- (float *) tile->data.color);
- }
+ pipe_get_tile_rgba(tc->tex_trans, tc->tex_trans_map,
+ addr.bits.x * TEX_TILE_SIZE,
+ addr.bits.y * TEX_TILE_SIZE,
+ TEX_TILE_SIZE,
+ TEX_TILE_SIZE,
+ tc->format,
+ (float *) tile->data.color);
tile->addr = addr;
}