diff options
| author | Eric Anholt <eric@anholt.net> | 2009-11-11 14:49:03 -0800 | 
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-11-12 11:41:39 -0800 | 
| commit | 5f305b1db925c819ddeb29a75f6fbad6500a2d11 (patch) | |
| tree | 445d02f06bd64c577c6ef7169d8fa3a75b39417e /src | |
| parent | ab12e764ba3f57ad9f0d7252262cfc6e07839928 (diff) | |
i965: Fix VBO last-valid-offset setup on Ironlake.
Instead of doing math based on the (broken for VBO && offset != 0)
input->count number, just use the BO size.  Fixes assertion failure in ETQW.
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_draw_upload.c | 13 | 
1 files changed, 3 insertions, 10 deletions
| diff --git a/src/mesa/drivers/dri/i965/brw_draw_upload.c b/src/mesa/drivers/dri/i965/brw_draw_upload.c index 348c66154f..2b1347b698 100644 --- a/src/mesa/drivers/dri/i965/brw_draw_upload.c +++ b/src/mesa/drivers/dri/i965/brw_draw_upload.c @@ -536,16 +536,9 @@ static void brw_emit_vertices(struct brw_context *brw)  		I915_GEM_DOMAIN_VERTEX, 0,  		input->offset);        if (BRW_IS_IGDNG(brw)) { -          if (input->stride) { -              OUT_RELOC(input->bo, -                        I915_GEM_DOMAIN_VERTEX, 0, -                        input->offset + input->stride * input->count - 1); -          } else { -              assert(input->count == 1); -              OUT_RELOC(input->bo, -                        I915_GEM_DOMAIN_VERTEX, 0, -                        input->offset + input->element_size - 1); -          } +	 OUT_RELOC(input->bo, +		   I915_GEM_DOMAIN_VERTEX, 0, +		   input->bo->size - 1);        } else            OUT_BATCH(input->stride ? input->count : 0);        OUT_BATCH(0); /* Instance data step rate */ | 
