diff options
| author | Eric Anholt <[email protected]> | 2013-03-20 10:46:20 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2013-04-01 16:17:25 -0700 |
| commit | 2f41a601455e6e0366e28b6b84871842cb4bd341 (patch) | |
| tree | 8721a3182e5ad2675e15db7fe512b0f8dc5a32ec /src/mesa/drivers/dri/i965/brw_vs_surface_state.c | |
| parent | 8c694dfe6478ce9355c866ae70db45e49e499de3 (diff) | |
i965: Make the constant surface interface take a normal byte size.
This puts the rounding-up logic into the function itself instead of all
the callers having to manage it. Also drop an "unused" comment in gen4,
as the stride *is* used for texbos (and will be for uniforms soon).
NOTE: This is a candidate for the 9.1 branch.
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_vs_surface_state.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vs_surface_state.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_vs_surface_state.c b/src/mesa/drivers/dri/i965/brw_vs_surface_state.c index 2aefc0cc54a..6c0b690818f 100644 --- a/src/mesa/drivers/dri/i965/brw_vs_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_vs_surface_state.c @@ -68,9 +68,9 @@ brw_upload_vs_pull_constants(struct brw_context *brw) /* _NEW_PROGRAM_CONSTANTS */ drm_intel_bo_unreference(brw->vs.const_bo); + uint32_t size = brw->vs.prog_data->nr_pull_params * 4; brw->vs.const_bo = drm_intel_bo_alloc(intel->bufmgr, "vp_const_buffer", - brw->vs.prog_data->nr_pull_params * 4, - 64); + size, 64); drm_intel_gem_bo_map_gtt(brw->vs.const_bo); for (i = 0; i < brw->vs.prog_data->nr_pull_params; i++) { @@ -90,8 +90,7 @@ brw_upload_vs_pull_constants(struct brw_context *brw) drm_intel_gem_bo_unmap_gtt(brw->vs.const_bo); const int surf = SURF_INDEX_VERT_CONST_BUFFER; - intel->vtbl.create_constant_surface(brw, brw->vs.const_bo, 0, - ALIGN(brw->vs.prog_data->nr_pull_params, 4) / 4, + intel->vtbl.create_constant_surface(brw, brw->vs.const_bo, 0, size, &brw->vs.surf_offset[surf]); brw->state.dirty.brw |= BRW_NEW_VS_CONSTBUF; |