fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-01 14:00:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

vc4: Add support for computed depth writes.

Browse source 
Fixes piglit glsl-1.10-fragdepth and early-z.
This commit is contained in:
Eric Anholt 2014-09-16 12:55:16 -07:00
parent aae4223fbd
commit 2264925f85
3 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/gallium/drivers/vc4/vc4_program.c
View file

@ -891,6 +891,16 @@ emit_tgsi_declaration(struct vc4_compile *c,
case TGSI_FILE_OUTPUT:
resize_qreg_array(c, &c->outputs, &c->outputs_array_size,
(decl->Range.Last + 1) * 4);
switch (decl->Semantic.Name) {
case TGSI_SEMANTIC_POSITION:
c->output_position_index = decl->Range.First * 4;
break;
case TGSI_SEMANTIC_COLOR:
c->output_color_index = decl->Range.First * 4;
break;
}
break;
}
}
@ -1206,7 +1216,9 @@ emit_frag_end(struct vc4_compile *c)
c->undef, c->undef, c->undef, c->undef
};
vc4_blend(c, blend_color, dst_color,
c->outputs ? c->outputs : undef_array);
(c->output_color_index != -1 ?
c->outputs + c->output_color_index :
undef_array));
/* If the bit isn't set in the color mask, then just return the
* original dst color, instead.
@ -1238,7 +1250,14 @@ emit_frag_end(struct vc4_compile *c)
qir_TLB_DISCARD_SETUP(c, c->discard);
if (c->fs_key->depth_enabled) {
qir_TLB_Z_WRITE(c, qir_FRAG_Z(c));
struct qreg z;
if (c->output_position_index != -1) {
z = qir_FTOI(c, qir_FMUL(c, c->outputs[c->output_position_index + 2],
qir_uniform_f(c, 0xffffff)));
} else {
z = qir_FRAG_Z(c);
}
qir_TLB_Z_WRITE(c, z);
}
bool color_written = false;

3
src/gallium/drivers/vc4/vc4_qir.c
View file

@ -279,6 +279,9 @@ qir_compile_init(void)
make_empty_list(&c->instructions);
c->output_position_index = -1;
c->output_color_index = -1;
return c;
}

2
src/gallium/drivers/vc4/vc4_qir.h
View file

@ -227,6 +227,8 @@ struct vc4_compile {
uint32_t num_uniforms;
uint32_t num_outputs;
uint32_t num_texture_samples;
uint32_t output_position_index;
uint32_t output_color_index;
struct qreg undef;
enum qstage stage;