+#include <inttypes.h> /* for PRIu64 macro */
#include "util/u_math.h"
#include "lp_rast_priv.h"
#include "lp_state_fs.h"
-static INLINE int u_bit_scan(unsigned *mask)
-{
- int i = ffs(*mask) - 1;
- *mask &= ~(1 << i);
- return i;
-}
-
struct tile {
int coverage;
int overdraw;
+ const struct lp_rast_state *state;
char data[TILE_SIZE][TILE_SIZE];
};
"shade_tile_opaque",
"begin_query",
"end_query",
+ "set_state",
+ "triangle_32_1",
+ "triangle_32_2",
+ "triangle_32_3",
+ "triangle_32_4",
+ "triangle_32_5",
+ "triangle_32_6",
+ "triangle_32_7",
+ "triangle_32_8",
+ "triangle_32_3_4",
+ "triangle_32_3_16",
+ "triangle_32_4_16",
};
static const char *cmd_name(unsigned cmd)
{
- assert(Elements(cmd_names) > cmd);
+ assert(ARRAY_SIZE(cmd_names) > cmd);
return cmd_names[cmd];
}
static const struct lp_fragment_shader_variant *
-get_variant( const struct cmd_block *block,
- int k )
+get_variant( const struct lp_rast_state *state,
+ const struct cmd_block *block,
+ int k )
{
- if (block->cmd[k] == LP_RAST_OP_SHADE_TILE ||
- block->cmd[k] == LP_RAST_OP_SHADE_TILE_OPAQUE)
- return block->arg[k].shade_tile->state->variant;
+ if (!state)
+ return NULL;
- if (block->cmd[k] == LP_RAST_OP_TRIANGLE_1 ||
+ if (block->cmd[k] == LP_RAST_OP_SHADE_TILE ||
+ block->cmd[k] == LP_RAST_OP_SHADE_TILE_OPAQUE ||
+ block->cmd[k] == LP_RAST_OP_TRIANGLE_1 ||
block->cmd[k] == LP_RAST_OP_TRIANGLE_2 ||
block->cmd[k] == LP_RAST_OP_TRIANGLE_3 ||
block->cmd[k] == LP_RAST_OP_TRIANGLE_4 ||
block->cmd[k] == LP_RAST_OP_TRIANGLE_5 ||
block->cmd[k] == LP_RAST_OP_TRIANGLE_6 ||
block->cmd[k] == LP_RAST_OP_TRIANGLE_7)
- return block->arg[k].triangle.tri->inputs.state->variant;
+ return state->variant;
return NULL;
}
static boolean
-is_blend( const struct cmd_block *block,
+is_blend( const struct lp_rast_state *state,
+ const struct cmd_block *block,
int k )
{
- const struct lp_fragment_shader_variant *variant = get_variant(block, k);
+ const struct lp_fragment_shader_variant *variant = get_variant(state, block, k);
if (variant)
return variant->key.blend.rt[0].blend_enable;
static void
-debug_bin( const struct cmd_bin *bin )
+debug_bin( const struct cmd_bin *bin, int x, int y )
{
+ const struct lp_rast_state *state = NULL;
const struct cmd_block *head = bin->head;
int i, j = 0;
- debug_printf("bin %d,%d:\n", bin->x, bin->y);
+ debug_printf("bin %d,%d:\n", x, y);
while (head) {
for (i = 0; i < head->count; i++, j++) {
+ if (head->cmd[i] == LP_RAST_OP_SET_STATE)
+ state = head->arg[i].state;
+
debug_printf("%d: %s %s\n", j,
cmd_name(head->cmd[i]),
- is_blend(head, i) ? "blended" : "");
+ is_blend(state, head, i) ? "blended" : "");
}
head = head->next;
}
char val)
{
const struct lp_rast_shader_inputs *inputs = arg.shade_tile;
- boolean blend = inputs->state->variant->key.blend.rt[0].blend_enable;
+ boolean blend;
unsigned i,j;
+ if (!tile->state)
+ return 0;
+
+ blend = tile->state->variant->key.blend.rt[0].blend_enable;
+
if (inputs->disable)
return 0;
{
const struct lp_rast_triangle *tri = arg.triangle.tri;
unsigned plane_mask = arg.triangle.plane_mask;
+ const struct lp_rast_plane *tri_plane = GET_PLANES(tri);
struct lp_rast_plane plane[8];
int x, y;
int count = 0;
unsigned i, nr_planes = 0;
- boolean blend = tri->inputs.state->variant->key.blend.rt[0].blend_enable;
+ boolean blend = tile->state->variant->key.blend.rt[0].blend_enable;
if (tri->inputs.disable) {
/* This triangle was partially binned and has been disabled */
}
while (plane_mask) {
- plane[nr_planes] = tri->plane[u_bit_scan(&plane_mask)];
+ plane[nr_planes] = tri_plane[u_bit_scan(&plane_mask)];
plane[nr_planes].c = (plane[nr_planes].c +
- plane[nr_planes].dcdy * tiley -
- plane[nr_planes].dcdx * tilex);
+ IMUL64(plane[nr_planes].dcdy, tiley) -
+ IMUL64(plane[nr_planes].dcdx, tilex));
nr_planes++;
}
}
for (i = 0; i < nr_planes; i++) {
- plane[i].c += plane[i].dcdx * TILE_SIZE;
+ plane[i].c += IMUL64(plane[i].dcdx, TILE_SIZE);
plane[i].c += plane[i].dcdy;
}
}
static void
do_debug_bin( struct tile *tile,
const struct cmd_bin *bin,
+ int x, int y,
boolean print_cmds)
{
unsigned k, j = 0;
const struct cmd_block *block;
- int tx = bin->x * TILE_SIZE;
- int ty = bin->y * TILE_SIZE;
+ int tx = x * TILE_SIZE;
+ int ty = y * TILE_SIZE;
memset(tile->data, ' ', sizeof tile->data);
tile->coverage = 0;
tile->overdraw = 0;
+ tile->state = NULL;
for (block = bin->head; block; block = block->next) {
for (k = 0; k < block->count; k++, j++) {
- boolean blend = is_blend(block, k);
+ boolean blend = is_blend(tile->state, block, k);
char val = get_label(j);
int count = 0;
if (print_cmds)
debug_printf("%c: %15s", val, cmd_name(block->cmd[k]));
+
+ if (block->cmd[k] == LP_RAST_OP_SET_STATE)
+ tile->state = block->arg[k].state;
if (block->cmd[k] == LP_RAST_OP_CLEAR_COLOR ||
block->cmd[k] == LP_RAST_OP_CLEAR_ZSTENCIL)
}
void
-lp_debug_bin( const struct cmd_bin *bin)
+lp_debug_bin( const struct cmd_bin *bin, int i, int j)
{
struct tile tile;
int x,y;
if (bin->head) {
- do_debug_bin(&tile, bin, TRUE);
+ do_debug_bin(&tile, bin, i, j, TRUE);
debug_printf("------------------------------------------------------------------\n");
for (y = 0; y < TILE_SIZE; y++) {
unsigned x, y;
unsigned total = 0;
unsigned possible = 0;
- static unsigned long long _total;
- static unsigned long long _possible;
+ static uint64_t _total = 0;
+ static uint64_t _possible = 0;
for (x = 0; x < scene->tiles_x; x++)
debug_printf("-");
struct tile tile;
if (bin->head) {
- //lp_debug_bin(bin);
+ //lp_debug_bin(bin, x, y);
- do_debug_bin(&tile, bin, FALSE);
+ do_debug_bin(&tile, bin, x, y, FALSE);
total += tile.coverage;
possible += 64*64;
_total += total;
_possible += possible;
- debug_printf("overall total: %llu possible %llu: percentage: %f\n",
+
+ debug_printf("overall total: %" PRIu64
+ " possible %" PRIu64 ": percentage: %f\n",
_total,
_possible,
- _total * 100.0 / (double)_possible);
+ (double) _total * 100.0 / (double)_possible);
}
for (y = 0; y < scene->tiles_y; y++) {
for (x = 0; x < scene->tiles_x; x++) {
const char *bits = " ...,-~:;=o+xaw*#XAWWWWWWWWWWWWWWWW";
- int sz = lp_scene_bin_size(scene, x, y);
- int sz2 = util_unsigned_logbase2(sz);
+ unsigned sz = lp_scene_bin_size(scene, x, y);
+ unsigned sz2 = util_logbase2(sz);
debug_printf("%c", bits[MIN2(sz2,32)]);
}
debug_printf("\n");
for (x = 0; x < scene->tiles_x; x++) {
struct cmd_bin *bin = lp_scene_get_bin(scene, x, y);
if (bin->head) {
- debug_bin(bin);
+ debug_bin(bin, x, y);
}
}
}
projects / mesa.git / blobdiff