projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/master' into nv50-compiler
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
i965
/
brw_wm_debug.c
diff --git
a/src/mesa/drivers/dri/i965/brw_wm_debug.c
b/src/mesa/drivers/dri/i965/brw_wm_debug.c
index 8f07f89ebc5979cff6a91d25a4eaf4760cedbf51..6a91251a80ec7219cd8bfe7f1131b499fecb4b33 100644
(file)
--- a/
src/mesa/drivers/dri/i965/brw_wm_debug.c
+++ b/
src/mesa/drivers/dri/i965/brw_wm_debug.c
@@
-41,21
+41,21
@@
void brw_wm_print_value( struct brw_wm_compile *c,
if (c->state >= PASS2_DONE)
brw_print_reg(value->hw_reg);
else if( value == &c->undef_value )
if (c->state >= PASS2_DONE)
brw_print_reg(value->hw_reg);
else if( value == &c->undef_value )
-
_mesa_
printf("undef");
+ printf("undef");
else if( value - c->vreg >= 0 &&
value - c->vreg < BRW_WM_MAX_VREG)
else if( value - c->vreg >= 0 &&
value - c->vreg < BRW_WM_MAX_VREG)
-
_mesa_printf("r%d", value - c->vreg
);
+
printf("r%ld", (long) (value - c->vreg)
);
else if (value - c->creg >= 0 &&
value - c->creg < BRW_WM_MAX_PARAM)
else if (value - c->creg >= 0 &&
value - c->creg < BRW_WM_MAX_PARAM)
-
_mesa_printf("c%d", value - c->creg
);
+
printf("c%ld", (long) (value - c->creg)
);
else if (value - c->payload.input_interp >= 0 &&
value - c->payload.input_interp < FRAG_ATTRIB_MAX)
else if (value - c->payload.input_interp >= 0 &&
value - c->payload.input_interp < FRAG_ATTRIB_MAX)
-
_mesa_printf("i%d", value - c->payload.input_interp
);
+
printf("i%ld", (long) (value - c->payload.input_interp)
);
else if (value - c->payload.depth >= 0 &&
value - c->payload.depth < FRAG_ATTRIB_MAX)
else if (value - c->payload.depth >= 0 &&
value - c->payload.depth < FRAG_ATTRIB_MAX)
-
_mesa_printf("d%d", value - c->payload.depth
);
+
printf("d%ld", (long) (value - c->payload.depth)
);
else
else
-
_mesa_
printf("?");
+ printf("?");
}
void brw_wm_print_ref( struct brw_wm_compile *c,
}
void brw_wm_print_ref( struct brw_wm_compile *c,
@@
-64,16
+64,16
@@
void brw_wm_print_ref( struct brw_wm_compile *c,
struct brw_reg hw_reg = ref->hw_reg;
if (ref->unspill_reg)
struct brw_reg hw_reg = ref->hw_reg;
if (ref->unspill_reg)
-
_mesa_
printf("UNSPILL(%x)/", ref->value->spill_slot);
+ printf("UNSPILL(%x)/", ref->value->spill_slot);
if (c->state >= PASS2_DONE)
brw_print_reg(ref->hw_reg);
else {
if (c->state >= PASS2_DONE)
brw_print_reg(ref->hw_reg);
else {
-
_mesa_
printf("%s", hw_reg.negate ? "-" : "");
-
_mesa_
printf("%s", hw_reg.abs ? "abs/" : "");
+ printf("%s", hw_reg.negate ? "-" : "");
+ printf("%s", hw_reg.abs ? "abs/" : "");
brw_wm_print_value(c, ref->value);
if ((hw_reg.nr&1) || hw_reg.subnr) {
brw_wm_print_value(c, ref->value);
if ((hw_reg.nr&1) || hw_reg.subnr) {
-
_mesa_
printf("->%d.%d", (hw_reg.nr&1), hw_reg.subnr);
+ printf("->%d.%d", (hw_reg.nr&1), hw_reg.subnr);
}
}
}
}
}
}
@@
-84,22
+84,22
@@
void brw_wm_print_insn( struct brw_wm_compile *c,
GLuint i, arg;
GLuint nr_args = brw_wm_nr_args(inst->opcode);
GLuint i, arg;
GLuint nr_args = brw_wm_nr_args(inst->opcode);
-
_mesa_
printf("[");
+ printf("[");
for (i = 0; i < 4; i++) {
if (inst->dst[i]) {
brw_wm_print_value(c, inst->dst[i]);
if (inst->dst[i]->spill_slot)
for (i = 0; i < 4; i++) {
if (inst->dst[i]) {
brw_wm_print_value(c, inst->dst[i]);
if (inst->dst[i]->spill_slot)
-
_mesa_
printf("/SPILL(%x)",inst->dst[i]->spill_slot);
+ printf("/SPILL(%x)",inst->dst[i]->spill_slot);
}
else
}
else
-
_mesa_
printf("#");
+ printf("#");
if (i < 3)
if (i < 3)
-
_mesa_
printf(",");
+ printf(",");
}
}
-
_mesa_
printf("]");
+ printf("]");
if (inst->writemask != WRITEMASK_XYZW)
if (inst->writemask != WRITEMASK_XYZW)
-
_mesa_
printf(".%s%s%s%s",
+ printf(".%s%s%s%s",
GET_BIT(inst->writemask, 0) ? "x" : "",
GET_BIT(inst->writemask, 1) ? "y" : "",
GET_BIT(inst->writemask, 2) ? "z" : "",
GET_BIT(inst->writemask, 0) ? "x" : "",
GET_BIT(inst->writemask, 1) ? "y" : "",
GET_BIT(inst->writemask, 2) ? "z" : "",
@@
-107,55
+107,58
@@
void brw_wm_print_insn( struct brw_wm_compile *c,
switch (inst->opcode) {
case WM_PIXELXY:
switch (inst->opcode) {
case WM_PIXELXY:
-
_mesa_
printf(" = PIXELXY");
+ printf(" = PIXELXY");
break;
case WM_DELTAXY:
break;
case WM_DELTAXY:
-
_mesa_
printf(" = DELTAXY");
+ printf(" = DELTAXY");
break;
case WM_PIXELW:
break;
case WM_PIXELW:
-
_mesa_
printf(" = PIXELW");
+ printf(" = PIXELW");
break;
case WM_WPOSXY:
break;
case WM_WPOSXY:
-
_mesa_
printf(" = WPOSXY");
+ printf(" = WPOSXY");
break;
case WM_PINTERP:
break;
case WM_PINTERP:
-
_mesa_
printf(" = PINTERP");
+ printf(" = PINTERP");
break;
case WM_LINTERP:
break;
case WM_LINTERP:
-
_mesa_
printf(" = LINTERP");
+ printf(" = LINTERP");
break;
case WM_CINTERP:
break;
case WM_CINTERP:
-
_mesa_
printf(" = CINTERP");
+ printf(" = CINTERP");
break;
case WM_FB_WRITE:
break;
case WM_FB_WRITE:
- _mesa_printf(" = FB_WRITE");
+ printf(" = FB_WRITE");
+ break;
+ case WM_FRONTFACING:
+ printf(" = FRONTFACING");
break;
default:
break;
default:
-
_mesa_
printf(" = %s", _mesa_opcode_string(inst->opcode));
+ printf(" = %s", _mesa_opcode_string(inst->opcode));
break;
}
if (inst->saturate)
break;
}
if (inst->saturate)
-
_mesa_
printf("_SAT");
+ printf("_SAT");
for (arg = 0; arg < nr_args; arg++) {
for (arg = 0; arg < nr_args; arg++) {
-
_mesa_
printf(" [");
+ printf(" [");
for (i = 0; i < 4; i++) {
if (inst->src[arg][i]) {
brw_wm_print_ref(c, inst->src[arg][i]);
}
else
for (i = 0; i < 4; i++) {
if (inst->src[arg][i]) {
brw_wm_print_ref(c, inst->src[arg][i]);
}
else
-
_mesa_
printf("%%");
+ printf("%%");
if (i < 3)
if (i < 3)
-
_mesa_
printf(",");
+ printf(",");
else
else
-
_mesa_
printf("]");
+ printf("]");
}
}
}
}
-
_mesa_
printf("\n");
+ printf("\n");
}
void brw_wm_print_program( struct brw_wm_compile *c,
}
void brw_wm_print_program( struct brw_wm_compile *c,
@@
-163,9
+166,9
@@
void brw_wm_print_program( struct brw_wm_compile *c,
{
GLuint insn;
{
GLuint insn;
-
_mesa_
printf("%s:\n", stage);
+ printf("%s:\n", stage);
for (insn = 0; insn < c->nr_insns; insn++)
brw_wm_print_insn(c, &c->instruction[insn]);
for (insn = 0; insn < c->nr_insns; insn++)
brw_wm_print_insn(c, &c->instruction[insn]);
-
_mesa_
printf("\n");
+ printf("\n");
}
}