We used to have clip planes optionally included in the push constants,
resulting in a variable amount of data uploaded, but no more. This also
means less wasted space in the batch for our push constants.
---
src/mesa/drivers/dri/i965/gen6_vs_state.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/gen6_vs_state.c
b/src/mesa/drivers/dri/i965/gen6_vs_state.c
index d293482..aeccfb0 100644
--- a/src/mesa/drivers/dri/i965/gen6_vs_state.c
+++ b/src/mesa/drivers/dri/i965/gen6_vs_state.c
@@ -41,7 +41,6 @@ gen6_upload_vs_push_constants(struct brw_context *brw)
/* _BRW_NEW_VERTEX_PROGRAM */
const struct brw_vertex_program *vp =
brw_vertex_program_const(brw->vertex_program);
- unsigned int nr_params = brw->vs.prog_data->nr_params / 4;
/* Updates the ParamaterValues[i] pointers for all parameters of the
* basic type of PROGRAM_STATE_VAR.
@@ -53,19 +52,18 @@ gen6_upload_vs_push_constants(struct brw_context *brw)
if (brw->vs.prog_data->nr_params == 0 && !ctx->Transform.ClipPlanesEnabled)
{
brw->vs.push_const_size = 0;
} else {
- int params_uploaded = 0;
+ int params_uploaded;
float *param;
int i;
param = brw_state_batch(brw, AUB_TRACE_VS_CONSTANTS,
- (MAX_CLIP_PLANES + nr_params) *
- 4 * sizeof(float),
+ brw->vs.prog_data->nr_params * sizeof(float),
32, &brw->vs.push_const_offset);
for (i = 0; i < brw->vs.prog_data->nr_params; i++) {
param[i] = *brw->vs.prog_data->param[i];
}
- params_uploaded += brw->vs.prog_data->nr_params / 4;
+ params_uploaded = brw->vs.prog_data->nr_params / 4;
if (0) {
printf("VS constant buffer:\n");
--
1.7.10.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
