OSDN Git Service
(root)
/
android-x86
/
external-mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
932e4e6
)
r300c: Fix vertex data setup for named buffer objects with unaligned offset
author
Maciej Cencora
<m.cencora@gmail.com>
Sun, 11 Jul 2010 12:04:18 +0000
(14:04 +0200)
committer
Maciej Cencora
<m.cencora@gmail.com>
Sun, 11 Jul 2010 12:25:35 +0000
(14:25 +0200)
Candidate for 7.8 branch
Signed-off-by: Maciej Cencora <m.cencora@gmail.com>
src/mesa/drivers/dri/r300/r300_draw.c
patch
|
blob
|
history
diff --git
a/src/mesa/drivers/dri/r300/r300_draw.c
b/src/mesa/drivers/dri/r300/r300_draw.c
index
282c0e1
..
5ae9f49
100644
(file)
--- 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 {