diff options
| author | Brian Paul <brianp@vmware.com> | 2012-09-16 19:05:51 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2012-09-17 19:49:26 -0600 |
| commit | df73be910506e466940db0c56aa7a1c0452d6e58 (patch) | |
| tree | 0120eafec4f0081ffa941c5fdf01f211eff9cb08 | |
| parent | 7dc76e94246a14d995d2e9a4c8dc8591c4085849 (diff) | |
llvmpipe: set max cube texture size to 4K x 4K
Before, the limit was 8K. For 32-bit RGBA that would be require 1.5 GB
of memory (w/out mipmaps). That's well beyond the LP_MAX_TEXTURE_SIZE
of 1GB.
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
| -rw-r--r-- | src/gallium/drivers/llvmpipe/lp_limits.h | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/llvmpipe/lp_screen.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/gallium/drivers/llvmpipe/lp_limits.h b/src/gallium/drivers/llvmpipe/lp_limits.h index fac34044089..3be24d6d648 100644 --- a/src/gallium/drivers/llvmpipe/lp_limits.h +++ b/src/gallium/drivers/llvmpipe/lp_limits.h @@ -46,6 +46,7 @@ #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 */ +#define LP_MAX_TEXTURE_CUBE_LEVELS 13 /* 4K x 4K for now */ /** This must be the larger of LP_MAX_TEXTURE_2D/3D_LEVELS */ diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c index a9f973cf74c..5126cd61036 100644 --- a/src/gallium/drivers/llvmpipe/lp_screen.c +++ b/src/gallium/drivers/llvmpipe/lp_screen.c @@ -140,7 +140,7 @@ llvmpipe_get_param(struct pipe_screen *screen, enum pipe_cap param) case PIPE_CAP_MAX_TEXTURE_3D_LEVELS: return LP_MAX_TEXTURE_3D_LEVELS; case PIPE_CAP_MAX_TEXTURE_CUBE_LEVELS: - return LP_MAX_TEXTURE_2D_LEVELS; + return LP_MAX_TEXTURE_CUBE_LEVELS; case PIPE_CAP_BLEND_EQUATION_SEPARATE: return 1; case PIPE_CAP_INDEP_BLEND_ENABLE: |