llvmpipe: make debug_fs_variant respect variant->nr_samplers

This commit is contained in:
Keith Whitwell
2010-10-03 11:39:02 +01:00
committed by José Fonseca
parent 5661e51c01
commit 591e1bc34f
+23 -25
View File
@@ -782,31 +782,29 @@ dump_fs_variant_key(const struct lp_fragment_shader_variant_key *key)
debug_printf("blend.alpha_dst_factor = %s\n", util_dump_blend_factor(key->blend.rt[0].alpha_dst_factor, TRUE));
}
debug_printf("blend.colormask = 0x%x\n", key->blend.rt[0].colormask);
for (i = 0; i < PIPE_MAX_SAMPLERS; ++i) {
if (key->sampler[i].format) {
debug_printf("sampler[%u] = \n", i);
debug_printf(" .format = %s\n",
util_format_name(key->sampler[i].format));
debug_printf(" .target = %s\n",
util_dump_tex_target(key->sampler[i].target, TRUE));
debug_printf(" .pot = %u %u %u\n",
key->sampler[i].pot_width,
key->sampler[i].pot_height,
key->sampler[i].pot_depth);
debug_printf(" .wrap = %s %s %s\n",
util_dump_tex_wrap(key->sampler[i].wrap_s, TRUE),
util_dump_tex_wrap(key->sampler[i].wrap_t, TRUE),
util_dump_tex_wrap(key->sampler[i].wrap_r, TRUE));
debug_printf(" .min_img_filter = %s\n",
util_dump_tex_filter(key->sampler[i].min_img_filter, TRUE));
debug_printf(" .min_mip_filter = %s\n",
util_dump_tex_mipfilter(key->sampler[i].min_mip_filter, TRUE));
debug_printf(" .mag_img_filter = %s\n",
util_dump_tex_filter(key->sampler[i].mag_img_filter, TRUE));
if (key->sampler[i].compare_mode != PIPE_TEX_COMPARE_NONE)
debug_printf(" .compare_func = %s\n", util_dump_func(key->sampler[i].compare_func, TRUE));
debug_printf(" .normalized_coords = %u\n", key->sampler[i].normalized_coords);
}
for (i = 0; i < key->nr_samplers; ++i) {
debug_printf("sampler[%u] = \n", i);
debug_printf(" .format = %s\n",
util_format_name(key->sampler[i].format));
debug_printf(" .target = %s\n",
util_dump_tex_target(key->sampler[i].target, TRUE));
debug_printf(" .pot = %u %u %u\n",
key->sampler[i].pot_width,
key->sampler[i].pot_height,
key->sampler[i].pot_depth);
debug_printf(" .wrap = %s %s %s\n",
util_dump_tex_wrap(key->sampler[i].wrap_s, TRUE),
util_dump_tex_wrap(key->sampler[i].wrap_t, TRUE),
util_dump_tex_wrap(key->sampler[i].wrap_r, TRUE));
debug_printf(" .min_img_filter = %s\n",
util_dump_tex_filter(key->sampler[i].min_img_filter, TRUE));
debug_printf(" .min_mip_filter = %s\n",
util_dump_tex_mipfilter(key->sampler[i].min_mip_filter, TRUE));
debug_printf(" .mag_img_filter = %s\n",
util_dump_tex_filter(key->sampler[i].mag_img_filter, TRUE));
if (key->sampler[i].compare_mode != PIPE_TEX_COMPARE_NONE)
debug_printf(" .compare_func = %s\n", util_dump_func(key->sampler[i].compare_func, TRUE));
debug_printf(" .normalized_coords = %u\n", key->sampler[i].normalized_coords);
}
}