summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Ekstrand <[email protected]>2016-10-25 22:47:21 -0700
committerJason Ekstrand <[email protected]>2016-10-27 13:45:39 -0700
commit4964a5149b7776ce27aaeab2be0c2ebf41ded740 (patch)
treee8fe79103b35e01d99f6b1fe88696096759a6586
parentcaf67bb12fce94e00cf2c158c88cefab26b07af9 (diff)
intel/blorp: Fix a couple asserts around image copy rectangles
With dealing with rectangles in compressed images, you can have a width or height that isn't a multiple of the corresponding compression block dimension but only if that edge of your rectangle is on the edge of the image. When we call convert_to_single_slice, it creates an 2-D image and a set of tile offsets into that image. When detecting the right-edge and bottom-edge cases, we weren't including the tile offsets so the assert would misfire. This caused crashes in a few UE4 demos Signed-off-by: Jason Ekstrand <[email protected]> Reported-by: "Eero Tamminen" <[email protected]> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98431 Cc: "13.0" <[email protected]> Tested-by: "Eero Tamminen" <[email protected]> Reviewed-by: Iago Toral Quiroga <[email protected]>
-rw-r--r--src/intel/blorp/blorp_blit.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/intel/blorp/blorp_blit.c b/src/intel/blorp/blorp_blit.c
index 0c3ee72b11f..9357a72a355 100644
--- a/src/intel/blorp/blorp_blit.c
+++ b/src/intel/blorp/blorp_blit.c
@@ -1761,10 +1761,14 @@ surf_convert_to_uncompressed(const struct isl_device *isl_dev,
surf_convert_to_single_slice(isl_dev, info);
if (width || height) {
+#ifndef NDEBUG
+ uint32_t right_edge_px = info->tile_x_sa + *x + *width;
+ uint32_t bottom_edge_px = info->tile_y_sa + *y + *height;
assert(*width % fmtl->bw == 0 ||
- *x + *width == info->surf.logical_level0_px.width);
+ right_edge_px == info->surf.logical_level0_px.width);
assert(*height % fmtl->bh == 0 ||
- *y + *height == info->surf.logical_level0_px.height);
+ bottom_edge_px == info->surf.logical_level0_px.height);
+#endif
*width = DIV_ROUND_UP(*width, fmtl->bw);
*height = DIV_ROUND_UP(*height, fmtl->bh);
}