Mesa (master): radeonsi: fix up buffer descriptor upper-bound checking

[Marek Olšák]

Module: Mesa
Branch: master
Commit: 57a8991020ae28c13b535c4d0547b46daaa1c83f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=57a8991020ae28c13b535c4d0547b46daaa1c83f

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Fri Aug 12 13:00:58 2016 +0200

radeonsi: fix up buffer descriptor upper-bound checking

st/mesa does this too, so we're safe.

Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>

---

 src/gallium/drivers/radeonsi/si_state.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index 7e63d48..25dfe26 100644
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -2662,7 +2662,7 @@ si_make_buffer_descriptor(struct si_screen *screen, struct r600_resource *buf,
 	data_format = si_translate_buffer_dataformat(&screen->b.b, desc, first_non_void);
 
 	num_records = size / stride;
-	num_records = MIN2(num_records, buf->b.b.width0 / stride);
+	num_records = MIN2(num_records, (buf->b.b.width0 - offset) / stride);
 
 	if (screen->b.chip_class >= VI)
 		num_records *= stride;