diff options
| author | Maciej Cencora <m.cencora@gmail.com> | 2010-07-11 14:04:18 +0200 |
|---|---|---|
| committer | Tom Fogal <tfogal@alumni.unh.edu> | 2010-08-03 12:03:54 -0600 |
| commit | 8cb6b198d2dc6eeb9a6f2e4afb0b3ad5935ad737 (patch) | |
| tree | 659ab1d19fabaa45cee9d9ff5756014a51ddc1c6 | |
| parent | ac82d1602131623aa44d12ce1e2e0689672d4c63 (diff) | |
r300c: Fix vertex data setup for named buffer objects with unaligned offset
Candidate for 7.8 branch
Signed-off-by: Maciej Cencora <m.cencora@gmail.com>
(cherry picked from commit 452a7d5a9d339db3326f33d464dce1a879ccc533)
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_draw.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_draw.c b/src/mesa/drivers/dri/r300/r300_draw.c index 282c0e18bca..5ae9f49840b 100644 --- a/src/mesa/drivers/dri/r300/r300_draw.c +++ b/src/mesa/drivers/dri/r300/r300_draw.c @@ -523,8 +523,7 @@ static void r300AllocDmaRegions(GLcontext *ctx, const struct gl_client_array *in r300ConvertAttrib(ctx, count, input[i], &vbuf->attribs[index]); } else { if (input[i]->BufferObj->Name) { - if (stride % 4 != 0) { - assert(((intptr_t) input[i]->Ptr) % input[i]->StrideB == 0); + if (stride % 4 != 0 || (intptr_t)input[i]->Ptr % 4 != 0) { r300AlignDataToDword(ctx, input[i], count, &vbuf->attribs[index]); vbuf->attribs[index].is_named_bo = GL_FALSE; } else { |