From: Brian Paul Date: Sat, 1 Mar 2014 19:14:15 +0000 (-0700) Subject: softpipe: use 64-bit arithmetic in softpipe_resource_layout() X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=465b2c42bca59f0f198aeb8543cfabd5989584b4;p=mesa.git softpipe: use 64-bit arithmetic in softpipe_resource_layout() To avoid 32-bit integer overflow for large textures. Note: we're already doing this in llvmpipe. Cc: "10.0" "10.1" Reviewed-by: Roland Scheidegger --- diff --git a/src/gallium/drivers/softpipe/sp_texture.c b/src/gallium/drivers/softpipe/sp_texture.c index dc89d0665c3..6538e46db09 100644 --- a/src/gallium/drivers/softpipe/sp_texture.c +++ b/src/gallium/drivers/softpipe/sp_texture.c @@ -60,7 +60,7 @@ softpipe_resource_layout(struct pipe_screen *screen, unsigned width = pt->width0; unsigned height = pt->height0; unsigned depth = pt->depth0; - unsigned buffer_size = 0; + uint64_t buffer_size = 0; for (level = 0; level <= pt->last_level; level++) { unsigned slices; @@ -76,8 +76,8 @@ softpipe_resource_layout(struct pipe_screen *screen, spr->level_offset[level] = buffer_size; - buffer_size += (util_format_get_nblocksy(pt->format, height) * - slices * spr->stride[level]); + buffer_size += (uint64_t) util_format_get_nblocksy(pt->format, height) * + slices * spr->stride[level]; width = u_minify(width, 1); height = u_minify(height, 1);