mesa: fix an error in uniform arrays in row calculating.

Fix the error in uniform row calculating, it may alloc one line
more which may cause out of range on memory usage, sometimes program
aborted when free the memory.

NOTE: This is a candidate for 7.9 and 7.10 branches.

Signed-off-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Jian Zhao 2011-01-05 10:41:20 +08:00 committed by Brian Paul
parent db61b9ce39
commit 2a7380e9c3

View file

@ -513,7 +513,7 @@ get_uniform_rows_cols(const struct gl_program_parameter *p,
*cols = p->Size;
}
else {
*rows = p->Size / 4 + 1;
*rows = (p->Size + 3) / 4;
if (p->Size % 4 == 0)
*cols = 4;
else