diff options
| author | Brian Paul <[email protected]> | 2014-03-01 12:14:15 -0700 |
|---|---|---|
| committer | Carl Worth <[email protected]> | 2014-03-11 11:49:52 -0700 |
| commit | 9cdb86a1dabd533d5d1f96da172bd2f978f7fe9c (patch) | |
| tree | 14457098c2862419145b39093954aff837ef7ab2 | |
| parent | 4588a32dee58c47c954813c74d471f893d14872c (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]>
(cherry picked from commit 465b2c42bca59f0f198aeb8543cfabd5989584b4)
| -rw-r--r-- | src/gallium/drivers/softpipe/sp_texture.c | 6 |
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 370f2b43c4d..f731bdc22b2 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); |