texcompress_s3tc/fxt1: fix stride checks (v1.1)
authorDave Airlie <airlied@redhat.com>
Tue, 1 Sep 2015 05:44:46 +0000 (15:44 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 1 Sep 2015 23:32:26 +0000 (09:32 +1000)
commitb4a70401f52e5d7e08c94715b250ea1de8f63d15
tree377083d3d40e74e678499b7dfd4e4f7e9286e26b
parent6a3e1fb958778e00e8fe2d860b6327fc4409c148
texcompress_s3tc/fxt1: fix stride checks (v1.1)

The fastpath currently checks the RowLength != width, but
if you have a RowLength of 7, and Alignment of 4, then
that shouldn't match.

align the rowlength to the pack alignment before comparing.

This fixes compressed cases in CTS packed_pixels_pixelstore
test when SKIP_PIXELS is enabled, which causes row length
to get set.

v1.1: add fxt1 fix (Iago)

Cc: "11.0" <mesa-stable@lists.freedesktop.org>
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
src/mesa/main/texcompress_fxt1.c
src/mesa/main/texcompress_s3tc.c