diff options
| author | Marek Olšák <[email protected]> | 2014-08-07 02:05:10 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2017-04-01 00:06:41 +0200 |
| commit | 150736b5c34fc07de296454b973ae72ede215ae2 (patch) | |
| tree | 54d93a00b5b0da2000e9de564d7ce2be57c51842 /src/gallium/state_trackers/nine | |
| parent | c011fe7452f5a0c90e1839e3549efc4c2ac665c1 (diff) | |
gallium: remove support for predicates from TGSI (v2)
Neved used.
v2: gallivm: rename "pred" -> "exec_mask"
etnaviv: remove the cap
gallium: fix tgsi_instruction::Padding
Reviewed-by: Nicolai Hähnle <[email protected]>
Reviewed-by: Roland Scheidegger <[email protected]>
Diffstat (limited to 'src/gallium/state_trackers/nine')
| -rw-r--r-- | src/gallium/state_trackers/nine/nine_shader.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/src/gallium/state_trackers/nine/nine_shader.c b/src/gallium/state_trackers/nine/nine_shader.c index 7760a1ce1d3..6dcd97603d4 100644 --- a/src/gallium/state_trackers/nine/nine_shader.c +++ b/src/gallium/state_trackers/nine/nine_shader.c @@ -456,7 +456,6 @@ struct shader_translator boolean native_integers; boolean inline_subroutines; - boolean lower_preds; boolean want_texcoord; boolean shift_wpos; boolean wpos_is_sysval; @@ -735,14 +734,6 @@ tx_addr_alloc(struct shader_translator *tx, INT idx) tx->regs.a0 = ureg_DECL_temporary(tx->ureg); } -static inline void -tx_pred_alloc(struct shader_translator *tx, INT idx) -{ - assert(idx == 0); - if (ureg_dst_is_undef(tx->regs.p)) - tx->regs.p = ureg_DECL_predicate(tx->ureg); -} - /* NOTE: It's not very clear on which ps1.1-ps1.3 instructions * the projection should be applied on the texture. It doesn't * apply on texkill. @@ -984,9 +975,7 @@ tx_src_param(struct shader_translator *tx, const struct sm1_src_param *param) } break; case D3DSPR_PREDICATE: - assert(!param->rel); - tx_pred_alloc(tx, param->idx); - src = ureg_src(tx->regs.p); + assert(!"D3DSPR_PREDICATE"); break; case D3DSPR_SAMPLER: assert(param->mod == NINED3DSPSM_NONE); @@ -1305,9 +1294,7 @@ _tx_dst_param(struct shader_translator *tx, const struct sm1_dst_param *param) dst = tx->regs.oDepth; /* XXX: must write .z component */ break; case D3DSPR_PREDICATE: - assert(!param->rel); - tx_pred_alloc(tx, param->idx); - dst = tx->regs.p; + assert(!"D3DSPR_PREDICATE"); break; case D3DSPR_TEMPFLOAT16: DBG("unhandled D3DSPR: %u\n", param->file); @@ -3521,7 +3508,6 @@ nine_translate_shader(struct NineDevice9 *device, struct nine_shader_info *info, tx->native_integers = GET_SHADER_CAP(INTEGERS); tx->inline_subroutines = !GET_SHADER_CAP(SUBROUTINES); - tx->lower_preds = !GET_SHADER_CAP(MAX_PREDS); tx->want_texcoord = GET_CAP(TGSI_TEXCOORD); tx->shift_wpos = !GET_CAP(TGSI_FS_COORD_PIXEL_CENTER_INTEGER); tx->texcoord_sn = tx->want_texcoord ? |