diff options
Diffstat (limited to 'src/gallium/drivers/llvmpipe')
| -rw-r--r-- | src/gallium/drivers/llvmpipe/lp_limits.h | 5 | ||||
| -rw-r--r-- | src/gallium/drivers/llvmpipe/lp_texture.c | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/gallium/drivers/llvmpipe/lp_limits.h b/src/gallium/drivers/llvmpipe/lp_limits.h index 43b00c56a5f..fac34044089 100644 --- a/src/gallium/drivers/llvmpipe/lp_limits.h +++ b/src/gallium/drivers/llvmpipe/lp_limits.h @@ -43,8 +43,9 @@ /** * Max texture sizes */ -#define LP_MAX_TEXTURE_2D_LEVELS 13 /* 4K x 4K for now */ -#define LP_MAX_TEXTURE_3D_LEVELS 10 /* 512 x 512 x 512 for now */ +#define LP_MAX_TEXTURE_SIZE (1 * 1024 * 1024 * 1024ULL) /* 1GB for now */ +#define LP_MAX_TEXTURE_2D_LEVELS 14 /* 8K x 8K for now */ +#define LP_MAX_TEXTURE_3D_LEVELS 11 /* 1K x 1K x 1K for now */ /** This must be the larger of LP_MAX_TEXTURE_2D/3D_LEVELS */ diff --git a/src/gallium/drivers/llvmpipe/lp_texture.c b/src/gallium/drivers/llvmpipe/lp_texture.c index 4495e8de6cd..36041432312 100644 --- a/src/gallium/drivers/llvmpipe/lp_texture.c +++ b/src/gallium/drivers/llvmpipe/lp_texture.c @@ -112,6 +112,7 @@ llvmpipe_texture_layout(struct llvmpipe_screen *screen, unsigned width = pt->width0; unsigned height = pt->height0; unsigned depth = pt->depth0; + size_t total_size = 0; assert(LP_MAX_TEXTURE_2D_LEVELS <= LP_MAX_TEXTURE_LEVELS); assert(LP_MAX_TEXTURE_3D_LEVELS <= LP_MAX_TEXTURE_LEVELS); @@ -168,6 +169,11 @@ llvmpipe_texture_layout(struct llvmpipe_screen *screen, } } + total_size += lpr->num_slices_faces[level] * lpr->img_stride[level]; + if (total_size > LP_MAX_TEXTURE_SIZE) { + goto fail; + } + /* Compute size of next mipmap level */ width = u_minify(width, 1); height = u_minify(height, 1); |