diff options
Diffstat (limited to 'src/mesa/drivers/dri/i965/gen6_vs_state.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen6_vs_state.c | 16 |
1 files changed, 8 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 fb05354ddd1..ae1a8412a65 100644 --- a/src/mesa/drivers/dri/i965/gen6_vs_state.c +++ b/src/mesa/drivers/dri/i965/gen6_vs_state.c @@ -49,7 +49,7 @@ gen6_upload_vs_push_constants(struct brw_context *brw) _mesa_load_state_parameters(ctx, vp->program.Base.Parameters); /* CACHE_NEW_VS_PROG */ - if (brw->vs.prog_data->nr_params == 0) { + if (brw->vs.prog_data->base.nr_params == 0) { brw->vs.push_const_size = 0; } else { int params_uploaded; @@ -57,7 +57,7 @@ gen6_upload_vs_push_constants(struct brw_context *brw) int i; param = brw_state_batch(brw, AUB_TRACE_VS_CONSTANTS, - brw->vs.prog_data->nr_params * sizeof(float), + brw->vs.prog_data->base.nr_params * sizeof(float), 32, &brw->vs.push_const_offset); /* _NEW_PROGRAM_CONSTANTS @@ -66,10 +66,10 @@ gen6_upload_vs_push_constants(struct brw_context *brw) * side effect of dereferencing uniforms, so _NEW_PROGRAM_CONSTANTS * wouldn't be set for them. */ - for (i = 0; i < brw->vs.prog_data->nr_params; i++) { - param[i] = *brw->vs.prog_data->param[i]; + for (i = 0; i < brw->vs.prog_data->base.nr_params; i++) { + param[i] = *brw->vs.prog_data->base.param[i]; } - params_uploaded = brw->vs.prog_data->nr_params / 4; + params_uploaded = brw->vs.prog_data->base.nr_params / 4; if (0) { printf("VS constant buffer:\n"); @@ -148,16 +148,16 @@ upload_vs_state(struct brw_context *brw) OUT_BATCH(floating_point_mode | ((ALIGN(brw->sampler.count, 4)/4) << GEN6_VS_SAMPLER_COUNT_SHIFT)); - if (brw->vs.prog_data->total_scratch) { + if (brw->vs.prog_data->base.total_scratch) { OUT_RELOC(brw->vs.scratch_bo, I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER, - ffs(brw->vs.prog_data->total_scratch) - 11); + ffs(brw->vs.prog_data->base.total_scratch) - 11); } else { OUT_BATCH(0); } OUT_BATCH((1 << GEN6_VS_DISPATCH_START_GRF_SHIFT) | - (brw->vs.prog_data->urb_read_length << GEN6_VS_URB_READ_LENGTH_SHIFT) | + (brw->vs.prog_data->base.urb_read_length << GEN6_VS_URB_READ_LENGTH_SHIFT) | (0 << GEN6_VS_URB_ENTRY_READ_OFFSET_SHIFT)); OUT_BATCH(((brw->max_vs_threads - 1) << GEN6_VS_MAX_THREADS_SHIFT) | |