summaryrefslogtreecommitdiff
path: root/lib/mesa/src/broadcom/compiler/vir_dump.c
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2021-07-22 10:17:30 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2021-07-22 10:17:30 +0000
commitca11beabae33eb59fb981b8adf50b1d47a2a98f0 (patch)
tree3e4691a396e6e54cd54224a190663d5cf976625b /lib/mesa/src/broadcom/compiler/vir_dump.c
parent27c8a50e8bbde7d28b1fc46d715a4c469e24f2c4 (diff)
Import Mesa 21.1.5
Diffstat (limited to 'lib/mesa/src/broadcom/compiler/vir_dump.c')
-rw-r--r--lib/mesa/src/broadcom/compiler/vir_dump.c19
1 files changed, 13 insertions, 6 deletions
diff --git a/lib/mesa/src/broadcom/compiler/vir_dump.c b/lib/mesa/src/broadcom/compiler/vir_dump.c
index 9e1ef1e9d..5c47bbdc1 100644
--- a/lib/mesa/src/broadcom/compiler/vir_dump.c
+++ b/lib/mesa/src/broadcom/compiler/vir_dump.c
@@ -30,7 +30,8 @@ vir_dump_uniform(enum quniform_contents contents,
uint32_t data)
{
static const char *quniform_names[] = {
- [QUNIFORM_ALPHA_REF] = "alpha_ref",
+ [QUNIFORM_LINE_WIDTH] = "line_width",
+ [QUNIFORM_AA_LINE_WIDTH] = "aa_line_width",
[QUNIFORM_VIEWPORT_X_SCALE] = "vp_x_scale",
[QUNIFORM_VIEWPORT_Y_SCALE] = "vp_y_scale",
[QUNIFORM_VIEWPORT_Z_OFFSET] = "vp_z_offset",
@@ -116,10 +117,14 @@ vir_dump_uniform(enum quniform_contents contents,
fprintf(stderr, "ssbo[%d]", data);
break;
- case QUNIFORM_GET_BUFFER_SIZE:
+ case QUNIFORM_GET_SSBO_SIZE:
fprintf(stderr, "ssbo_size[%d]", data);
break;
+ case QUNIFORM_GET_UBO_SIZE:
+ fprintf(stderr, "ubo_size[%d]", data);
+ break;
+
case QUNIFORM_NUM_WORK_GROUPS:
fprintf(stderr, "num_wg.%c", data < 3 ? "xyz"[data] : '?');
break;
@@ -158,7 +163,8 @@ vir_print_reg(struct v3d_compile *c, const struct qinst *inst,
break;
case QFILE_MAGIC:
- fprintf(stderr, "%s", v3d_qpu_magic_waddr_name(reg.index));
+ fprintf(stderr, "%s",
+ v3d_qpu_magic_waddr_name(c->devinfo, reg.index));
break;
case QFILE_SMALL_IMM: {
@@ -168,8 +174,8 @@ vir_print_reg(struct v3d_compile *c, const struct qinst *inst,
&unpacked);
assert(ok); (void) ok;
- if ((int)inst->qpu.raddr_b >= -16 &&
- (int)inst->qpu.raddr_b <= 15)
+ int8_t *p = (int8_t *)&inst->qpu.raddr_b;
+ if (*p >= -16 && *p <= 15)
fprintf(stderr, "%d", unpacked);
else
fprintf(stderr, "%f", uif(unpacked));
@@ -197,7 +203,8 @@ vir_dump_sig_addr(const struct v3d_device_info *devinfo,
if (!instr->sig_magic)
fprintf(stderr, ".rf%d", instr->sig_addr);
else {
- const char *name = v3d_qpu_magic_waddr_name(instr->sig_addr);
+ const char *name =
+ v3d_qpu_magic_waddr_name(devinfo, instr->sig_addr);
if (name)
fprintf(stderr, ".%s", name);
else