Module: Mesa Branch: master Commit: 067c5b10b690b949ac28c4aea237f398f8251fff URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=067c5b10b690b949ac28c4aea237f398f8251fff
Author: Rob Herring <[email protected]> Date: Tue Jun 14 16:17:44 2016 -0500 vc4: fix vc4_resource_from_handle() stride calculation The expected stride calculation is completely wrong. It should ultimately be multiplying cpp and width rather than dividing. The width also needs to be aligned to the tiling width first before converting to stride bytes. The whole stride check here is possibly pointless. Any buffers which were allocated outside of vc4 may have strides with larger alignment requirements. Signed-off-by: Rob Herring <[email protected]> Reviewed-by: Eric Anholt <[email protected]> --- src/gallium/drivers/vc4/vc4_resource.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/vc4/vc4_resource.c b/src/gallium/drivers/vc4/vc4_resource.c index 20f137a..aabe593 100644 --- a/src/gallium/drivers/vc4/vc4_resource.c +++ b/src/gallium/drivers/vc4/vc4_resource.c @@ -534,8 +534,8 @@ vc4_resource_from_handle(struct pipe_screen *pscreen, struct vc4_resource *rsc = vc4_resource_setup(pscreen, tmpl); struct pipe_resource *prsc = &rsc->base.b; struct vc4_resource_slice *slice = &rsc->slices[0]; - uint32_t expected_stride = align(prsc->width0 / rsc->cpp, - vc4_utile_width(rsc->cpp)); + uint32_t expected_stride = + align(prsc->width0, vc4_utile_width(rsc->cpp)) * rsc->cpp; if (!rsc) return NULL; _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
