Mesa (master): r300c: Fix vertex data setup for named buffer objects with unaligned offset

[Maciej Cencora]

Module: Mesa
Branch: master
Commit: 452a7d5a9d339db3326f33d464dce1a879ccc533
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=452a7d5a9d339db3326f33d464dce1a879ccc533

Author: Maciej Cencora <m.cencora at gmail.com>
Date:   Sun Jul 11 14:04:18 2010 +0200

r300c: Fix vertex data setup for named buffer objects with unaligned offset

Candidate for 7.8 branch

Signed-off-by: Maciej Cencora <m.cencora at gmail.com>

---

 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 282c0e1..5ae9f49 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 {