i965 Gen6+: De-compact clip plane constants for old VS backend.

In commit 018ea68d87, 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 <eric@anholt.net>
This commit is contained in:
Paul Berry
2011-10-10 13:24:38 -07:00
parent a9e5528f09
commit 7a4fee71aa
+7 -8
View File
@@ -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 */