[Mesa-dev] [Mesa-stable] [PATCH] mesa: fix arithmetic error in _mesa_compute_compressed_pixelstore()

Brian Paul brianp at vmware.com
Mon Dec 1 15:34:53 PST 2014


On 12/01/2014 03:16 PM, Matt Turner wrote:
> On Mon, Dec 1, 2014 at 12:47 PM, Brian Paul <brianp at vmware.com> wrote:
>> We need parenthesis around the expression which computes the number of
>> blocks per row.
>>
>> Cc: "10.3 10.4" <mesa-stable at lists.freedesktop.org>
>> ---
>>   src/mesa/main/texstore.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
>> index f858cef..50aa1fd 100644
>> --- a/src/mesa/main/texstore.c
>> +++ b/src/mesa/main/texstore.c
>> @@ -2231,7 +2231,7 @@ _mesa_compute_compressed_pixelstore(GLuint dims, mesa_format texFormat,
>>
>>         if (packing->RowLength) {
>>            store->TotalBytesPerRow = packing->CompressedBlockSize *
>> -            (packing->RowLength + bw - 1) / bw;
>> +            ((packing->RowLength + bw - 1) / bw);
>>         }
>
> Could we copy
>
> #define ALIGN_DIVUP(x, y) (((x) + (y) - 1) / (y))
>
> our of r600_pipe.h into src/util/macros.h and use that? Maybe that'd
> be better as a coccinelle patch over the whole tree.
>
> Either way,
>
> Reviewed-by: Matt Turner <mattst88 at gmail.com>

Thanks.  I'm going to commit this as-is for now (simpler to cherry-pick 
to the stable branches).  If someone wants to do ALIGN_DIVUP() later 
that's fine.

-Brian



More information about the mesa-dev mailing list