diff options
| author | Paul Berry <stereotype441@gmail.com> | 2011-09-02 14:57:18 -0700 |
|---|---|---|
| committer | Paul Berry <stereotype441@gmail.com> | 2011-09-23 15:32:37 -0700 |
| commit | d9cb683f81b5daefda2f8599b4ba0365cc6f009a (patch) | |
| tree | 74d8c949ac4bd3b9b094d584d28173cdf80f2f00 /src/mesa/drivers/dri/i965/gen6_vs_state.c | |
| parent | b9ef2b85b41272da9ed95071307310f9749cbf2b (diff) | |
| download | external_mesa3d-d9cb683f81b5daefda2f8599b4ba0365cc6f009a.zip external_mesa3d-d9cb683f81b5daefda2f8599b4ba0365cc6f009a.tar.gz external_mesa3d-d9cb683f81b5daefda2f8599b4ba0365cc6f009a.tar.bz2 | |
i965: Don't upload clip planes when gl_ClipDistance is in use.
When the vertex shader writes to gl_ClipDistance, we do clipping based
on clip distances rather than user clip planes, so don't waste push
constant space storing user clip planes that won't be used.
Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'src/mesa/drivers/dri/i965/gen6_vs_state.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen6_vs_state.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/i965/gen6_vs_state.c b/src/mesa/drivers/dri/i965/gen6_vs_state.c index f1123af..afb4ace 100644 --- a/src/mesa/drivers/dri/i965/gen6_vs_state.c +++ b/src/mesa/drivers/dri/i965/gen6_vs_state.c @@ -42,6 +42,7 @@ gen6_prepare_vs_push_constants(struct brw_context *brw) const struct brw_vertex_program *vp = brw_vertex_program_const(brw->vertex_program); unsigned int nr_params = brw->vs.prog_data->nr_params / 4; + bool uses_clip_distance = vp->program.UsesClipDistance; if (brw->vertex_program->IsNVProgram) _mesa_load_tracked_matrices(ctx); @@ -68,12 +69,14 @@ gen6_prepare_vs_push_constants(struct brw_context *brw) /* This should be loaded like any other param, but it's ad-hoc * until we redo the VS backend. */ - for (i = 0; i < MAX_CLIP_PLANES; i++) { - if (ctx->Transform.ClipPlanesEnabled & (1 << i)) { - memcpy(param, ctx->Transform._ClipUserPlane[i], 4 * sizeof(float)); - param += 4; - params_uploaded++; - } + if (!uses_clip_distance) { + for (i = 0; i < MAX_CLIP_PLANES; i++) { + if (ctx->Transform.ClipPlanesEnabled & (1 << i)) { + memcpy(param, ctx->Transform._ClipUserPlane[i], 4 * sizeof(float)); + param += 4; + params_uploaded++; + } + } } /* Align to a reg for convenience for brw_vs_emit.c */ if (params_uploaded & 1) { |