diff options
| author | Paul Berry <[email protected]> | 2011-10-10 13:24:38 -0700 |
|---|---|---|
| committer | Paul Berry <[email protected]> | 2011-10-13 08:41:16 -0700 |
| commit | 7a4fee71aa74f0e73cf6141c08ba1d536f20cd17 (patch) | |
| tree | 261098ee2451b289e06fbd6df550af19b8465e81 | |
| parent | a9e5528f09a835b66771ba4d3f08ff7fd51e08a6 (diff) | |
i965 Gen6+: De-compact clip plane constants for old VS backend.
In commit 018ea68d8780ab5baeef0b8122b8410e5e55ae6d, when I
de-compacted clip planes on Gen6+, I updated both the old and new VS
back-ends to reflect the change in how clip planes are stored, but I
failed to change the code in gen6_vs_state.c that uploads clip plane
constants when using the old VS back-end.
As a result, if the set of enabled clip planes wasn't contiguous
starting with 0, then clipping would not occur properly. This patch
corrects gen6_vs_state.c to upload clip plane constants in the new
de-compacted form.
This only affects the old VS back-end (which is used for
fixed-function and ARB vertex programs, not for GLSL vertex shaders).
Fixes Piglit test fixed-clip-enables.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=41603
Reviewed-by: Eric Anholt <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen6_vs_state.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/i965/gen6_vs_state.c b/src/mesa/drivers/dri/i965/gen6_vs_state.c index 14a96fca6b1..1c57a3b4a10 100644 --- a/src/mesa/drivers/dri/i965/gen6_vs_state.c +++ b/src/mesa/drivers/dri/i965/gen6_vs_state.c @@ -76,15 +76,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. */ - if (!uses_clip_distance) { + if (ctx->Transform.ClipPlanesEnabled != 0 && !uses_clip_distance) { gl_clip_plane *clip_planes = brw_select_clip_planes(ctx); - for (i = 0; i < MAX_CLIP_PLANES; i++) { - if (ctx->Transform.ClipPlanesEnabled & (1 << i)) { - memcpy(param, clip_planes[i], 4 * sizeof(float)); - param += 4; - params_uploaded++; - } - } + int num_userclip_plane_consts + = _mesa_logbase2(ctx->Transform.ClipPlanesEnabled) + 1; + int num_floats = 4 * num_userclip_plane_consts; + memcpy(param, clip_planes, num_floats * sizeof(float)); + param += num_floats; + params_uploaded += num_userclip_plane_consts; } /* Align to a reg for convenience for brw_vs_emit.c */ |