diff options
| author | Eric Anholt <eric@anholt.net> | 2016-07-26 16:19:15 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2016-08-19 13:11:36 -0700 |
| commit | ed92241d7848a5f08360240795869d72b68054a3 (patch) | |
| tree | fac95705bbdb7f01f439455764530bb50ed82085 /src/gallium/drivers | |
| parent | d80d03b830c2d884271bd5d44012c39c54fee121 (diff) | |
| download | external_mesa3d-ed92241d7848a5f08360240795869d72b68054a3.zip external_mesa3d-ed92241d7848a5f08360240795869d72b68054a3.tar.gz external_mesa3d-ed92241d7848a5f08360240795869d72b68054a3.tar.bz2 | |
ttn: Make FRAG_RESULT_DEPTH be a float variable to match gtn and ptn.
This lets TTN-using drivers handle FRAG_RESULT_DEPTH the same between all
their source paths.
Reviewed-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'src/gallium/drivers')
| -rw-r--r-- | src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c | 6 | ||||
| -rw-r--r-- | src/gallium/drivers/freedreno/ir3/ir3_shader.c | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/vc4/vc4_program.c | 2 |
3 files changed, 1 insertions, 8 deletions
diff --git a/src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c b/src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c index 2331901..6323566 100644 --- a/src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c +++ b/src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c @@ -2498,12 +2498,6 @@ ir3_compile_shader_nir(struct ir3_compiler *compiler, /* fixup input/outputs: */ for (i = 0; i < so->outputs_count; i++) { so->outputs[i].regid = ir->outputs[i*4]->regs[0]->num; - /* preserve hack for depth output.. tgsi writes depth to .z, - * but what we give the hw is the scalar register: - */ - if (so->shader->from_tgsi && (so->type == SHADER_FRAGMENT) && - (so->outputs[i].slot == FRAG_RESULT_DEPTH)) - so->outputs[i].regid += 2; } /* Note that some or all channels of an input may be unused: */ diff --git a/src/gallium/drivers/freedreno/ir3/ir3_shader.c b/src/gallium/drivers/freedreno/ir3/ir3_shader.c index 87bdcf9..ac48132 100644 --- a/src/gallium/drivers/freedreno/ir3/ir3_shader.c +++ b/src/gallium/drivers/freedreno/ir3/ir3_shader.c @@ -294,7 +294,6 @@ ir3_shader_create(struct ir3_compiler *compiler, tgsi_dump(cso->tokens, 0); } nir = ir3_tgsi_to_nir(cso->tokens); - shader->from_tgsi = true; } /* do first pass optimization, ignoring the key: */ shader->nir = ir3_optimize_nir(shader, nir, NULL); diff --git a/src/gallium/drivers/vc4/vc4_program.c b/src/gallium/drivers/vc4/vc4_program.c index 030643a..33721f1 100644 --- a/src/gallium/drivers/vc4/vc4_program.c +++ b/src/gallium/drivers/vc4/vc4_program.c @@ -1223,7 +1223,7 @@ emit_frag_end(struct vc4_compile *c) if (c->output_position_index != -1) { qir_FTOI_dest(c, qir_reg(QFILE_TLB_Z_WRITE, 0), qir_FMUL(c, - c->outputs[c->output_position_index + 2], + c->outputs[c->output_position_index], qir_uniform_f(c, 0xffffff)))->cond = discard_cond; } else { qir_MOV_dest(c, qir_reg(QFILE_TLB_Z_WRITE, 0), |