projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i965: Hack in avoidance of c++ reserved keyword in libdrm.
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
i965
/
brw_wm_fp.c
diff --git
a/src/mesa/drivers/dri/i965/brw_wm_fp.c
b/src/mesa/drivers/dri/i965/brw_wm_fp.c
index 0bef874b88752f847e64dccc200de6b87529c9ef..3870bf10fcb75fca0abc7247da92645effcf0c1a 100644
(file)
--- a/
src/mesa/drivers/dri/i965/brw_wm_fp.c
+++ b/
src/mesa/drivers/dri/i965/brw_wm_fp.c
@@
-88,6
+88,7
@@
static struct prog_src_register src_reg(GLuint file, GLuint idx)
reg.RelAddr = 0;
reg.Negate = NEGATE_NONE;
reg.Abs = 0;
reg.RelAddr = 0;
reg.Negate = NEGATE_NONE;
reg.Abs = 0;
+ reg.HasIndex2 = 0;
return reg;
}
return reg;
}
@@
-1036,13
+1037,12
@@
static void print_insns( const struct prog_instruction *insn,
for (i = 0; i < nr; i++, insn++) {
printf("%3d: ", i);
if (insn->Opcode < MAX_OPCODE)
for (i = 0; i < nr; i++, insn++) {
printf("%3d: ", i);
if (insn->Opcode < MAX_OPCODE)
- _mesa_
print_instruction(insn
);
+ _mesa_
fprint_instruction_opt(stdout, insn, 0, PROG_PRINT_DEBUG, NULL
);
else if (insn->Opcode < MAX_WM_OPCODE) {
GLuint idx = insn->Opcode - MAX_OPCODE;
else if (insn->Opcode < MAX_WM_OPCODE) {
GLuint idx = insn->Opcode - MAX_OPCODE;
- _mesa_print_alu_instruction(insn,
- wm_opcode_strings[idx],
- 3);
+ _mesa_fprint_alu_instruction(stdout, insn, wm_opcode_strings[idx],
+ 3, PROG_PRINT_DEBUG, NULL);
}
else
printf("965 Opcode %d\n", insn->Opcode);
}
else
printf("965 Opcode %d\n", insn->Opcode);
@@
-1061,7
+1061,8
@@
void brw_wm_pass_fp( struct brw_wm_compile *c )
if (INTEL_DEBUG & DEBUG_WM) {
printf("pre-fp:\n");
if (INTEL_DEBUG & DEBUG_WM) {
printf("pre-fp:\n");
- _mesa_print_program(&fp->program.Base);
+ _mesa_fprint_program_opt(stdout, &fp->program.Base, PROG_PRINT_DEBUG,
+ GL_TRUE);
printf("\n");
}
printf("\n");
}