summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2014-03-01 12:14:15 -0700
committerBrian Paul <[email protected]>2014-03-03 10:41:42 -0700
commit465b2c42bca59f0f198aeb8543cfabd5989584b4 (patch)
treeb999b5e32b1d77824eb9c6ff78b799c7f9f12c1e /src/gallium/drivers
parent070036ca399d88293ef51b40e859c06acf0c7606 (diff)
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" <[email protected]> Reviewed-by: Roland Scheidegger <[email protected]>
Diffstat (limited to 'src/gallium/drivers')
-rw-r--r--src/gallium/drivers/softpipe/sp_texture.c6
1 files changed, 3 insertions, 3 deletions
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);