diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2014-10-04 20:41:03 +0200 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2014-10-12 23:52:02 +0200 |
| commit | 5e0fbe1b631d883eb0e033938a534a259c8d95fd (patch) | |
| tree | 86eeec4c4ec9c4bdc0f67344a1a02c36c6a76546 | |
| parent | a9592cd3ac20143e01126ef1df372ecca54b41d1 (diff) | |
radeonsi: remove vs.ucps_enabled from the shader key
Written CLIPDIST outputs are simply disabled in PA_CL_VS_OUT_CNTL.
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_shader.c | 6 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_shader.h | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state.c | 8 |
3 files changed, 0 insertions, 15 deletions
diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index e21cb76d9f9..c9e67922c3b 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -870,9 +870,6 @@ static void si_llvm_emit_clipvertex(struct lp_build_tgsi_context * bld_base, for (reg_index = 0; reg_index < 2; reg_index ++) { LLVMValueRef *args = pos[2 + reg_index]; - if (!(shader->key.vs.ucps_enabled & (1 << reg_index))) - continue; - shader->clip_dist_write |= 0xf << (4 * reg_index); args[5] = @@ -1175,9 +1172,6 @@ handle_semantic: param_count++; break; case TGSI_SEMANTIC_CLIPDIST: - if (!(si_shader_ctx->shader->key.vs.ucps_enabled & - (1 << semantic_index))) - continue; shader->clip_dist_write |= 0xf << (semantic_index * 4); target = V_008DFC_SQ_EXP_POS + 2 + semantic_index; diff --git a/src/gallium/drivers/radeonsi/si_shader.h b/src/gallium/drivers/radeonsi/si_shader.h index 43a4e65aa72..76c29fe0f36 100644 --- a/src/gallium/drivers/radeonsi/si_shader.h +++ b/src/gallium/drivers/radeonsi/si_shader.h @@ -145,7 +145,6 @@ union si_shader_key { /* The mask of "get_unique_index" bits, needed for ES, * it describes how the ES->GS ring buffer is laid out. */ uint64_t gs_used_inputs; - unsigned ucps_enabled:2; unsigned as_es:1; } vs; }; diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index 0166798c0e2..6eec88eb483 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -2193,14 +2193,6 @@ static INLINE void si_shader_selector_key(struct pipe_context *ctx, struct si_context *sctx = (struct si_context *)ctx; memset(key, 0, sizeof(*key)); - if ((sel->type == PIPE_SHADER_VERTEX || sel->type == PIPE_SHADER_GEOMETRY) && - sctx->queued.named.rasterizer) { - if (sctx->queued.named.rasterizer->clip_plane_enable & 0xf0) - key->vs.ucps_enabled |= 0x2; - if (sctx->queued.named.rasterizer->clip_plane_enable & 0xf) - key->vs.ucps_enabled |= 0x1; - } - if (sel->type == PIPE_SHADER_VERTEX) { unsigned i; if (!sctx->vertex_elements) |