projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/master' into gallium-msaa
[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 549afd31de42570a315f6be182b8f4446e6cdb46..d73c391582402abe45074bc6d46b4d8c168063bf 100644
(file)
--- a/
src/mesa/drivers/dri/i965/brw_wm_fp.c
+++ b/
src/mesa/drivers/dri/i965/brw_wm_fp.c
@@
-138,7
+138,6
@@
static struct prog_dst_register dst_reg(GLuint file, GLuint idx)
reg.CondMask = COND_TR;
reg.CondSwizzle = 0;
reg.CondSrc = 0;
reg.CondMask = COND_TR;
reg.CondSwizzle = 0;
reg.CondSrc = 0;
- reg.pad = 0;
return reg;
}
return reg;
}
@@
-160,7
+159,7
@@
static struct prog_dst_register get_temp( struct brw_wm_compile *c )
int bit = _mesa_ffs( ~c->fp_temp );
if (!bit) {
int bit = _mesa_ffs( ~c->fp_temp );
if (!bit) {
-
_mesa_
printf("%s: out of temporaries\n", __FILE__);
+ printf("%s: out of temporaries\n", __FILE__);
exit(1);
}
exit(1);
}
@@
-182,6
+181,8
@@
static void release_temp( struct brw_wm_compile *c, struct prog_dst_register tem
static struct prog_instruction *get_fp_inst(struct brw_wm_compile *c)
{
assert(c->nr_fp_insns < BRW_WM_MAX_INSN);
static struct prog_instruction *get_fp_inst(struct brw_wm_compile *c)
{
assert(c->nr_fp_insns < BRW_WM_MAX_INSN);
+ memset(&c->prog_instructions[c->nr_fp_insns], 0,
+ sizeof(*c->prog_instructions));
return &c->prog_instructions[c->nr_fp_insns++];
}
return &c->prog_instructions[c->nr_fp_insns++];
}
@@
-984,7
+985,7
@@
static void emit_render_target_writes( struct brw_wm_compile *c )
}
else {
/* if gl_FragData[0] is written, use it, else use gl_FragColor */
}
else {
/* if gl_FragData[0] is written, use it, else use gl_FragColor */
- if (c->fp->program.Base.OutputsWritten &
(1 <<
FRAG_RESULT_DATA0))
+ if (c->fp->program.Base.OutputsWritten &
BITFIELD64_BIT(
FRAG_RESULT_DATA0))
outcolor = src_reg(PROGRAM_OUTPUT, FRAG_RESULT_DATA0);
else
outcolor = src_reg(PROGRAM_OUTPUT, FRAG_RESULT_COLOR);
outcolor = src_reg(PROGRAM_OUTPUT, FRAG_RESULT_DATA0);
else
outcolor = src_reg(PROGRAM_OUTPUT, FRAG_RESULT_COLOR);
@@
-1033,7
+1034,7
@@
static void print_insns( const struct prog_instruction *insn,
{
GLuint i;
for (i = 0; i < nr; i++, insn++) {
{
GLuint i;
for (i = 0; i < nr; i++, insn++) {
-
_mesa_
printf("%3d: ", i);
+ printf("%3d: ", i);
if (insn->Opcode < MAX_OPCODE)
_mesa_print_instruction(insn);
else if (insn->Opcode < MAX_WM_OPCODE) {
if (insn->Opcode < MAX_OPCODE)
_mesa_print_instruction(insn);
else if (insn->Opcode < MAX_WM_OPCODE) {
@@
-1044,7
+1045,7
@@
static void print_insns( const struct prog_instruction *insn,
3);
}
else
3);
}
else
-
_mesa_
printf("965 Opcode %d\n", insn->Opcode);
+ printf("965 Opcode %d\n", insn->Opcode);
}
}
}
}
@@
-1059,9
+1060,9
@@
void brw_wm_pass_fp( struct brw_wm_compile *c )
GLuint insn;
if (INTEL_DEBUG & DEBUG_WM) {
GLuint insn;
if (INTEL_DEBUG & DEBUG_WM) {
-
_mesa_
printf("pre-fp:\n");
+ printf("pre-fp:\n");
_mesa_print_program(&fp->program.Base);
_mesa_print_program(&fp->program.Base);
-
_mesa_
printf("\n");
+ printf("\n");
}
c->pixel_xy = src_undef();
}
c->pixel_xy = src_undef();
@@
-1167,9
+1168,9
@@
void brw_wm_pass_fp( struct brw_wm_compile *c )
}
if (INTEL_DEBUG & DEBUG_WM) {
}
if (INTEL_DEBUG & DEBUG_WM) {
-
_mesa_
printf("pass_fp:\n");
+ printf("pass_fp:\n");
print_insns( c->prog_instructions, c->nr_fp_insns );
print_insns( c->prog_instructions, c->nr_fp_insns );
-
_mesa_
printf("\n");
+ printf("\n");
}
}
}
}