decode: Correct a couple of mistakes in gen3 IMMEDIATE_STATE_1

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2011-04-05 08:52:52 +01:00
parent e68652cad6
commit 841c551f12

View File

@ -1005,7 +1005,6 @@ decode_3d_1d(uint32_t *data, int count,
saved_s4_set = 1;
saved_s4 = data[i];
}
}
switch (word) {
case 0:
@ -1045,11 +1044,15 @@ decode_3d_1d(uint32_t *data, int count,
case 2: cullmode = "cw"; break;
case 3: cullmode = "ccw"; break;
}
switch((data[i]>>6)&0x7) {
case 1: vfmt_xyzw = "XYZ,"; break;
case 2: vfmt_xyzw = "XYZW,"; break;
case 3: vfmt_xyzw = "XY,"; break;
case 4: vfmt_xyzw = "XYW,"; break;
switch(data[i] & (7<<6 | 1<<2)) {
case 1<<6: vfmt_xyzw = "XYZ,"; break;
case 2<<6: vfmt_xyzw = "XYZW,"; break;
case 3<<6: vfmt_xyzw = "XY,"; break;
case 4<<6: vfmt_xyzw = "XYW,"; break;
case 1<<6 | 1<<2: vfmt_xyzw = "XYZF,"; break;
case 2<<6 | 1<<2: vfmt_xyzw = "XYZWF,"; break;
case 3<<6 | 1<<2: vfmt_xyzw = "XYF,"; break;
case 4<<6 | 1<<2: vfmt_xyzw = "XYWF,"; break;
}
instr_out(data, hw_offset, i, "S4: point_width=%i, line_width=%.1f,"
"%s%s%s%s%s cullmode=%s, vfmt=%s%s%s%s%s%s "
@ -1071,8 +1074,8 @@ decode_3d_1d(uint32_t *data, int count,
data[i]&(1<<5)?"force default diffuse, ":"",
data[i]&(1<<4)?"force default specular, ":"",
data[i]&(1<<3)?"local depth ofs enable, ":"",
data[i]&(1<<3)?"point sprite enable, ":"",
data[i]&(1<<3)?"line AA enable, ":"");
data[i]&(1<<1)?"point sprite enable, ":"",
data[i]&(1<<0)?"line AA enable, ":"");
break;
}
case 5:
@ -1117,8 +1120,8 @@ decode_3d_1d(uint32_t *data, int count,
data[i]&(0xff<<20),
decode_compare_func(data[i]>>16),
data[i]&(1<<15)?"cbuf blend enable, ":"",
decode_blend_fact(data[i]>>12),
decode_blend_fact(data[i]>>8),
decode_blend_fact(data[i]>>4),
data[i]&(1<<3)?"depth write enable, ":"",
data[i]&(1<<2)?"cbuf write enable, ":"",
data[i]&(0x3));
@ -1127,6 +1130,9 @@ decode_3d_1d(uint32_t *data, int count,
instr_out(data, hw_offset, i, "S7: depth offset constant: 0x%08x\n", data[i]);
break;
}
} else {
instr_out(data, hw_offset, i, "S%d: 0x%08x\n", i, data[i]);
}
i++;
}
}