summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/ilo/ilo_screen.c
diff options
context:
space:
mode:
authorChia-I Wu <olvaffe@gmail.com>2014-07-15 09:54:08 +0800
committerChia-I Wu <olvaffe@gmail.com>2014-07-15 12:00:15 +0800
commitc25fe88ebf0939ac1972cc0994819c27408ca59e (patch)
tree94c04035371645eb8b6e760512a065c025b0f260 /src/gallium/drivers/ilo/ilo_screen.c
parent81d7f33e30e7f54c5b721085057a53f9cd958fe2 (diff)
downloadexternal_mesa3d-c25fe88ebf0939ac1972cc0994819c27408ca59e.zip
external_mesa3d-c25fe88ebf0939ac1972cc0994819c27408ca59e.tar.gz
external_mesa3d-c25fe88ebf0939ac1972cc0994819c27408ca59e.tar.bz2
ilo: raise texture size limits
Report the hardware limits now that max-texture-size piglit test has been fixed.
Diffstat (limited to 'src/gallium/drivers/ilo/ilo_screen.c')
-rw-r--r--src/gallium/drivers/ilo/ilo_screen.c17
1 files changed, 3 insertions, 14 deletions
diff --git a/src/gallium/drivers/ilo/ilo_screen.c b/src/gallium/drivers/ilo/ilo_screen.c
index 4e4739c..e2a0e23 100644
--- a/src/gallium/drivers/ilo/ilo_screen.c
+++ b/src/gallium/drivers/ilo/ilo_screen.c
@@ -309,23 +309,12 @@ ilo_get_param(struct pipe_screen *screen, enum pipe_cap param)
* Max WxHxD for 2D and CUBE Max WxHxD for 3D
* GEN6 8192x8192x512 2048x2048x2048
* GEN7 16384x16384x2048 2048x2048x2048
- *
- * However, when the texutre size is large, things become unstable. We
- * require the maximum texture size to be 2^30 bytes in
- * screen->can_create_resource(). Since the maximum pixel size is 2^4
- * bytes (PIPE_FORMAT_R32G32B32A32_FLOAT), textures should not have more
- * than 2^26 pixels.
- *
- * For 3D textures, we have to set the maximum number of levels to 9,
- * which has at most 2^24 pixels. For 2D textures, we set it to 14,
- * which has at most 2^26 pixels. And for cube textures, we has to set
- * it to 12.
*/
- return 14;
+ return (is->dev.gen >= ILO_GEN(7)) ? 15 : 14;
case PIPE_CAP_MAX_TEXTURE_3D_LEVELS:
- return 9;
- case PIPE_CAP_MAX_TEXTURE_CUBE_LEVELS:
return 12;
+ case PIPE_CAP_MAX_TEXTURE_CUBE_LEVELS:
+ return (is->dev.gen >= ILO_GEN(7)) ? 15 : 14;
case PIPE_CAP_TEXTURE_MIRROR_CLAMP:
return false;
case PIPE_CAP_BLEND_EQUATION_SEPARATE: