fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 19:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

pan/decode: Use generation for vertex_tiler_postfix

Browse source 
Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6476>
This commit is contained in:
Alyssa Rosenzweig 2020-08-26 16:56:51 -04:00 • committed by Marge Bot
parent 8004906926
commit 2425bac8fe
1 changed files with 10 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
src/panfrost/lib/decode.c
View file

@ -208,17 +208,6 @@ pandecode_log_decoded_flags(const struct pandecode_flag_info *flag_info,
}
}
#define FLAG_INFO(flag) { MALI_##flag, "MALI_" #flag }
static const struct pandecode_flag_info gl_enable_flag_info[] = {
FLAG_INFO(OCCLUSION_QUERY),
FLAG_INFO(OCCLUSION_PRECISE),
FLAG_INFO(FRONT_CCW_TOP),
FLAG_INFO(CULL_FACE_FRONT),
FLAG_INFO(CULL_FACE_BACK),
{}
};
#undef FLAG_INFO
#define FLAG_INFO(flag) { MALI_CLEAR_##flag, "MALI_CLEAR_" #flag }
static const struct pandecode_flag_info clear_flag_info[] = {
FLAG_INFO(FAST),
@ -1794,48 +1783,6 @@ pandecode_vertex_tiler_postfix_pre(
pandecode_samplers(p->sampler_descriptor, sampler_count, job_no, is_bifrost);
}
static void
pandecode_gl_enables(uint32_t gl_enables, int job_type)
{
pandecode_log(".gl_enables = ");
pandecode_log_decoded_flags(gl_enable_flag_info, gl_enables);
pandecode_log_cont(",\n");
}
static void
pandecode_vertex_tiler_postfix(const struct mali_vertex_tiler_postfix *p, int job_no, bool is_bifrost)
{
if (p->shader & 0xF)
pandecode_msg("warn: shader tagged %X\n", (unsigned) (p->shader & 0xF));
pandecode_log(".postfix = {\n");
pandecode_indent++;
pandecode_gl_enables(p->gl_enables, MALI_JOB_TYPE_TILER);
pandecode_prop("instance_shift = 0x%x", p->instance_shift);
pandecode_prop("instance_odd = 0x%x", p->instance_odd);
if (p->zero4) {
pandecode_msg("XXX: vertex only zero tripped");
pandecode_prop("zero4 = 0x%" PRIx32, p->zero4);
}
pandecode_prop("offset_start = 0x%x", p->offset_start);
if (p->zero5) {
pandecode_msg("XXX: vertex only zero tripped");
pandecode_prop("zero5 = 0x%" PRIx64, p->zero5);
}
MEMORY_PROP(p, position_varying);
MEMORY_PROP(p, occlusion_counter);
pandecode_indent--;
pandecode_log("},\n");
}
static void
pandecode_tiler_heap_meta(mali_ptr gpu_va, int job_no)
{
@ -1964,7 +1911,9 @@ pandecode_vertex_job_bfr(const struct mali_job_descriptor_header *h,
pandecode_indent++;
pandecode_vertex_tiler_prefix(&v->prefix, job_no, false);
pandecode_vertex_tiler_postfix(&v->postfix, job_no, true);
struct mali_draw_packed draw;
memcpy(&draw, &v->postfix, sizeof(draw));
DUMP_CL("Draw", DRAW, &draw, 2);
pandecode_indent--;
pandecode_log("};\n");
@ -2001,7 +1950,9 @@ pandecode_tiler_job_bfr(const struct mali_job_descriptor_header *h,
pandecode_prop("zero6 = 0x%" PRIx64, t->zero6);
}
pandecode_vertex_tiler_postfix(&t->postfix, job_no, true);
struct mali_draw_packed draw;
memcpy(&draw, &t->postfix, sizeof(draw));
DUMP_CL("Draw", DRAW, &draw, 2);
pandecode_indent--;
pandecode_log("};\n");
@ -2023,7 +1974,10 @@ pandecode_vertex_or_tiler_job_mdg(const struct mali_job_descriptor_header *h,
pandecode_indent++;
pandecode_vertex_tiler_prefix(&v->prefix, job_no, is_graphics);
pandecode_vertex_tiler_postfix(&v->postfix, job_no, false);
struct mali_draw_packed draw;
memcpy(&draw, &v->postfix, sizeof(draw));
DUMP_CL("Draw", DRAW, &draw, 2);
struct MALI_PRIMITIVE primitive;
struct mali_primitive_packed prim_packed = v->prefix.primitive;